diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e8e45e3..5dd22c2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -207,8 +207,6 @@
                 android:value="com.android.settings.category.ia.homepage"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
-            <meta-data android:name="android.metadata.SLICE_URI"
-                android:value="content://android.settings.slices/action/toggle_bluetooth_switch" />
         </activity>
 
         <activity android:name="AirplaneModeVoiceActivity"
@@ -253,8 +251,6 @@
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
-            <meta-data android:name="android.metadata.SLICE_URI"
-                android:value="content://android.settings.slices/wifi" />
         </activity>
 
         <activity
@@ -743,6 +739,27 @@
         </activity>
 
         <activity
+            android:name=".notification.ZenSuggestionActivity"
+            android:label="@string/zen_mode_settings_title"
+            android:icon="@drawable/ic_do_not_disturb_on_24dp"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.ZEN" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="0" />
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/zen_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/zen_suggestion_summary" />
+        </activity>
+
+        <activity
             android:name=".notification.ZenOnboardingActivity"
             android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
             android:icon="@drawable/ic_settings_notifications"
@@ -755,7 +772,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity
             android:name="Settings$ZenModeAutomationSettingsActivity"
             android:label="@string/zen_mode_automation_settings_title"
@@ -1114,7 +1130,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".slice.SliceDeepLinkSpringBoard"
+        <activity
+            android:name=".slices.SliceDeepLinkSpringBoard"
+            android:excludeFromRecents="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -2224,8 +2242,6 @@
                 android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
-            <meta-data android:name="android.metadata.SLICE_URI"
-                android:value="content://android.settings.slices/action/auto_brightness" />
         </activity>
 
         <activity
@@ -2242,8 +2258,6 @@
                 android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
-            <meta-data android:name="android.metadata.SLICE_URI"
-                android:value="content://android.settings.slices/action/battery_saver_summary" />
         </activity>
 
         <activity android:name=".fuelgauge.BatterySaverModeVoiceActivity"
@@ -2665,8 +2679,6 @@
                 android:value="true" />
             <meta-data android:name="com.android.settings.summary"
                 android:resource="@string/sound_dashboard_summary"/>
-            <meta-data android:name="android.metadata.SLICE_URI"
-                android:value="content://android.settings.slices/action/alarm_volume" />
         </activity>
 
         <!-- Show apps for which application-level notification settings are applicable -->
diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml
index ba62187..17e2b92 100644
--- a/res/drawable/ic_chevron_right_24dp.xml
+++ b/res/drawable/ic_chevron_right_24dp.xml
@@ -23,6 +23,5 @@
     android:viewportWidth="24.0"
     android:tint="?android:attr/colorControlNormal">
     <path android:fillColor="#FF000000"
-          android:pathData="M9.29,15.63l3.88-3.88L9.29,7.87c-0.39-0.39-0.39-1.02,0-1.41l0,0c0.39-0.39,1.02-0.39,1.41,0l4.59,4.59
-c0.39,0.39,0.39,1.02,0,1.41l-4.59,4.59c-0.39,0.39-1.02,0.39-1.41,0l0,0C8.91,16.66,8.9,16.02,9.29,15.63z" />
+          android:pathData="M9.71,18.71l-1.42,-1.42l5.3,-5.29l-5.3,-5.29l1.42,-1.42l6.7,6.71z"/>
 </vector>
diff --git a/res/drawable/ic_do_not_disturb_on_24dp.xml b/res/drawable/ic_do_not_disturb_on_24dp.xml
new file mode 100644
index 0000000..cace8d4
--- /dev/null
+++ b/res/drawable/ic_do_not_disturb_on_24dp.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2018 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,11h10v2h-10z"/>
+</vector>
diff --git a/res/drawable/ic_homepage_sound.xml b/res/drawable/ic_homepage_sound.xml
index 4991656..a7369ad 100644
--- a/res/drawable/ic_homepage_sound.xml
+++ b/res/drawable/ic_homepage_sound.xml
@@ -32,5 +32,5 @@
         android:height="@dimen/dashboard_tile_foreground_image_size"
         android:start="@dimen/dashboard_tile_foreground_image_inset"
         android:top="@dimen/dashboard_tile_foreground_image_inset"
-        android:drawable="@drawable/ic_settings_sound_white" />
+        android:drawable="@drawable/ic_volume_up_24dp" />
 </layer-list>
diff --git a/res/drawable/ic_local_phone_24_lib.xml b/res/drawable/ic_local_phone_24_lib.xml
new file mode 100644
index 0000000..4574802
--- /dev/null
+++ b/res/drawable/ic_local_phone_24_lib.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright 2018 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M16.01,14.48l-2.62,2.62c-2.75-1.49-5.01-3.75-6.5-6.5l2.62-2.62c0.24-0.24,0.34-0.58,0.27-0.9L9.13,3.82 c-0.09-0.47-0.5-0.8-0.98-0.8L4,3.01c-0.56,0-1.03,0.47-1,1.03c0.17,2.91,1.04,5.63,2.43,8.01c1.57,2.69,3.81,4.93,6.5,6.5 c2.38,1.39,5.1,2.26,8.01,2.43c0.56,0.03,1.03-0.44,1.03-1l0-4.15c0-0.48-0.34-0.89-0.8-0.98l-3.26-0.65 C16.58,14.14,16.24,14.24,16.01,14.48z" />
+    <path
+        android:pathData="M0,0h24v24H0V0z" />
+</vector>
diff --git a/res/drawable/ic_notifications_off_24dp.xml b/res/drawable/ic_notifications_off_24dp.xml
new file mode 100644
index 0000000..1622025
--- /dev/null
+++ b/res/drawable/ic_notifications_off_24dp.xml
@@ -0,0 +1,31 @@
+<!--
+  Copyright (C) 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#FF000000"
+          android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z" />
+    <path android:fillColor="#FF000000"
+          android:pathData="M16,16L2.81,2.81L1.39,4.22l4.85,4.85C6.09,9.68 6,10.33 6,11v6H4v2h12.17l3.61,3.61l1.41,-1.41L16,16zM8,17c0,0 0.01,-6.11 0.01,-6.16L14.17,17H8z" />
+    <path android:fillColor="#FF000000"
+          android:pathData="M12,6.5c2.49,0 4,2.02 4,4.5v2.17l2,2V11c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C9.72,4.86 9.05,5.2 8.46,5.63L9.93,7.1C10.51,6.73 11.2,6.5 12,6.5z" />
+</vector>
diff --git a/res/drawable/ic_volume_ringer_mute.xml b/res/drawable/ic_volume_ringer_mute.xml
deleted file mode 100644
index 03357e9..0000000
--- a/res/drawable/ic_volume_ringer_mute.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
-        android:viewportHeight="23.4"
-        android:viewportWidth="23.3"
-        android:width="24dp"
-        android:tint="?android:attr/colorControlNormal">
-
-    <group
-        android:translateX="-0.85"
-        android:translateY="-0.5">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M20.73,19.46l-0.6,-0.6c0,0 0,0 0,0L5.54,4.26c-0.35,-0.35 -0.92,-0.35 -1.27,0c-0.35,0.35 -0.35,0.92 0,1.27l2.4,2.4C6.25,8.85 6,9.88 6,11v5l-2.15,2.15c-0.19,0.2 -0.19,0.51 0.01,0.71C3.95,18.95 4.07,19 4.2,19h13.53l1.73,1.73c0.35,0.35 0.92,0.35 1.27,0C21.09,20.38 21.09,19.81 20.73,19.46z" />
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C9.87,4.83 9.31,5.08 8.8,5.4l9.2,9.2V11z" />
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z" />
-    </group>
-
-</vector>
diff --git a/res/drawable/ic_settings_sound_white.xml b/res/drawable/ic_volume_up_24dp.xml
similarity index 61%
rename from res/drawable/ic_settings_sound_white.xml
rename to res/drawable/ic_volume_up_24dp.xml
index 4737349..8c68c00 100644
--- a/res/drawable/ic_settings_sound_white.xml
+++ b/res/drawable/ic_volume_up_24dp.xml
@@ -13,17 +13,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
+        android:width="24dp"
+        android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M3 10v4c0 .55 .45 1 1 1h3l3.29 3.29c.63 .63 1.71 .18
-1.71-.71V6.41c0-.89-1.08-1.34-1.71-.71L7 9H4c-.55 0-1 .45-1 1zm13.5 2A4.5 4.5 0
-0 0 14 7.97v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 4.46v.19c0 .38 .25 .71 .61
-.85C17.18 6.54 19 9.06 19 12s-1.82 5.46-4.39 6.5c-.36 .14 -.61 .47 -.61 .85
-v.19c0 .63 .63 1.08 1.22 .86 a8.995 8.995 0 0 0 0-16.8c-.59-.23-1.22 .23 -1.22
-.86 z"/>
+        android:pathData="M3,9v6h4l5,5V4L7,9H3zM10,8.83v6.34L7.83,13H5v-2h2.83L10,8.83z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05C15.48,15.29 16.5,13.77 16.5,12z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14,3.23v2.06c2.89,0.86 5,3.54 5,6.71c0,3.17 -2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77C21,7.72 18.01,4.14 14,3.23z"/>
 </vector>
diff --git a/res/drawable/ic_zen.xml b/res/drawable/ic_zen.xml
deleted file mode 100644
index 8c50d5d..0000000
--- a/res/drawable/ic_zen.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-     Copyright (C) 2015 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:height="24dp"
-    android:width="24dp" >
-
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm4 11H8c-.55 0-1-.45-1-1s.45-1 1-1h8c.55 0 1 .45 1 1s-.45 1-1 1z" />
-
-</vector>
diff --git a/res/layout/gesture_preference.xml b/res/layout/gesture_preference.xml
deleted file mode 100644
index ccbc42a..0000000
--- a/res/layout/gesture_preference.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    android:clipToPadding="false"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="24dp"
-        android:paddingBottom="16dp"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:background="@android:color/white">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:ellipsize="marquee"/>
-
-        <Switch
-            android:id="@android:id/switch_widget"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="end|center_vertical"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/gesture_animation_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/gestures_setting_background_color"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:orientation="horizontal">
-
-        <com.android.settings.widget.AspectRatioFrameLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:padding="@dimen/gesture_animation_padding">
-
-            <TextureView
-                android:id="@+id/gesture_video"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"/>
-
-            <ImageView
-                android:id="@+id/gesture_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="fitXY"
-                android:background="@color/gestures_setting_background_color"/>
-
-            <ImageView
-                android:id="@+id/gesture_play_button"
-                android:layout_width="@dimen/gestures_play_button_size"
-                android:layout_height="@dimen/gestures_play_button_size"
-                android:src="@drawable/ic_gesture_play_button"
-                android:gravity="center"
-                android:layout_gravity="center"/>
-
-        </com.android.settings.widget.AspectRatioFrameLayout>
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:paddingTop="@dimen/gestures_settings_padding_top_bottom"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="10"
-            android:ellipsize="end"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 89ecec0..5e5d595 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -45,8 +45,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginTop="8dip"
-        android:layout_marginBottom="8dip">
+        android:layout_marginTop="16dip"
+        android:layout_marginBottom="16dip">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/two_state_button.xml b/res/layout/two_state_button.xml
index 22bf2bd..3ad1634 100644
--- a/res/layout/two_state_button.xml
+++ b/res/layout/two_state_button.xml
@@ -27,19 +27,15 @@
     <Button
         android:id="@+id/state_on_button"
         style="@style/ActionPrimaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingEnd="8dp" />
+        android:layout_gravity="center" />
 
     <Button
         android:id="@+id/state_off_button"
         style="@style/ActionSecondaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingEnd="8dp" />
+        android:layout_gravity="center" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/video_preference.xml b/res/layout/video_preference.xml
index 55bc7a5..b71a1b5 100644
--- a/res/layout/video_preference.xml
+++ b/res/layout/video_preference.xml
@@ -28,8 +28,7 @@
     <com.android.settings.widget.AspectRatioFrameLayout
         android:id="@+id/video_container"
         android:layout_width="wrap_content"
-        android:layout_height="240dp"
-        android:padding="@dimen/gesture_animation_padding">
+        android:layout_height="240dp">
 
         <TextureView
             android:id="@+id/video_texture_view"
diff --git a/res/layout/zen_onboarding.xml b/res/layout/zen_onboarding.xml
index 6467955..82951bd 100644
--- a/res/layout/zen_onboarding.xml
+++ b/res/layout/zen_onboarding.xml
@@ -17,40 +17,112 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="320dp"
-    android:layout_height="wrap_content"
-    android:padding="20dp">
+    android:layout_height="wrap_content" >
 
-    <TextView
-        android:id="@+id/header"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:id="@+id/zen_onboarding_choices"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
-        android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle" />
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
+        android:paddingTop="18dp">
 
-    <TextView
-        android:id="@+id/feature_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/header"
-        android:layout_marginTop="24dp"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        android:text="@string/zen_onboarding_dnd_visual_disturbances_description" />
+        <TextView
+            android:id="@+id/header"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
+            android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle" />
+
+        <LinearLayout
+            android:id="@+id/zen_onboarding_new_setting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/header"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="22dp"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/zen_onboarding_new_setting_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="8dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/zen_onboarding_new_setting_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/zen_onboarding_new_setting_title"
+                    android:textAppearance="?android:attr/textAppearanceListItem" />
+
+                <TextView
+                    android:id="@+id/zen_onboarding_new_setting_summary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/zen_onboarding_new_setting_summary" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/zen_onboarding_current_setting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/zen_onboarding_new_setting"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/zen_onboarding_current_setting_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="8dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/zen_onboarding_current_setting_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/zen_onboarding_current_setting_title"
+                    android:textAppearance="?android:attr/textAppearanceListItem" />
+
+                <TextView
+                    android:id="@+id/zen_onboarding_current_setting_summary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/zen_onboarding_current_setting_summary" />
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/feature_description"
-        android:layout_marginTop="35dp">
+        android:layout_below="@+id/zen_onboarding_choices"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="10dp">
 
         <Button
-            android:id="@+id/no"
+            android:id="@+id/settings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/zen_onboarding_no_update"
-            android:layout_toStartOf="@+id/ok"
+            android:text="@string/zen_onboarding_settings"
+            android:layout_alignParentStart="true"
             style="@style/TextAppearance.ZenOnboardingButton"
-            android:onClick="close" />
+            android:onClick="launchSettings" />
 
         <Button
             android:id="@+id/ok"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 33251cc..7040ee7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-toegangversoek"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang hê tot jou SIM-kaart. As jy toegang tot jou SIM-kaart verleen, sal die dataverbinding op jou toestel vir die duur van die verbinding gedeaktiveer wees. Verleen toegang aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vir ander toestelle sigbaar as \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jou toestelle"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bind nuwe toestel saam"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Laat jou tablet toe om met Bluetooth-toestelle in die omtrek te kommunikeer"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Kan nie e-SIM\'e terugstel nie"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Die e-SIM\'e kan weens \'n fout nie teruggestel word nie."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Vee alle data uit (fabriekterugstelling)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Baie lang vertraging (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Baie lang vertraging (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Lui- en kennisgewingvibrasie is op af gestel"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Lui- en kennisgewingvibrasie is op laag gestel"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Lui- en kennisgewingvibrasie is op middelmatig gestel"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skermgebruik sedert battery volgelaai is"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skermverbruik"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Programgebruik sedert battery vol gelaai is (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Toestelgebruik sedert battery vol gelaai is (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Maak toestel in agtergrond wakker"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Vra gereeld vir ligging"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> programme wat tans vreemd optree"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Battery is in \'n goeie toestand"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Programme werk normaalweg"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Programme werk normaalweg"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Foon het gewone agtergrondbatteryverbruik"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet het gewone agtergrondbatteryverbruik"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Toestel het gewone agtergrondbatteryverbruik"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Lae batterykapasiteit"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batterylewe van die battery is nie goed nie"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Verbeter jou foon se batterylewe"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet is meer as gewoonlik gebruik"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Toestel is meer as gewoonlik gebruik"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Battery kan binnekort afloop"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Jou foon is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\n <xliff:g id="NUMBER">%1$d</xliff:g> programme met meeste kraggebruik sedert dit laas gelaai is(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Jou tablet is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\n <xliff:g id="NUMBER">%1$d</xliff:g> programme met meeste kraggebruik sedert dit laas gelaai is(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Jou toestel is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\n <xliff:g id="NUMBER">%1$d</xliff:g> programme met meeste kraggebruik sedert dit laas gelaai is(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Beperk %1$d programme</item>
       <item quantity="one">Beperk %1$d program</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Hierdie program sal batterykrag op die agtergrond kan gebruik. Jou battery sal dalk gouer as verwag afloop."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Verwyder"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Kanselleer"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Jou battery hou op grond van jou gebruik gewoonlik omtrent <xliff:g id="TIME_DURATION">%1$s</xliff:g> wanneer dit vol gelaai is.\n\nSkakel Batterybespaarder aan as jy jou batterylewe wil verleng."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Skakel Batterybespaarder aan as jy jou batterylewe wil verleng"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Jou programme gebruik \'n gewone hoeveelheid batterykrag. As programme te veel batterykrag gebruik, sal jou foon handelinge voorstel wat jy kan uitvoer.\n\nJy kan altyd Batterybespaarder aanskakel as jou battery begin pap raak."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Jou programme gebruik \'n gewone hoeveelheid batterykrag. As programme te veel batterykrag gebruik, sal jou tablet handelinge voorstel wat jy kan uitvoer.\n\nJy kan altyd Batterybespaarder aanskakel as jou battery begin pap raak."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Jou programme gebruik \'n gewone hoeveelheid batterykrag. As programme te veel batterykrag gebruik, sal jou toestel handelinge voorstel wat jy kan uitvoer.\n\nJy kan altyd Batterybespaarder aanskakel as jou battery begin pap raak."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Batterybestuurder"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Bestuur programme outomaties"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Beperk die batterygebruik van programme wat jy nie gereeld gebruik nie"</string>
@@ -3075,15 +3087,14 @@
     <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">"Blokkeer visuele steurings"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Laat visuele tekens toe"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Beperk kennisgewings"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wanneer Moenie Steur Nie aangeskakel is"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Kennisgewings"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Wanneer Moenie Steur Nie aangeskakel is"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Demp kennisgewings"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Wys kennisgewings, maar demp klanke en vibrasies"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Wanneer nuwe kennisgewings opdaag, sal jou foon nie \'n klank maak of vibreer nie"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Versteek en demp kennisgewings"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Kennisgewings sal glad nie verskyn nie"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Jy sal nie nuwe of bestaande kennisgewings sien wanneer Moenie Steur Nie aan is. Kennisgewings wat vir basiese foonaktiwiteit en -status nodig is, sal egter steeds verskyn."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Wys kennisgewings sonder klank"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Kennisgewings sal gedemp word"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Wanneer kennisgewings opdaag, sal jou foon nie \'n klank maak of vibreer nie."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Versteek kennisgewings"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Jy sal nie nuwe of bestaande kennisgewings sien nie"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Jou foon sal nie nuwe of bestaande kennisgewings wys nie en sal nie \'n klank maak of vibreer nie. Kennisgewings sal nie verskyn wanneer jy van die bokant van jou skerm af ondertoe swiep nie.\n\nHou in gedagte dat belangrike kennisgewings oor foonaktiwiteit en -status steeds sal verskyn."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Gepasmaak"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktiveer gepasmaakte instelling"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Verwyder gepasmaakte instelling"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reëls kan outomaties aanskakel</item>
       <item quantity="one">1 reël kan outomaties aanskakel</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Gedrag"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Uitsonderings"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Skedule"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Klank en vibrasie"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Klank en vibrasie sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Demp almal behalwe"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Gedemp"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Nie gedemp nie"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Gedemp, maar laat <xliff:g id="SOUND_TYPE">%1$s</xliff:g> toe"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Gedemp, maar laat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> en <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> toe"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Gedemp, maar laat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> en <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> toe"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Boodskappe, geleenthede en onthounotas"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Dateer op"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Moenie opdateer nie"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Jou foon kan meer doen om jou te help fokus.\n\nDateer instellings op na:\n\n– Versteek kennisgewings heeltemal\n\n– Laat oproepe van gesterde kontakte en herhaalbellers af toe"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Dateer Moenie Steur Nie op?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Instellings"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Jy kan in Instellings verder pasmaak."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokkeer wanneer die skerm aan is"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokkeer wanneer die skerm af is"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Moenie Steur Nie kan meer doen as om ongewenste klanke te blokkeer – dit kan visuele elemente ook blokkeer. Dit kan nuttig wees as jy probeer om te slaap, te konsentreer, of die tyd te beperk wat jy op jou foon deurbring."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokkeer klanke en visuele elemente"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Moenie die skerm aanskakel of vir kennisgewings wakker maak nie"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Moet glad nie kennisgewings wys nie, behalwe vir basiese foonaktiwiteit en status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Werkprofielklanke"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> tot <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Oproepe"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Inkomende oproepe word geblokkeer wanneer Moenie Steur Nie aan is. Jy kan instellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Boodskappe"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Alle boodskappe"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Geselekteerde boodskappe"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Boodskappe"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Sommige boodskappe"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Van enigiemand af"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Net van kontakte af"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Net van gesterde kontakte af"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Van gesterde kontakte en herhaalbellers af"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Van kontakte en herhaalbellers af"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Net van herhaalbellers af"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Geen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wekkers"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Raakklanke"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Onthounotas"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Geleenthede"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle bellers"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Uitgesoekte bellers"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"enigiemand"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakte"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"gesterde kontakte"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Herhaalbellers"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Net van <xliff:g id="CALLER_TYPE">%1$s</xliff:g> af"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Van <xliff:g id="CALLER_TYPE">%1$s</xliff:g> en <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> af"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"As dieselfde persoon binne \'n tydperk van <xliff:g id="MINUTES">%d</xliff:g> minute \'n tweede keer bel"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Gepasmaak"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Sit outomaties aan"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle Moenie Steur Nie-reëls wat deur hierdie program geskep is, sal verwyder word."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Moenie optimaliseer nie"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimaliseer"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Sal jou battery dalk vinniger pap maak"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Aanbeveel vir beter batterylewe"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Laat <xliff:g id="APP">%s</xliff:g> toe om batteryoptimerings te ignoreer?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Geen"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Rugsteun is gedeaktiveer"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Opgedateer na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Opdatering is beskikbaar"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Kan nie dié instelling verander nie"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Handeling word nie toegelaat nie"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Kan nie volume verander nie"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Oproepe word nie toegelaat nie"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS word nie toegelaat nie"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Beheer inligting op sluitskerm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Wys of versteek kennisgewinginhoud"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alles"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Steundiens en wenke"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Wenke en steundiens"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Geen geïnstalleerde programme het toegang tot betaalde SMS\'e versoek nie"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Betaalde SMS\'e kan jou geld kos en die koste sal by jou diensverskafferfakture gevoeg word. As jy toestemming vir \'n program aktiveer, sal jy betaalde SMS\'e met daardie program kan stuur."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Fliek en TV-programme"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Diensverskaffervoorsiening-inligting"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger-diensverskaffervoorsiening"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is nuut en opwindend?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kry \'n kykie van jou nuwe foon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kry \'n kykie van jou nuwe tablet"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7c9a994..ab8898f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"የሲም መዳረሻ ጥያቄ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> የእርስዎ ሲም ካርድ ላይ መድረስ ይፈልጋል። ወደ ሲም ካርዱ መዳረሻ መስጠት በእርስዎ መሣሪያ ላይ ግንኙነቱ ላይ በሚቆይበት ጊዜ  ያክል የውሂብ ተገኚነትን ያሰናክላል። ለ<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> መዳረሻ ስጥ"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ለሌሎች መሣሪያዎች እንደ «<xliff:g id="DEVICE_NAME">^1</xliff:g>» ሆኖ ይታያል"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"የእርስዎ መሣሪያዎች"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"አዲስ መሣሪያ ያጣምሩ"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ከአቅራቢያ ካሉ የብሉቱዝ መሣሪያዎች ጋር መልዕክት ለመለዋወጥ እንዲችል የእርስዎን ጡባዊ ይፍቀዱለት"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMዎችን ዳግም ማስጀመር አልተቻለም"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"በስህተት ምክንያት eSIMዎቹን ዳግም ማስጀመር አልተቻለም።"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">በጣም ረጅም መዘግየት (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ሚሴ)</item>
       <item quantity="other">በጣም ረጅም መዘግየት (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ሚሴ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"የጥሪ ድምፅ እና ማሳወቂያ ወደ አጥፋ ተቀናብረዋል"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"የጥሪ ድምፅ እና ማሳወቂያ ወደ ዝቅተኛ ተቀናብረዋል"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"የጥሪ ድምፅ እና ማሳወቂያ ወደ መካከለኛ ተቀናብረዋል"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ኃይሉ ሙሉ ከነበረበት ጊዜ ጀምሮ ያለው የማያ ገጽ አጠቃቀም"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"የማያ ገጽ ፍጆታ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅኝት"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"ሙሉ ኃይል ከተሞላ ወዲህ ያለው የመተግበሪያ ጠቃቀም (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ሙሉ ኃይል ከተሞላ ወዲህ ያለው የመሣሪያ አጠቃቀም (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"በበስተጀርባ መሣሪያውን እንዲነቃ በማድረግ ላይ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"የመገኛ አካባቢ በተደጋጋሚ በመጠየቅ ላይ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> መተግበሪያዎች ጥሩ ባህሪ እያሳዩ አይደሉም"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ባትሪ በጥሩ አቋም ላይ ነው"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"መተግበሪያዎች በመደበኝነት እያሄዱ ናቸው"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ዝቅተኛ የባትሪ አቅም"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ባትሪ ጥሩ የባትሪ ዕድሜን ሊሰጥ አይችልም"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"የስልክዎን የባትሪ ህይወትን ያሻሽሉ"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ጡባዊው ከተለመደው በላይ ስራ ላይ ውሏል"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"መሣሪያው ከተለመደው በላይ ስራ ላይ ውሏል"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ባትሪ በጣም በቅርቡ ሊያልቅ ይችላል"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"የእርስዎ ስልክ ከመደበኛው በላይ ስራ ላይ ውሏል። ባትሪዎ ከተጠበቀው ጊዜ ቀድሞ ሊያልቅ ይችላል።\n\nሙሉ ኃይል ከተሞላው መጨረሻ ጊዜ ያሉ ከፍተኛዎቹ <xliff:g id="NUMBER">%1$d</xliff:g> መተግበሪያዎች (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)፦"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"የእርስዎ ጡባዊ ከመደበኛው በላይ ስራ ላይ ውሏል። ባትሪዎ ከተጠበቀው ጊዜ ቀድሞ ሊያልቅ ይችላል።\n\nሙሉ ኃይል ከተሞላው መጨረሻ ጊዜ ያሉ ከፍተኛዎቹ <xliff:g id="NUMBER">%1$d</xliff:g> መተግበሪያዎች (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)፦"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"የእርስዎ መሣሪያ ከመደበኛው በላይ ስራ ላይ ውሏል። ባትሪዎ ከተጠበቀው ጊዜ ቀድሞ ሊያልቅ ይችላል።\n\nሙሉ ኃይል ከተሞላው መጨረሻ ጊዜ ያሉ ከፍተኛዎቹ <xliff:g id="NUMBER">%1$d</xliff:g> መተግበሪያዎች (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)፦"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">%1$d መተግበሪያዎች ገድብ</item>
       <item quantity="other">%1$d መተግበሪያዎች ገድብ</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ይህ መተግበሪያ በበስተጀርባ ባትሪን መጠቀም ይችላል። ባትሪዎ ከተጠበቀው ጊዜ ቀድሞ ሊያልቅ ይችላል።"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"አስወግድ"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"ይቅር"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"በእርስዎ አጠቃቀም ላይ በመመስረት ባትሪዎ አብዛኛው ጊዜ ሙሉ በሙሉ ኃይል ሲሞላ <xliff:g id="TIME_DURATION">%1$s</xliff:g> ያህል ጊዜ ይቆያል።\n\nየባትሪዎን ዕድሜ ማራዘም ከፈለጉ ባትሪ ቆጣቢን ያብሩ።"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"የባትሪዎን ዕድሜ ማራዘም ከፈለጉ ባትሪ ቆጣቢን ያብሩ"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"የባትሪ አስተዳዳሪ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"መተግበሪያዎችን በራስ-ሰር ያቀናብሩ"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ብዙውን ጊዜ ለማይጠቀሙባቸው መተግበሪያዎች ባትሪ ይገድቡ"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ምስላዊ ምልክቶችን ፍቀድ"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"ማሳወቂያዎችን ገድብ"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"አትረብሽ ሲበራ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ማሳወቂያዎች"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"አትረብሽ ሲበራ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"ማሳወቂያዎች ላይ ድምጸ-ከል አድርግ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"ማሳወቂያዎችን አሳይ ነገር ግን በድምጾች እና ንዝረቶች ላይ ድምጸ-ከል አድርግ"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"አዲስ ማሳወቂያዎች ሲመጡ ስልክዎ ድምጽ አያሰማም ወይም አይነዝርም"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"ማሳወቂያዎችን ደብቅ እና ድምጸ-ከል አድርግባቸው"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"ማሳወቂያዎች በጭራሽ አይመጡም"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"አትረብሽ ሲበራ አዲስ ወይም ነባር ማሳወቂያዎችን አይመለከቱም። ይሁንና ለመሠረታዊ የስልክ እንቅስቃሴ እና ሁኔታ የሚያስፈልጉ ማሳወቂያዎች አሁንም ይመጣሉ።"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ማሳወቂያዎችን በጸጥታ አሳይ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ማሳወቂያዎች ድምጸ-ከል ይደረግባቸዋል"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ማሳወቂያዎች ሲመጡ ስልክዎ ድምጽ አያሰማም ወይም አይነዝርም።"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ማሳወቂያዎችን ይደብቁ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"አዲስ ወይም ነባር ማሳወቂያዎችን አይመለከቱም።"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"የእርስዎ ስልክ አዲስ ወይም ነባር ማሳወቂያዎች አያሳይም፣ እና ድምጽ አያሰማም ወይም አይነዝርም። ከማያ ገጽዎ አናት ወደ ታች ሲያንሸራትቱ ማሳወቂያዎች አይታዩም።\n\nለስልክ እንቅስቃሴ ወሳኝ የሆኑ ማሳወቂያዎች እና ሁኔታ አሁንም እንደሚታዩ ልብ ይበሉ።"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ብጁ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ብጁ ቅንብን አንቃ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ብጁ ቅንብን አስወግድ"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ደንቦች በራስሰር ሊበሩ ይችላሉ</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ደንቦች በራስሰር ሊበሩ ይችላሉ</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"እሺ"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ባህሪ"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"የማይካተቱት"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"መርሐግብር"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ድምጽ እና ንዝረት"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር ድምጽ እና ንዝረት ድምጸ-ከል ይደረግባቸዋል።"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ከእነዚህ በስተቀር ሁሉንም ድምጸ-ከል አድርግባቸው"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ድምጸ-ከል ተደርጓል"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ድምጸ-ከል አልተደረገባቸውም"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ድምጸ-ከል ተደርጎበታል፣ ነገር ግን <xliff:g id="SOUND_TYPE">%1$s</xliff:g>ን ፍቀድ"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ድምጸ-ከል ተደርጎበታል፣ ነገር ግን <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ን እና <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ን ፍቀድ"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ድምጸ-ከል ተደርጎበታል፣ ነገር ግን <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ን፣ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ን እና <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ን ፍቀድ"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"መልዕክቶች፣ ክስተቶች እና አስታዋሾች"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"አዘምን"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"አታዘምን"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"የእርስዎ ስልክ ይበልጥ እርስዎ ትኩረት እንዲያደርጉ ሊያግዝዎት ይችላል።\n\nለዚህ ቅንብሮችን ያዘምኑ፦\n\n- ማሳወቂያዎችን ሙሉ በሙሉ ይደብቁ\n\n- ኮከብ ከተደረገባቸው እውቂያዎች እና ተደጋጋሚ ደዋዮች ጥሪዎችን ይፍቀዱ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"አትረብሽ ይዘመን?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ቅንብሮች"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"ይህን በተጨማሪ በቅንብሮች ውስጥ ይበልጥ ብጁ ሊያደርጉት ይችላሉ።"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"ማያ ገጹ ሲበራ አግድ"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"ማያ ገጹ ሲጠፋ አግድ"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"አትረብሽ የማይፈለጉ ድምፆችን ከማገድ በላይ ሊያደርግ ይችላል - ምስሎችንም ማገድ ይችላል። ይህ በተለይ እርስዎ ለመተኛት፣ ለማተኮር ወይም በስልክ ላይ የሚጠፋውን ጊዜ ለመገደብ እየሞከሩ ያሉ ከሆነ አጋዥ ሊሆን ይችላል።"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ድምፆችን እና ምስሎችን አግድ"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"ማያ ገጹን ለማሳወቂያ አታብራ ወይም አትቀስቅስ"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ለመሠረታዊ የስልክ እንቅስቃሴ እና ሁኔታ ካልሆነ በስተቀር በጭራሽ ማሳወቂያዎችን አታሳይ"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"የስራ መገለጫ ድምጾች"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> እስከ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ጥሪዎች"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"አትረብሽ ሲበራ ገቢ ጥሪዎች ይታገዳሉ። የእርስዎ ጓደኛዎች፣ ቤተሰብ ወይም ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ ቅንብሮችን ማስተካከል ይችላሉ።"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"መልዕክቶች"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"ሁሉም መልዕክቶች"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"የተመረጡ መልዕክቶች"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"መልዕክቶች"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"አንዳንድ መልዕክቶች"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ከማናቸውም"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ከእውቂያዎች ብቻ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ኮከብ ከተደረገባቸው እውቂያዎች ብቻ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ኮከብ ከተደረገባቸው እውቂያዎች እና ድጋሚ ደዋዮች"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"ከእውቂያዎች እና ድጋሚ ደዋዮች"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ከድጋሚ ደዋዮች ብቻ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ምንም"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ማንቂያዎች"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"ማህደረ መረጃ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ድምፆችን ይንኩ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"አስታወሾች"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ክስተቶች"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"ሁሉም ደዋዮች"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"የተመረጡ ደዋዮች"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ማንኛውም ሰው"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ዕውቂያዎች"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ባለኮከብ ዕውቂያዎች"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ደዋዮችን ድገም"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"ከ<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ብቻ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"ከ<xliff:g id="CALLER_TYPE">%1$s</xliff:g> እና <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ተመሳሳዩ ሰው በ<xliff:g id="MINUTES">%d</xliff:g> ደቂቃ ጊዜ ውስጥ ለሁለተኛ ጊዜ ከደወለ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ብጁ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"በራስ-ሰር አብራ"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"በዚህ መተግበሪያ የተፈጠሩ የሁሉም አትረብሽ ደንቦች ይወገዳሉ።"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"አታትባ"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"አትባ"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ባትሪዎን በፍጥነት ይጨርሰው ይሆናል"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ለባትሪ እድሜ የሚመከር"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> የባትሪ ማመቻቸቶችን ችላ እንዲል ይፈቀድለት?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ምንም"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ምትኬ ተሰናክሏል"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"ወደ Android <xliff:g id="VERSION">%1$s</xliff:g> ተዘምኗል"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ዝማኔ ይገኛል"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ይህን ቅንብር መለወጥ አይቻልም"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"እርምጃ አይፈቀድም"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"የድምጽ መጠንን መለወጥ አይቻልም"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"መደወል አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ኤስኤምኤስ አልተፈቀደም"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"በማያ ገጽ መቆለፊያ ላይ የቁጥጥር መረጃ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"የማሳወቂያ ይዘት አሳይ ወይም ደብቅ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ሁሉም"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"ድጋፍ እና ጠቃሚ ምክሮች"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ጠቃሚ ምክሮች እና ድጋፍ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"አነስተኛ ስፋት"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ምንም የተጫኑ መተግበሪያዎች የፕሪሚየም ኤስኤምኤስ መዳረሻ አልጠየቁም"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ፕሪሚየም ኤስኤምኤስ ውድ ገንዘብ ሊያስወጣዎት ይችላል፣ እና በአገልግሎት አቅራቢ ክፍያዎ ላይ ሒሳብ ያስጨምርብዎታል። ለመተግበሪያ ፈቃድን ካነቁ ያንን መተግበሪያ በመጠቀም ፕሪሚየም ኤስኤምኤስ መላክ ይችላሉ።"</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"የፊልም እና ቴሌቪዥን መተግበሪያዎች"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"የአገልግሎት አቅራቢ አቅርቦት መረጃ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"የቀስቃሴ አገልግሎት አቅራቢ አቅርቦት"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ምን አዲስ እና አስደሳች ነገር አለ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"በአዲሱ ስልክዎ ላይ ጉብኝት ያድርጉ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"በአዲሱ ጡባዊዎ ላይ ጉብኝት ያድርጉ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1632b01..652ff65 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -171,6 +171,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏طلب حق الوصول إلى شريحة SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏يريد <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> الوصول إلى شريحة SIM. ويؤدي منح حق الوصول إلى شريحة SIM إلى إيقاف اتصال البيانات على جهازك طوال مدة الاتصال. منح حق الوصول إلى <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"مرئي باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"أجهزتك"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"إقران جهاز جديد"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"السماح لجهازك اللوحي بالاتصال بأجهزة بلوتوث المجاورة"</string>
@@ -250,7 +252,7 @@
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"‏تدخل التغييرات حيز التنفيذ عند إعادة توصيل كابل USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"‏تفعيل تخزين USB كبير السعة"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"إجمالي وحدات البايت:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"‏لم يتم تحميل وحدة تخزين USB."</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"‏لم يتم تثبيت وحدة تخزين USB."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"‏ليست هناك بطاقة SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"وحدات البايت المتاحة:"</string>
     <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"‏يتم استخدام وحدة تخزين USB كجهاز تخزين جماعي."</string>
@@ -262,8 +264,8 @@
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"وحدات البايت المستخدمة:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"‏جارٍ فحص وحدة تخزين USB بحثًا عن الوسائط..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"‏جارٍ فحص بطاقة SD للوسائط..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"‏وحدة تخزين USB التي تم تحميلها للقراءة فقط."</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"‏بطاقة SD تم تحميلها للقراءة فقط."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"‏وحدة تخزين USB التي تم تثبيتها للقراءة فقط."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"‏بطاقة SD تم تثبيتها للقراءة فقط."</string>
     <string name="skip_label" msgid="47510779345218297">"تخطي"</string>
     <string name="next_label" msgid="4693520878012668114">"التالي"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"اللغات"</string>
@@ -410,7 +412,7 @@
       <item quantity="one">تم إعداد بصمة إصبع واحدة (1( (<xliff:g id="COUNT_0">%1$d</xliff:g>)</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"إلغاء التأمين باستخدام بصمة الإصبع"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"فتح القفل باستخدام بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"استخدام بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"كل ما عليك فعله هو لمس مستشعر بصمات الإصبع لإلغاء قفل هاتفك أو السماح بإجراء عمليات الشراء أو تسجيل الدخول إلى التطبيقات. عليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"استخدم بصمة الإصبع لإلغاء قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدم بصمة الإصبع لإلغاء قفل هذا الجهاز. للحصول على المزيد من المعلومات. اتصل بمشرف المؤسسة."</string>
@@ -585,9 +587,9 @@
 
 </xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"نعم، إزالة"</string>
-    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغيير نقش إلغاء التأمين"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغيير نقش فتح القفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏تغيير رمز PIN لإلغاء التأمين"</string>
-    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور فتح القفل"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"أعد المحاولة. المحاولة <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> من <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"سيتم حذف بياناتك"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1688030823464420974">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
@@ -749,7 +751,7 @@
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"إلغاء إقران الجهاز"</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>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت السماعة بدون لمس الجهاز."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من جهاز الإرسال."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"سيتم قطع الدخول إلى الإنترنت عبر <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8355910926439312604">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة اتصال الإنترنت على هذا الجهاز اللوحي."</string>
@@ -868,8 +870,8 @@
     <string name="wifi_settings_scanning_required_turn_on" msgid="1364287182804820646">"تشغيل"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="5527653791584018157">"‏البحث عن شبكات Wi‑Fi مفعّل"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"الخيارات المتقدمة"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"الخيارات المتقدمة للقائمة المنسدلة. انقر نقرًا مزدوجًا للتصغير."</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"الخيارات المتقدمة للقائمة المنسدلة. انقر نقرًا مزدوجًا للتوسيع."</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"الخيارات المتقدمة للقائمة المنسدلة. انقر مرّتين للتصغير."</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"الخيارات المتقدمة للقائمة المنسدلة. انقر مرّتين للتوسيع."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"اسم الشبكة"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"‏أدخل SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"الأمان"</string>
@@ -1061,7 +1063,7 @@
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"لا يتوافق مع الملفات الشخصية للعمل"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"الصوت التلقائي للإشعارات"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"الوسائط"</string>
-    <string name="media_volume_summary" msgid="5363248930648849974">"تعيين مستوى الصوت للموسيقى ومقاطع الفيديو"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"تعيين مستوى الصوت للموسيقى والفيديوهات"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"المنبّه"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"الإعدادات الصوتية للإرساء المرفق"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"نغمات لمس لوحة الطلب"</string>
@@ -1294,7 +1296,7 @@
     <string name="memory_apps_usage" msgid="5128673488173839077">"التطبيقات وبيانات التطبيقات"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"الوسائط"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"التنزيلات"</string>
-    <string name="memory_dcim_usage" msgid="558887013613822577">"صور ومقاطع فيديو"</string>
+    <string name="memory_dcim_usage" msgid="558887013613822577">"صور وفيديوهات"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ملفات صوتية (موسيقى ونغمات رنين ووسائط، إلخ.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"ملفات أخرى"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"البيانات المؤقتة"</string>
@@ -1304,8 +1306,8 @@
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"‏إلغاء تركيب بطاقة SD كي تتمكن من إزالتها بشكل آمن"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"‏إدراج وحدة تخزين USB للتركيب"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"‏إدراج بطاقة SD للتحميل"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"‏تركيب وحدة تخزين USB"</string>
-    <string name="sd_mount" product="default" msgid="5940523765187704135">"‏تحميل بطاقة SD"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"‏تثبيت وحدة تخزين USB"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"‏تثبيت بطاقة SD"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"‏محو وحدة تخزين USB"</string>
@@ -1315,13 +1317,13 @@
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"هل تريد محو البيانات المؤقتة؟"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"يؤدي ذلك إلى محو البيانات المؤقتة لكل التطبيقات."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"‏وظيفة MTP أو PTP نشطة"</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"‏إلغاء تحميل وحدة تخزين USB؟"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"‏إلغاء تثبيت وحدة تخزين USB؟"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"‏هل تريد إلغاء تحميل بطاقة SD؟"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"‏في حالة إلغاء تحميل وحدة تخزين USB، ستتوقف بعض التطبيقات التي تستخدمها وربما لا يتم توفيرها حتى يتم إعادة تحميل وحدة تخزين USB."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"‏في حالة إلغاء تثبيت وحدة تخزين USB، ستتوقف بعض التطبيقات التي تستخدمها وربما لا يتم توفيرها حتى يتم إعادة تثبيت وحدة تخزين USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"‏في حالة إلغاء تحميل بطاقة SD، ستتوقف بعض التطبيقات التي تستخدمها وربما لا تتوفر حتى يتم إعادة تحميل بطاقة SD."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"‏تعذر إلغاء تحميل وحدة تخزين USB. أعد المحاولة لاحقًا."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"‏تعذر إلغاء تثبيت وحدة تخزين USB. أعد المحاولة لاحقًا."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"‏تعذر إلغاء تحميل بطاقة SD. أعد المحاولة لاحقًا."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"‏سيتم إلغاء تركيب وحدة تخزين USB."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"‏سيتم إلغاء تركيب بطاقة SD."</string>
@@ -1330,7 +1332,7 @@
     <string name="storage_low_title" msgid="1388569749716225155">"مساحة التخزين منخفضة"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"قد لا تعمل بعض ميزات النظام، مثل المزامنة بشكل صحيح. حاول تفريغ مساحة من خلال حذف عناصر أو إلغاء تثبيتها، مثل التطبيقات أو محتوى الوسائط."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"إعادة تسمية"</string>
-    <string name="storage_menu_mount" msgid="1014683672493425425">"تحميل"</string>
+    <string name="storage_menu_mount" msgid="1014683672493425425">"تثبيت"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"إخراج"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"تهيئة"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"تهيئة كوحدة تخزين محمولة"</string>
@@ -1356,14 +1358,14 @@
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="1303803057698959872">"مستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_volume_used_total" msgid="6113121714019000244">"إجمالي السعة المستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_mount_success" msgid="687641090137253647">"تم تحميل <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="storage_mount_failure" msgid="1042621107954547316">"تعذر تحميل <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_success" msgid="687641090137253647">"تم تثبيت <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="1042621107954547316">"تعذر تثبيت <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"تم إخراج <xliff:g id="NAME">%1$s</xliff:g> بشكل آمن"</string>
     <string name="storage_unmount_failure" msgid="5758387106579519489">"تعذر إخراج <xliff:g id="NAME">%1$s</xliff:g> بشكل آمن"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"تم تنسيق <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"تعذر تنسيق <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"إعادة تسمية وحدة التخزين"</string>
-    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"تم إنهاء تحميل <xliff:g id="NAME_0">^1</xliff:g> هذه بشكل آمن، ولكنها لا تزال موجودة.\n\nلاستخدام <xliff:g id="NAME_1">^1</xliff:g> هذه، عليك تحميلها أولاً."</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"تم إنهاء تثبيت <xliff:g id="NAME_0">^1</xliff:g> هذه بشكل آمن، ولكنها لا تزال موجودة.\n\nلاستخدام <xliff:g id="NAME_1">^1</xliff:g> هذه، عليك تثبيتها أولاً."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"بطاقة <xliff:g id="NAME_0">^1</xliff:g> هذه تالفة. \n\nلاستخدام بطاقة <xliff:g id="NAME_1">^1</xliff:g> هذه، عليك إعدادها أولاً."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"هذا الجهاز غير متوافق مع <xliff:g id="NAME_0">^1</xliff:g> هذه. \n\nلاستخدام <xliff:g id="NAME_1">^1</xliff:g> هذه مع هذا الجهاز، عليك إعدادها أولاً."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"‏بعد إجراء التنسيق، يمكنك استخدام <xliff:g id="NAME_0">^1</xliff:g> هذه على أجهزة أخرى. \n\nوسيتم محو جميع البيانات الموجودة على <xliff:g id="NAME_1">^1</xliff:g> هذه. يمكنك إجراء النسخ الاحتياطي أولاً. \n\n"<b>"النسخ الاحتياطي للصور والوسائط الأخرى"</b>" \nيمكنك نقل ملفات الوسائط إلى وحدة تخزين بديلة على هذا الجهاز أو نقلها إلى جهاز كمبيوتر باستخدام كابل USB. \n\n"<b>"النسخ الاحتياطي للتطبيقات"</b>" \nستتم إزالة جميع التطبيقات المخزنة على <xliff:g id="NAME_6">^1</xliff:g> هذه وكذلك سيتم محو بياناتها. وللاحتفاظ بهذه التطبيقات، يمكنك نقلها إلى وحدة تخزين بديلة على هذا الجهاز."</string>
@@ -1373,7 +1375,7 @@
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"سيتم فقد كل التطبيقات والصور والبيانات المخزنة على <xliff:g id="NAME">^1</xliff:g> هذه للأبد."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"التطبيقات"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"الصور"</string>
-    <string name="storage_detail_videos" msgid="2919743464827110953">"مقاطع الفيديو"</string>
+    <string name="storage_detail_videos" msgid="2919743464827110953">"الفيديوهات"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"الصوت"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"البيانات المخزنة مؤقتًا"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"غير ذلك"</string>
@@ -1505,6 +1507,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"‏تتعذّر إعادة تعيين شرائح eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"‏تتعذَّر إعادة تعيين شرائح eSIM بسبب حدوث خطأ."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"محو جميع البيانات (إعادة الضبط على الإعداد الأساسي)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"الحسابات المسجَّل الدخول إليها حاليًا:\n"</string>
@@ -1560,7 +1564,7 @@
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"‏هل تريد استخدام <xliff:g id="NEW_APP">%1$s</xliff:g> بدلاً من <xliff:g id="CURRENT_APP">%2$s</xliff:g> كتطبيق للرسائل القصيرة SMS؟"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"‏هل تريد استخدام <xliff:g id="NEW_APP">%s</xliff:g> كتطبيق للرسائل القصيرة SMS؟"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"مقدّم خدمة تقييم الشبكة"</string>
-    <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"بدون"</string>
+    <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"لا أحد"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"‏هل تريد تغيير مساعد Wi‑Fi؟"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"هل تريد استخدام <xliff:g id="NEW_APP">%1$s</xliff:g> بدلاً من <xliff:g id="CURRENT_APP">%2$s</xliff:g> لإدارة اتصالات الشبكة لديك؟"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"هل تريد استخدام <xliff:g id="NEW_APP">%s</xliff:g> لإدارة اتصالات الشبكة لديك؟"</string>
@@ -1660,20 +1664,20 @@
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"كلمة مرور خاطئة"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"نقش خاطئ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"أمان الجهاز"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"تغيير نقش إلغاء التأمين"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"تغيير نقش فتح القفل"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"‏تغيير رمز PIN لإلغاء التأمين"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ارسم نقش إلغاء التأمين"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ارسم نقش فتح القفل"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"اضغط على \"القائمة\" للمساعدة."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ارفع الإصبع عن الشاشة عند الانتهاء"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"صل <xliff:g id="NUMBER">%d</xliff:g> من النقاط على الأقل. أعد المحاولة."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"تم تسجيل النقش"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ارسم النقش مرة أخرى للتأكيد"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"نقش إلغاء التأمين الجديد"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"نقش فتح القفل الجديد"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"تأكيد"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"إعادة الرسم"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"محو"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"متابعة"</string>
-    <string name="lockpattern_settings_title" msgid="3207750489460466680">"نقش إلغاء التأمين"</string>
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"نقش فتح القفل"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"النقش مطلوب"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"يجب رسم نقش لإلغاء تأمين الشاشة"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"جعل النقش مرئيًا"</string>
@@ -1681,8 +1685,8 @@
     <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_choose_lock_pattern" msgid="1652352830005653447">"تعيين نقش إلغاء التأمين"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"تغيير نقش إلغاء التأمين"</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>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"تم إجراء عدد كبير جدًا من المحاولات غير الصحيحة. أعد المحاولة خلال <xliff:g id="NUMBER">%d</xliff:g> من الثواني."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"لم يتم تثبيت التطبيق على هاتفك."</string>
@@ -2078,6 +2082,8 @@
       <item quantity="other">مهلة طويلة جدًا (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> مللي ثانية)</item>
       <item quantity="one">مهلة طويلة جدًا (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> مللي ثانية)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"تم ضبط الرنين والإشعار على \"غير مفعّل\"."</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"تم ضبط الرنين والإشعار على \"منخفض\"."</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"تم ضبط الرنين والإشعار على \"متوسط\"."</string>
@@ -2130,7 +2136,7 @@
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"ملاحظة أفعالك"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"تلقّي إشعارات كلما تفاعلتَ مع تطبيق"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"يؤدي النقر على \"حسنًا\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="2247101878627941561">"يؤدي النقر على \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"لم يتم تثبيت أي خدمات"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"لم يتم اختيار أي خدمة"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</string>
@@ -2193,8 +2199,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"استخدام الشاشة منذ الشحن الكامل"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"استهلاك الشاشة"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"البحث عن شبكات الجوال"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"استخدام التطبيق منذ الشحن الكامل (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"استخدام الجهاز منذ الشحن الكامل (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2225,8 +2231,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ينشِّط الجهاز في الخلفية"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"يطلب معرفة الموقع بشكل متكرر"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"يعمل <xliff:g id="NUMBER">%1$d</xliff:g> من التطبيقات بطريقة غير طبيعية"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"البطارية في حالة جيدة."</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"تعمل التطبيقات بشكل طبيعي."</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"مستوى شحن البطارية منخفض"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"لا يمكن للبطارية تقديم عمر بطارية جيد"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"تحسين عمر بطارية الهاتف"</string>
@@ -2241,9 +2253,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"الجهاز اللوحي المستخدَم أكثر من المعتاد"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"الجهاز المستخدَم أكثر من المعتاد"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"قد ينفد شحن البطارية قريبًا."</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"تم استخدام هاتفك أكثر من المعتاد. قد ينفد شحن البطارية قبل الوقت المتوقع.\n\nأكثر <xliff:g id="NUMBER">%1$d</xliff:g> تطبيق استهلاكًا للبطارية منذ عملية الشحن الأخيرة(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"تم استخدام جهازك اللوحي أكثر من المعتاد. قد ينفد شحن البطارية قبل الوقت المتوقع.\n\nأكثر <xliff:g id="NUMBER">%1$d</xliff:g> تطبيق استهلاكًا للبطارية منذ عملية الشحن الأخيرة(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"تم استخدام جهازك أكثر من المعتاد. قد ينفد شحن البطارية قبل الوقت المتوقع.\n\nأكثر <xliff:g id="NUMBER">%1$d</xliff:g> تطبيق استهلاكًا للبطارية منذ عملية الشحن الأخيرة(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="zero">‏تقييد %1$d تطبيق</item>
       <item quantity="two">تقييد تطبيقين</item>
@@ -2292,8 +2307,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"سيتمكّن هذا التطبيق من استخدام البطارية في الخلفية، وقد يؤدي ذلك إلى نفاد شحنها قبل الوقت المتوقع."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"إزالة"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"إلغاء"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"تستمر بطارية جهازك عادةً لمدة <xliff:g id="TIME_DURATION">%1$s</xliff:g> عند شحنها بالكامل، وذلك حسب استخدامك.\n\nلإطالة عمر البطارية، يمكنك تفعيل ميزة \"توفير شحن البطارية\"."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"لإطالة عمر البطارية، يمكنك تفعيل ميزة \"توفير شحن البطارية\"."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"مدير البطارية"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"إدارة التطبيقات تلقائيًا"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"تقييد استخدام البطارية للتطبيقات التي لا تستخدمها كثيرًا"</string>
@@ -3096,7 +3115,7 @@
     <string name="keywords_storage" msgid="3299217909546089225">"مسافة، قرص، محرك أقراص ثابتة، استخدام جهاز"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"استخدام الطاقة، شحن"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"تهجئة، قاموس، تدقيق إملائي، تصحيح تلقائي"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"أداة تعرف، إدخال، تحدث، نطق، لغة، بدون استخدام اليدين، تعرف، بدون يدين، كلمة، مسيئة، صوت، سجل، سماعة رأس بلوتوث"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"أداة تعرف، إدخال، تحدث، نطق، لغة، بدون لمس الجهاز، تعرف، بدون لمس الجهاز، كلمة، مسيئة، صوت، سجل، سماعة رأس بلوتوث"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"تقييم، لغة، تلقائي، يتحدث، تحدث، تحويل نص إلى كلام، إمكانية الوصول، قارئ شاشة، مكفوف"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ساعة، عسكرية"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"إعادة ضبط، استرداد، المصنع"</string>
@@ -3215,15 +3234,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"السماح بالإشارات المرئية"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"تقييد الإشعارات"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"الإشعارات"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"عند تفعيل الحالة \"الرجاء عدم الإزعاج\""</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"كتم صوت الإشعارات"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"عرض الإشعارات مع كتم الأصوات والاهتزازات"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"عند ظهور إشعارات جديدة، لن يُصدر هاتفك صوتًا أو يهتزّ."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"إخفاء الإشعارات وكتم صوتها"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"لن تظهر الإشعارات مطلقًا."</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"لن ترى إشعارات جديدة أو حالية عندما تكون الحالة \"الرجاء عدم الإزعاج\" مفعَّلة. ولكن سيستمر ظهور الإشعارات المطلوبة للأنشطة والحالة الأساسية على الهاتف."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"عرض الإشعارات بدون تنبيه صوتي"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"سيتم تجاهل الإشعارات."</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"عند ظهور إشعارات، لن يُصدر هاتفك صوتًا أو يهتزّ."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"إخفاء الإشعارات"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"لن ترى إشعارات جديدة أو حالية."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"لن يعرض هاتفك إشعارات جديدة أو حالية ولن يُصدر صوتًا أو يهتزّ. ولن تظهر الإشعارات عند التمرير بسرعة من أعلى الشاشة.\n\nجدير بالذكر أن الإشعارات المهمّة عن أنشطة الهاتف وحالته ستستمر في الظهور."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"الإعدادات المخصّصة"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"تفعيل الإعداد المخصّص"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"إزالة الإعداد المخصّص"</string>
@@ -3283,13 +3301,27 @@
       <item quantity="other">يمكن تشغيل <xliff:g id="ON_COUNT">%d</xliff:g> قاعدة تلقائيًا.</item>
       <item quantity="one">يمكن تشغيل قاعدة واحدة تلقائيًا.</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"موافق"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"السُلوك"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"الاستثناءات"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"الجدول الزمني"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"الصوت والاهتزاز"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم كتم الصوت ومنع الاهتزاز باستثناء تلك العناصر التي تسمح بها أعلاه."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"تمّ كتم جميع الأصوات باستثناء"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"تمّ كتم الصوت."</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"لم يتم كتم الصوت."</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"تمّ كتم الصوت مع السماح بـ <xliff:g id="SOUND_TYPE">%1$s</xliff:g>."</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"تمّ كتم الصوت مع السماح لـ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>."</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"تمّ كتم الصوت مع السماح لـ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> و<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"الرسائل والأحداث والتذكيرات"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم تجاهل الإشعارات عن الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"تحديث"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"عدم التحديث"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"يمكن أن يوفر لك هاتفك المزيد من الميزات التي تساعدك على التركيز.\n\nتحديث الإعدادات لإجراء ما يلي:\n\n- إخفاء الإشعارات تمامًا\n\n- السماح بالمكالمات من جهات الاتصال المميزة بنجمة والمتصلين بشكل متكرر"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"هل تريد تحديث إعداد \"الرجاء عدم الإزعاج\"؟"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"الإعدادات"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"يمكنك إجراء المزيد من عمليات التخصيص لهذا الوضع في \"الإعدادات\"."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"حظر عند تشغيل الشاشة"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"حظر عند إيقاف الشاشة"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"يمكن لوضع \"الرجاء عدم الإزعاج\" إجراء أشياء أخرى بالإضافة إلى حظر الأصوات غير المرغوبة - فيمكنه حظر العناصر المرئية أيضًا. وقد يكون هذا مفيدًا عندما تحاول الخلود للنوم أو التركيز أو تقييد الوقت الذي تقضيه في استخدام هاتفك."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"حظر الأصوات والعناصر المرئية"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"عدم تشغيل الشاشة أو التنشيط للإشعارات"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"عدم عرض الإشعارات على الإطلاق باستثناء نشاط الهاتف الأساسي وحالته"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"أصوات الملف الشخصي للعمل"</string>
@@ -3476,21 +3508,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> إلى <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"المكالمات"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، يتم حظر المكالمات الواردة. يمكنك ضبط الإعدادات للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"الرسائل"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"جميع الرسائل"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"رسائل محددة"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"الرسائل"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"بعض الرسائل"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"من أي شخص"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"من جهات الاتصال فقط"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"من جهات الاتصال المميزة بنجمة فقط"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"من جهات الاتصال المميّزة بنجمة والمتّصلين المتكرّرين"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"من جهات الاتصال والمتّصلين المتكرّرين"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"من المتّصلين المتكرّرين فقط"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"من لا أحد"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"التنبيهات"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"الوسائط"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"أصوات اللمس"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"التذكيرات"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"الأحداث"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"جميع المتصلين"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"المتصلون المحدّدون"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"أي شخص"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"جهات الاتصال"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"جهات الاتصال المميّزة بنجمة"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"المتصلون المتكرّرون"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"من <xliff:g id="CALLER_TYPE">%1$s</xliff:g> فقط"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"من <xliff:g id="CALLER_TYPE">%1$s</xliff:g> و<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"في حال اتصال الشخص نفسه للمرة الثانية في غضون <xliff:g id="MINUTES">%d</xliff:g> دقيقة"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"مخصص"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"تشغيل تلقائي"</string>
@@ -3638,7 +3680,7 @@
     <string name="app_permissions" msgid="4148222031991883874">"أذونات التطبيق"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"التطبيقات التي تستخدم <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"انقر للتنبيه من وضع السكون"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"انقر نقرًا مزدوجًا على أي مكان بالشاشة لتنبيه الجهاز من وضع السكون"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"انقر مرّتين على أي مكان بالشاشة لتنبيه الجهاز من وضع السكون"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"فتح الروابط"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"عدم فتح الروابط المتوافقة"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"فتح <xliff:g id="DOMAIN">%s</xliff:g>"</string>
@@ -3800,7 +3842,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ستتم إزالة كل قواعد \"عدم الإزعاج\" التي أنشأها هذا التطبيق."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"عدم تحسين"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"تحسين"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"يمكن أن يستنزف ذلك طاقة بطاريتك بسرعة"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"مُوصى بها لزيادة عمر البطارية"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"هل تريد السماح لتطبيق <xliff:g id="APP">%s</xliff:g> بتجاهل تحسينات البطارية؟"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"بدون"</string>
@@ -3880,7 +3923,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"تم إيقاف الاحتفاظ بنسخة احتياطية"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏تم التحديث إلى الإصدار <xliff:g id="VERSION">%1$s</xliff:g> من Android."</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"هناك تحديث متوفّر."</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"يتعذّر تغيير هذا الإعداد."</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"غير مسموح بهذا الإجراء"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"يتعذّر تغيير مستوى الصوت."</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"غير مسموح بإجراء مكالمات"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"‏غير مسموح بالرسائل القصيرة SMS"</string>
@@ -4094,7 +4137,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"التحكم في المعلومات على شاشة التأمين"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"إظهار محتوى الإشعار أو إخفاؤه"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"الكل"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"الدعم والنصائح"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"النصائح والدعم"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"أصغر عرض"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏لم تطلب أي تطبيقات مثبَّتة إمكانية إرسال رسائل قصيرة SMS مميزة."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"‏يمكن أن تكلفك الرسائل القصيرة SMS للخدمات بعض الرسوم، وستتم إضافة هذه الرسوم إلى فواتير مشغِّل شبكة الجوّال. وفي حالة تفعيل الإذن لأحد التطبيقات، ستتمكن من إرسال رسائل قصيرة SMS للخدمات باستخدام هذا التطبيق."</string>
@@ -4136,8 +4179,8 @@
       <item quantity="one">ثانية واحدة</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"إدارة سعة التخزين"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير سعة التخزين من جهاز الصور ومقاطع الفيديو التي تم الاحتفاظ بنسخة احتياطية منها."</string>
-    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"إزالة الصور ومقاطع الفيديو"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير سعة التخزين من جهاز الصور والفيديوهات التي تم الاحتفاظ بنسخة احتياطية منها."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"إزالة الصور والفيديوهات"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدير سعة التخزين"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"استخدام مدير سعة التخزين"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"تلقائي"</string>
@@ -4158,8 +4201,8 @@
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"تجربة زر \"الشاشة الرئيسية\" الجديد"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"يمكنك تفعيل الإيماءة الجديدة لتبديل التطبيقات."</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"النقر مرّتين للاطّلاع على الهاتف"</string>
-    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"انقر نقرًا مزدوجًا للاطلاع على الجهاز اللوحي"</string>
-    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"انقر نقرًا مزدوجًا للاطلاع على الجهاز"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"انقر مرّتين للاطلاع على الجهاز اللوحي"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"انقر مرّتين للاطلاع على الجهاز"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"للاطّلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، انقر مرّتين على الشاشة."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"حمل الهاتف للاطّلاع عليه"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"يمكنك حمل الجهاز اللوحي للاطلاع عليه"</string>
@@ -4327,6 +4370,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"تطبيقات الأفلام والتلفزيون"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"معلومات توفير خدمة مشغل شبكة الجوال"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"بدء توفير خدمة مشغل شبكة الجوال"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ما الميزات الجديدة والمثيرة للاهتمام؟"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"الحصول على جولة في هاتفك الجديد"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"الحصول على جولة في جهازك اللوحي الجديد"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 5498e75..ba7443b 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -166,6 +166,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ছিম প্ৰৱেশৰ অনুৰোধ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>এ আপোনাৰ ছিম কাৰ্ডখনত প্ৰৱেশ কৰিব বিচাৰিছে। এই অনুমতি দিলে ছিমত প্ৰৱেশ কৰি থকা সময়খিনিত ডিভাইচত ডেটা সংযোগ নাথাকিব। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>ক অনুমতি দিয়ক"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"অন্য ডিভাইচে “<xliff:g id="DEVICE_NAME">^1</xliff:g>” হিচাপে দেখা পাব"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"আপোনাৰ ডিভাইচসমূহ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"নতুন ডিভাইচ যোৰা লগাওক"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"আপোনাৰ টেবলেটটোক নিকটৱৰ্তী ব্লুটুথ ডিভাইচৰ সৈতে যোগাযোগ কৰিবলৈ অনুমতি দিয়ক"</string>
@@ -1452,6 +1454,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"ই-ছিমবোৰ ৰিছেট কৰিব নোৱাৰি"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"কোনো আসোঁৱাহ হোৱা কাৰণে ই-ছিমবোৰ ৰিছেট কৰিব পৰা নাযায়৷"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ইয়ে আপোনাৰ ডিভাইচৰ "<b>"আভ্যন্তৰিণ সঞ্চয়াগাৰৰ"</b>"লগতে \n\n"<li>"সকলো ডেটা মচিব: আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপৰ ডেটা আৰু ছেটিংসমূহ"</li>\n<li>"ডাউনল\'ড কৰা হোৱা এপসমূহ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"এই কাৰ্যই আপোনাৰ ফোনৰ "<b>"আভ্যন্তৰীণ সঞ্চয়াগাৰ"</b>" ৰ লগতে \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্ ডাটা আৰু ছেটিংবোৰ"</li>\n<li>"ডাউনলোড কৰা এপসমূহ"</li>" ৰ পৰা সকলো ডেটা মচিব"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"আপুনি বৰ্তমান এই একাউণ্টসমূহত ছাইন ইন হৈ আছে:\n"</string>
@@ -1997,6 +2001,8 @@
       <item quantity="one">বহু বেছি সময়ৰ বিলম্ব (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> মি. ছে.)</item>
       <item quantity="other">বহু বেছি সময়ৰ বিলম্ব (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> মি. ছে.)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ৰিং আৰু জাননীৰ ধ্বনি অফ হিচাপে ছেট কৰা হৈছে"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ৰিং আৰু জাননীৰ ধ্বনি নিম্ন স্তৰত ছেট কৰা হৈছে"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ৰিং আৰু জাননীৰ ধ্বনি মধ্যমীয়া স্তৰত ছেট কৰা হৈছে"</string>
@@ -2104,8 +2110,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"সম্পূৰ্ণ চ্চাৰ্জ হোৱাৰ পিছত স্ক্ৰীণৰ ব্যৱহাৰ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্ৰীণে কৰা খৰচ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ম\'বাইল নেটৱৰ্ক স্কেনিং"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"পূৰ্ণ চাৰ্জ হোৱাৰ পিছত এপৰ ব্যৱহাৰ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"সম্পূৰ্ণকৈ চাৰ্জ হোৱাৰ পিছত ডিভাইচৰ ব্যৱহাৰ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2136,8 +2142,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ডিভাইচক নেপথ্যত সক্ৰিয় কৰক"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"অৱস্থান ঘনাই অনুৰোধ কৰিছে"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> এপে অস্বাভাৱিক আচৰণ কৰিছে"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"বেটাৰি ভাল পৰ্যায়ত আছে"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"এপসমূহ সামান্য়ভাৱে চলি আছে"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"বেটাৰিৰ বহনক্ষমতা কম"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"বেটাৰি বেছি সময় নচলে"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"ফ\'নৰ বেটাৰিৰ অৱস্থা উন্নত কৰক"</string>
@@ -2152,9 +2164,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"টেবলেট সামান্য অৱস্থাতকৈ বেছি ব্যৱহাৰ কৰা হ\'ল"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ডিভাইচ সামান্য অৱস্থাতকৈ বেছি ব্যৱহাৰ কৰা হ\'ল"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"বেটাৰি অতি সোনকালে শেষ হ\'ব পাৰে"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"আপোনাৰ ফ\'ন সামান্য অৱস্থাতকৈ বেছি ব্যৱহাৰ কৰা হৈছে। আপোনাৰ বেটাৰি অপেক্ষা কৰাতকৈ সোনকালে শেষ হ\'ব পাৰে।\n \nশেহতীয়াকৈ চ্চাৰ্জ কৰাৰ পাছত সবাতোকৈ বেছি বেটাৰি ব্যৱহাৰ কৰা শীৰ্ষৰ <xliff:g id="NUMBER">%1$d</xliff:g>টা এপ্(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"আপোনাৰ টেবলেট সামান্য অৱস্থাতকৈ বেছি ব্যৱহাৰ কৰা হৈছে। আপোনাৰ বেটাৰি অপেক্ষা কৰাতকৈ সোনকালে শেষ হ\'ব পাৰে।\n\nশেহতীয়াকৈ চ্চাৰ্জ কৰাৰ পাছত সবাতোকৈ বেছি বেটাৰি ব্যৱহাৰ কৰা শীৰ্ষৰ <xliff:g id="NUMBER">%1$d</xliff:g>টা এপ্(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"আপোনাৰ ডিভাইচ সামান্য অৱস্থাতকৈ বেছি ব্যৱহাৰ কৰা হৈছে। আপোনাৰ বেটাৰি অপেক্ষা কৰাতকৈ সোনকালে শেষ হ\'ব পাৰে।\n\nশেহতীয়াকৈ চ্চাৰ্জ কৰাৰ পাছত সবাতোকৈ বেছি বেটাৰি ব্যৱহাৰ কৰা শীৰ্ষৰ <xliff:g id="NUMBER">%1$d</xliff:g>টা এপ্(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">%1$dটা এপক সীমাবদ্ধ কৰক</item>
       <item quantity="other">%1$dটা এপক সীমাবদ্ধ কৰক</item>
@@ -2183,8 +2198,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"এই এপে নেপথ্য়ত বেটাৰি ব্যৱহাৰ কৰিব পাৰে। আপোনাৰ বেটাৰি অপেক্ষা কৰাতকৈ সোনকালে শেষ হ\'ব পাৰে।"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"আঁতৰাওক"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"বাতিল কৰক"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"আপুনি যি ধৰণে বেটাৰি ব্য়ৱহাৰ কৰে সেই অনুসৰি পূৰ্ণ চ্চাৰ্জ কৰাৰ পাছত ই সাধাৰণতে প্ৰায় <xliff:g id="TIME_DURATION">%1$s</xliff:g> সময় চলে।\n\nযদি আপুনি নিজৰ বেটাৰি অধিক সময় চলাটো বিচাৰে তেন্তে বেটাৰি সঞ্চয়কাৰী অন কৰক।"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"যদি আপুনি নিজৰ বেটাৰি অধিক সময় চলাটো বিচাৰে তেন্তে বেটাৰি সঞ্চয়কাৰী অন কৰক।"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"বেটাৰি মেনেজাৰ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"এপসমূহক স্বয়ংক্ৰিয়ভাৱে পৰিচালনা কৰক"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"আপুনি সঘনাই ব্য়ৱহাৰ নকৰা এপসমূহৰ বাবে বেটাৰিৰ ব্য়ৱহাৰ সীমিত কৰক"</string>
@@ -3074,38 +3093,21 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"দৃশ্যমান সংকেতৰ অনুমতি দিয়ক"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"যেতিয়া অসুবিধা নিদিব ম\'ড অন অৱস্থাত থাকে"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"জাননীসমূহ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"জাননীসমূহ নীৰৱে দেখুৱাওক"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"জাননীসমূহ মিউট কৰা হ\'ব"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"জাননী আহিলে আপোনাৰ ফ\'নে কোনো ধ্বনি বা কম্পন নকৰিব।"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"জাননীসমূহ লুকুৱাওক"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"আপুনি নতুন বা পুৰণি জাননীসমূহ দেখা নাপাব"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"আপোনাৰ ফ’নে নতুন বা পুৰণি জাননীসমূহ নেদেখুৱাব আৰু কোনো ধ্বনি বা কম্পন নকৰিব। আপুনি নিজৰ স্ক্ৰীণৰ ওপৰৰ পৰা তললৈ ছোৱাইপ কৰোঁতে জাননীসমূহ দেখুওৱা নহ’ব।\n\nমনত ৰাখিব যে, তেতিয়াও ফ\'নৰ কাৰ্যকলাপৰ বাবে প্ৰয়োজনীয় জাননীসমূহ আৰু ইয়াৰ স্থিতি দেখুওৱা হ\'ব।"</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"নিজৰ উপযোগিতা অনুসৰি কৰা ছেটিং"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"নিজৰ উপযোগিতা অনুসৰি কৰা ছেটিং সক্ষম কৰক"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"নিজৰ উপযোগিতা অনুসৰি কৰা ছেটিং আঁতৰাওক"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"দেখা দিব"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"আংশিকভাৱে লুকুওৱা হৈছে"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"লুকুওৱা হৈছে"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"নিজৰ উপযোগিতা অনুসৰি কৰা অৱৰোধসমূহ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"যেতিয়া স্ক্ৰীণখন অন হৈ থাকে"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"যেতিয়া স্ক্ৰীণখন অফ হৈ থাকে"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"ধ্বনি আৰু কম্পন নিৰৱ কৰক"</string>
@@ -3150,13 +3152,31 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টা নিয়ম স্বয়ংক্ৰিয়ভাৱে অন হ\'ব পাৰে</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টা নিয়ম স্বয়ংক্ৰিয়ভাৱে অন হ\'ব পাৰে</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ঠিক আছে"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"আচৰণ"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ব্যতিক্রম"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"সূচীৰ পৰা"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ধ্বনি আৰু কম্পন"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত আপুনি ওপৰত অনুমতি দিয়া বস্তুবোৰৰ বাহিৰে ধ্বনি আৰু কম্পনক মিউট কৰা হ\'ব।"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ইয়াৰ বাহিৰে সকলোকে মিউট কৰক"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"মিউট আছে"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"মিউট কৰা হোৱা নাই"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"মিউট কৰা হৈছে, কিন্তু <xliff:g id="SOUND_TYPE">%1$s</xliff:g>ক অনুমতি দিয়ক"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"মিউট কৰা হৈছে, কিন্তু <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> আৰু <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ক অনুমতি দিয়ক"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"মিউট কৰা হৈছে, কিন্তু <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> আৰু <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ক অনুমতি দিয়ক"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"বাৰ্তা, কাৰ্যক্ৰম আৰু সোঁৱৰণিসমূহ"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত আপুনি ওপৰত অনুমতি দিয়া বস্তুবোৰৰ বাহিৰে বাৰ্তা, সোঁৱৰণী আৰু কাৰ্যক্ৰমবোৰ মিউট কৰা হ\'ব। আপুনি নিজৰ বন্ধু, পৰিয়ালৰ সদস্য় বা অন্য় সম্পৰ্কসমূহক আপোনাৰ সৈতে যোগাযোগ কৰিবৰ বাবে অনুমতি দিবলৈ ছেটিংসমূহ মিলাব পাৰে।"</string>
+    <!-- no translation found for zen_onboarding_ok (4157146842078658361) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_no_update (3103752501952811308) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_description (4051020254348888576) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (4243599835234481809) -->
+    <skip />
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ছেটিংবোৰ"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"আপুনি ছেটিংসমূহলৈ গৈ ইয়াক আৰু বেছিকৈ নিজৰ উপযোগিতা অনুযায়ী কৰিব পাৰে।"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"স্ক্ৰীণ অন থকা অৱস্থাত অৱৰোধ কৰক"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"স্ক্ৰীণখন অফ থকা অৱস্থাত অৱৰোধ কৰক"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"অসুবিধা নিদিব ম\'ডে অবাঞ্চিত ধ্বনিবোৰক অৱৰোধ কৰাকে ধৰি আৰু বহুত কাম কৰিব পাৰ - ই দৃশ্য়বোৰকো অৱৰোধ কৰিব পাৰে। আপুনি যদি শুবলৈ, ফ\'কাছ কৰিবলৈ বা নিজৰ ফ\'নত অতিবাহিত কৰা সময় সীমিত কৰিবলৈ বিচাৰে তেন্তে ই সহায়ক হ\'ব পাৰে।"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ধ্বনি আৰু দৃশ্য়বোৰক অৱৰোধ কৰক"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"জাননীসমূহৰ বাবে স্ক্ৰীণ অন বা সক্ৰিয় নকৰিব"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ফ\'নৰ প্ৰাথমিক কাৰ্যকলাপ আৰু স্থিতিৰ বাদে জাননীসমূহ সমূলি নেদেখুৱাব"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ ধ্বনিসমূহ"</string>
@@ -3327,21 +3347,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> পৰা <xliff:g id="END">%2$s</xliff:g> লৈ"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"কলসমূহ"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত অন্তৰ্গামী কলবোৰক অৱৰোধ কৰা হয়। আপুনি নিজৰ বন্ধু, পৰিয়ালৰ সদস্য় বা অন্য় সম্পৰ্কসমূহক আপোনাৰ সৈতে যোগাযোগ কৰিবৰ বাবে অনুমতি দিবলৈ ছেটিংসমূহ মিলাব পাৰে।"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"বাৰ্তাসমূহ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"সকলো বাৰ্তা"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"বাছনি কৰা বাৰ্তাসমূহ"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"বাৰ্তাবোৰ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"কিছুমান বাৰ্তা"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"সকলোৰ পৰা"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"কেৱল সম্পৰ্কসূচীৰ পৰা"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"কেৱল তৰাযুক্ত সম্পৰ্কসমূহৰ পৰা"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"তৰাযুক্ত সম্পৰ্ক আৰু সঘনাই কল কৰোঁতাজনৰ পৰা"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"সম্পৰ্কসূচী আৰু সঘনাই কল কৰোঁতাজনৰ পৰা"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"সঘনাই কল কৰোঁতাজনৰ পৰা মাত্ৰ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"নাই"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"এলাৰ্মসমূহ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"মিডিয়া"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"স্পৰ্শৰ ধ্বনিবোৰ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"সোঁৱৰণিসমূহ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"কাৰ্যক্ৰমসমূহ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"সকলো কল কৰোঁতা"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"বাছনি কৰা কলাৰসমূহ"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"সকলোৰে পৰা"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"সম্পৰ্কসূচী"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"তৰাযুক্ত সম্পৰ্কবোৰ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"পুনৰাই কল কৰা লোকসকল"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>ৰ পৰা মাত্ৰ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> আৰু <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>ৰ পৰা মাত্ৰ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"যদিহে একেজন ব্যক্তিয়ে <xliff:g id="MINUTES">%d</xliff:g> মিনিটৰ ভিতৰত দ্বিতীয়বাৰ কল কৰে"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"কাষ্টম"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"স্বয়ংক্ৰিয়ভাবে অন কৰক"</string>
@@ -3614,7 +3644,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"এই এপে সৃষ্টি কৰা সকলো অসুবিধা নিদিব নিয়ম আঁতৰোৱা হ\'ব।"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"অপ্টিমাইজ নকৰিব"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"অপ্টিমাইজ"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"আপোনাৰ বেটাৰি দ্ৰুতভাৱে খৰচ কৰিব পাৰে"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"বেটাৰিৰ অৱস্থা উন্নত কৰাৰ বাবে পৰামৰ্শ দিয়া হৈছে"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g>-ক বেটাৰি অপ্টিমাইজেশ্বন অবজ্ঞা কৰিবলৈ অনুমতি দিবনে?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"একোএই নাই"</string>
@@ -3690,7 +3721,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"বেকআপ নিষ্ক্ৰিয়হৈ আছে"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g>লৈ আপডেট কৰা হ\'ল"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"আপডেট উপলব্ধ"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"এই ছেটিংটো সলনি কৰিব নোৱাৰি"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"এই কাম বৈধ নহয়"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ভলিউম সলনি কৰিব নোৱাৰি"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"কল কৰাৰ অনুমতি নাই"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"এছএমএছৰ অনুমতি নাই"</string>
@@ -3880,7 +3911,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"লক স্ক্ৰীণত নিয়ন্ত্ৰণসম্পৰ্কীয় তথ্য"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"জাননীৰ সমল দেখুৱাওক বা লুকুৱাওক"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"সকলো"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"সহায় আৰু কিটিপসমূহ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"কিটিপ আৰু সহায়"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"সকলোতকৈ সৰু পুতল"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ইনষ্টল কৰি ৰখা কোনো এপে প্ৰিমিয়াম এছএমএছ পঠাবলৈ অনুমতি বিচাৰি অনুৰোধ কৰা নাই"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"প্ৰিমিয়াম এছএমএছৰ কাৰণে আপুনি খৰচ বহন কৰিবলগীয়া হ \'ব পাৰে যাৰ বাবে বাহকে আপোনালৈ পঠিওৱা বিলত দেয়ৰ পৰিমাণ বাঢ়িব পাৰে। আপুনি যদি কোনো এপক অনুমতি দিয়ে, তেন্তে আপুনি সেই এপটো ব্যৱহাৰ কৰি প্ৰিমিয়াম এছএমএছ পঠাব পাৰিব।"</string>
@@ -4073,6 +4104,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"চলচ্চিত্ৰ আৰু টিভি এপসমূহ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"বাহকৰ প্ৰ\'ভিজনিং তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"কেৰিয়াৰ প্ৰভিজনিং সূচনা কৰক"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন আৰু আকৰ্ষণীয় কি আছে?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপোনাৰ নতুন ফ\'নটো চলাই চাওক"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপোনাৰ নতুন টে\'বলেটটো চলাই চাওক"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 3f2cac2..b37cb01 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM girişi sorğusu"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM kartınıza giriş hüququ istəyir. SIM karta giriş hüququnun verilməsi bağlantı müddətində cihazınızda data bağlantını deaktiv edəcək. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> cihazına giriş hüququ verin"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Digər cihazlara \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kimi görünür"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihazı qoşalaşdırın"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Planşetə yaxınlıqdakı Bluetooth cihazları ilə əlaqə yaratmaq icazəsi verin"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-ləri sıfırlamaq alınmadı"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM-lər xəta səbəbilə sıfırlana bilmədi."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Bütün datanı silin (fabrika sıfırlaması)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Bu, planşetinizdən bunları siləcək: "<b>"daxili yaddaş"</b>", həmçinin:\n\n"<li>"Google hesabınızı"</li>\n<li>"Sistem və tətbiq data və ayarlarını"</li>\n<li>"Endirilmiş tətbiqləri"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Bu telefonunuzun "<b>"daxili yaddaşından"</b>" bütün datanı siləcək, bura daxildir: \n\n"<li>"Google hesabınız"</li>\n<li>"Sistem və tətbiq məlumatları və parametrləri"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Çox uzun gecikmə (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Çox uzun gecikmə (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Zəng və bildirişlər deaktiv olaraq ayarlanıb"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Zəng və bildirişlər aşağı olaraq ayarlanıb"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Zəng və bildirişlər orta olaraq ayarlanıb"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam doldurmadan sonrakı ekran istifadəsi"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın enerji sərfiyyatı"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Tam doldurmadan sonra tətbiq istifadəsi (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Tam doldurmadan sonra cihaz istifadəsi (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Cihaz arxa fonda oyadılır"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Məkan tez-tez təklif edilir"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> tətbiq səhv işləyir"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batareya istifadəyə yararlıdır"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Tətbiqlər normal işləyir"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Tətbiqlər normal işləyir"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon arxa fonda səciyyəvi batareya istifadəsinə sahibdir"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Planşet arxa fonda səciyyəvi batareya istifadəsinə sahibdir"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Cihaz arxa fonda səciyyəvi batareya istifadəsinə sahibdir"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Zəif batareya tutumu"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batareya azdır"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Telefonun batareya istifadəsini təkmilləşdirin"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Planşet hədindən çox istifadə etdi"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Cihaz həddindən çox istifadə etdi"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Batareya tezliklə bitə bilər"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon həddindən çox istifadə edilib. Batareya gözlədiyinizdən daha tez bitə bilər.\n\nSon doldurmadan sonra (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ən çox istifadə edilən <xliff:g id="NUMBER">%1$d</xliff:g> tətbiq:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Planşet həddindən çox istifadə edib. Batareya gözlədiyinizdən daha tez bitə bilər.\n\nSon doldurmadan sonra (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ən çox istifadə edilən <xliff:g id="NUMBER">%1$d</xliff:g> tətbiq:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Cihaz həddindən çox istifadə edilib. Batareya gözlədiyinizdən daha tez bitə bilər.\n\nSon doldurmadan sonra (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ən çox istifadə edilən <xliff:g id="NUMBER">%1$d</xliff:g> tətbiq:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d tətbiqi məhdudlaşdırın</item>
       <item quantity="one">%1$d tətbiqi məhdudlaşdırın</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Bu tətbiq arxa fonda batareyadan istifadə edəcək. Batareya gözlədiyinizdən daha tez bitə bilər."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Silin"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Ləğv edin"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Tam enerji yığdıqda, istifadənizə əsasən batareya təxminən <xliff:g id="TIME_DURATION">%1$s</xliff:g> müddətində davam edir.\n\nBatareya müddətini uzatmaq istəyirsinizsə, Batareya Qənaətini aktiv edin."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Batareya müddətini uzatmaq istəyirsinizsə, Batareya Qənaətini aktiv edin"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Tətbiqlər batareyadan normal istifadə edirlər. Tətbiqlər həddinən artıq çox batareya istifadə edərsə, telefon Sizin üçün tədbirlər təklif edəcək.\n\nTelefondan az batareya ilə istifadə edirsinizsə, Batareya Qənaətini aktiv edin."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Tətbiqlər batareyadan normal istifadə edirlər. Tətbiqlər həddinən artıq çox batareya istifadə edərsə, planşet Sizin üçün tədbirlər təklif edəcək.\n\nPlanşetdən az batareya ilə istifadə edirsinizsə, Batareya Qənaətini aktiv edin."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Tətbiqlər batareyadan normal istifadə edirlər. Tətbiqlər həddinən artıq çox batareya istifadə edərsə, cihaz Sizin üçün tədbirlər təklif edəcək.\n\nCihazdan az batareya ilə istifadə edirsinizsə, Batareya Qənaətini aktiv edin."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Batareya Meneceri"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Tətbiqləri avtomatik idarə edin"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Daima istifadə etmədiyiniz tətbiqlərin batareyadan istifadəsini məhdudlaşdırın"</string>
@@ -3075,15 +3087,14 @@
     <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">"Vizual fəsadları blok edin"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Görünən siqnallara icazə verin"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Bildirişləri məhdudlaşdırın"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Narahat Etməyin\" aktiv olan zaman"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Bildirişlər"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"\"Narahat Etməyin\" əmri aktiv olan zaman"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Bildirişləri susdurun"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Bildirişləri göstərin, lakin səs və vibrasiyaları susdurun"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Yeni bildirişlər gəldikdə telefonda səs və ya vibrasiya olmayacaq"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Bildirişləri gizlədin və susdurun"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Bildirişlər ümumiyyətlə görünməyəcək"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"\"Narahat Etməyin\" rejimi aktiv olduqda yeni və mövcud bildirişləri görməyəcəksiniz. Lakin əsas telefon fəaliyyəti üçün lazım olan bildirişlər və status görünəcək."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bildirişləri səssiz göstərin"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Bildirişlər susduralacaq"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Bildirişlər gəldikdə telefon səs çıxarmayacaq və vibrasiya etməyəcək."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Bildirişləri gizlədin"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Yeni və ya mövcud bildirişləri görməyəcəksiniz"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon yeni və ya mövcud bildirişləri göstərməyəcək, eyni zamanda səs çıxarmayacaq və ya vibrasiya etməyəcək. Ekranın yuxarısından sürüşdürdüyünüz zaman bildirişlər görünməyəcək.\n\nYadda saxlayın ki, telefon fəaliyyəti və status üçün mühüm bildirişlər görünəcək."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Fərdi"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Fərdi ayarı aktiv edin"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fərdi ayarı silin"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> qayda avtomatik aktiv edilə bilər</item>
       <item quantity="one">1 qayda avtomatik aktiv edilə bilər</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Funksiya"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"İstisnalar"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Cədvəl"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Səs və vibrasiya"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"\"Narahat Etməyin\" rejimi aktiv olduğu zaman, yuxarıda icazə verdiyiniz elementlərdən başqa səs və vibrasiya susdurulacaq."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Hamısını susdurun"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Səssiz"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Səssiz deyil"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Səssizdir <xliff:g id="SOUND_TYPE">%1$s</xliff:g> icazəli olmalıdır"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Səssizdədir, <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> və <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> icazəli olmalıdır"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Səssizdir, <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> və <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> icazəli olamlıdır"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesaj, tədbir və xatırlatmalar"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Narahat Etməyin\" aktiv olduğu zaman yuxarıda seçdiyiniz elementlər istisna olmaqla mesaj, xatırlatma və tədbirlər səssiz ediləcək. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Yeniləyin"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Yeniləməyin"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefon fokuslanmağınıza kömək etmək üçün daha çox şey edə bilər.\n\nAyarları yeniləyin:\n\n- Bildirişləri tamamilə gizlədin\n\n- Ulduzlanmış kontaktlardan gələn zənglərə icazə verin və zəngləri təkrarlayın"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\"Narahat Etməyin\" rejimi yenilənsin?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ayarlar"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Bunu daha sonra Ayarlarda fərdiləşdirə bilərsiniz."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Ekran aktiv olduqda blok edin"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Ekran sönülü olduqda blok edin"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Narahat Etməyin rejimi həm istəmədiyiniz səsləri, həm də şəkilləri blok edə bilər. Yatmaq, fokuslanmaq və ya telefonda keçirdiyiniz vaxtı məhdudlaşdırmaq istəyirsinizsə, bu faydalı ola bilər."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Səsləri və şəkilləri blok edin"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ekranda aktiv etməyin və ya bildirişlər üçün oyatmayın"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Əsas telefon fəaliyyəti və statusundan başqa ümumiyyətlə bildiriş göstərməyin"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"İş profili səsləri"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>-<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Çağrılar"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Narahat Etməyin\" aktiv olduğu zaman gələn zənglər blok edilir. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesajlar"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Bütün mesajlar"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Seçilmiş mesajlar"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesajlaşma"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Bəzi mesajlar"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Hər kəsdən"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Yalnız kontaktlardan"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Yalnız ulduzlanmış kontaktlardan"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Ulduzlanmış kontaktlar və təkrarlanan zəng edənlərdən"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kontakt və təkrarlanan zəng edənlərdən"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Yalnız təkrarlanan zəng edənlərdən"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Heç biri"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Siqnallar"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Toxunma səsləri"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Xatırlamalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tədbirlər"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Bütün zəng edənlər"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Seçilmiş zəng edənlər"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"istənilən şəxs"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktlar"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ulduzlanmış kontaktlar"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Təkrar zəng edənlər"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Yalnız: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Yalnız: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>, <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Eyni şəxs <xliff:g id="MINUTES">%d</xliff:g> dəqiqə ərzində yenidən zəng edərsə,"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Fərdi"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Avtomatik aktivləşdir"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Bu tətbiq tərəfindən yaradılmış bütün Narahat Etməyin qaydaları silinəcək."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Optimallaşdırmayın"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimallaşdırın"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Batareyanın tez boşalmasına səbəb ola bilər"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Enerjiyə qənaət üçün tövsiyə edilir"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Batareya optimallaşdırmasını iqnor etmək üçün <xliff:g id="APP">%s</xliff:g> tətbiqinə icazə verilsin?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Heç biri"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Yedəkləmə deaktiv edildi"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> versiyasına güncəlləndi"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Güncəlləmə əlçatandır"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Bu ayarı dəyişmək mümkün deyil"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Əməliyyata icazə verilmir"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Səsi dəyişmək olmur"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Zəngə icazə verilmir"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ə icazə verilmir"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kilid ekranında nəzarət məlumatı"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildiriş məzmununu göstərin və ya gizlədin"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Bütün"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Dəstək və məsləhət"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tövsiyə və dəstək"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ən kiçik en"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Heç bir quraşdırılmış tətbiq Premium SMS girişi tələb etməyib"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS müəyyən məbləğ tuta bilər və mobil operator fakturasına əlavə oluna bilər. Tətbiq üçün icazəni aktiv etsəniz, həmin tətbiqdən istifadə edərək, Premium SMS göndərə biləcəksiniz."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film və TV tətbiqləri"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Təchizat Məlumatı"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator Təchizatlanmasını Tətikləyin"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni və maraqlı olan nədir?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuz ilə tanış olun"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni planşetiniz ilə tanış olun"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 2478ab9..67c38d4 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -168,6 +168,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtev za pristup SIM kartici"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi da pristupa SIM kartici. Odobravanje pristupa SIM kartici će onemogućiti vezu za prenos podataka na uređaju dok traje povezivanje. Dajte pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim uređajima vidljiv kao „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparite novi uređaj"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Omogućite tabletu da komunicira sa Bluetooth uređajima u blizini"</string>
@@ -1466,6 +1468,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Resetovanje eSIM-ova nije uspelo"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Resetovanje eSIM-ova nije uspelo zbog greške."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Izbriši sve podatke (resetovanje na fabrička podešavanja)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"Podatke i podešavanja sistema i aplikacija"</li>\n<li>"Preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"Podatke i podešavanja sistema i aplikacija"</li>\n<li>"Preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni na sledeće naloge:\n"</string>
@@ -2018,6 +2022,8 @@
       <item quantity="few">Veoma dug period (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Veoma dug period (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Zvono i obaveštenja su isključena"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Zvono i obaveštenja su podešena na slabo"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Zvono i obaveštenja su podešena na srednje"</string>
@@ -2127,8 +2133,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Korišćenje ekrana od potpunog punjenja"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Korišćenje aplikacija od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Korišćenje uređaja od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2159,8 +2165,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Budimo uređaj u pozadini"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Često traži lokaciju"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Neke aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) se čudno ponašaju"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterija je u dobrom stanju"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikacije rade uobičajeno"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacije rade uobičajeno"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon troši tipičnu količinu baterije u pozadini"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet troši tipičnu količinu baterije u pozadini"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Uređaj troši tipičnu količinu baterije u pozadini"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Kapacitet baterije je nizak"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Baterija će se uskoro isprazniti"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Produžite trajanje baterije telefona"</string>
@@ -2175,9 +2183,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet ste koristili duže nego obično"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Uređaj ste koristili duže nego obično"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Baterija će se možda uskoro isprazniti"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\nAplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) koje su najviše trošile bateriju od poslednjeg potpunog punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablet ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\nAplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) koje su najviše trošile bateriju od poslednjeg potpunog punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Uređaj ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\n Aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) koje su najviše trošile bateriju od poslednjeg potpunog punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Ograničite %1$d aplikaciju</item>
       <item quantity="few">Ograničite %1$d aplikacije</item>
@@ -2211,8 +2222,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ova aplikacija će moći da koristi bateriju u pozadini. Baterija može da se isprazni ranije od očekivanog."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ukloni"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Otkaži"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Na osnovu potrošnje, vaša baterija obično traje <xliff:g id="TIME_DURATION">%1$s</xliff:g> kada je potpuno napunjena.\n\nAko želite da produžite trajanje baterije, uključite Uštedu baterije."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ako želite da produžite trajanje baterije, uključite Uštedu baterije"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, telefon će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako će se baterija uskoro isprazniti."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, tablet će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako će se baterija uskoro isprazniti."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Aplikacije koriste uobičajenu količinu baterije. Ako aplikacije koriste previše baterije, uređaj će vam predložiti radnje koje možete da preduzmete.\n\nUvek možete da uključite Uštedu baterije ako će se baterija uskoro isprazniti."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Menadžer baterije"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Upravljajte aplikacijama automatski"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ograničite potrošnju baterije za aplikacije koje ne koristite često"</string>
@@ -3110,15 +3122,14 @@
     <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">"Blokiraj vizuelna ometanja"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dozvoli vizuelne signale"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ograničite obaveštenja"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kada je uključen režim Ne uznemiravaj"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obaveštenja"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kada je uključena opcija Ne uznemiravaj"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Isključi zvuk obaveštenja"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Prikazuj obaveštenja, ali isključi zvuk i vibracije"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Telefon neće emitovati zvuk ni vibrirati kada stignu nova obaveštenja"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Sakrijte obaveštenja i isključite im zvuk"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Obaveštenja se uopšte neće prikazivati"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Nećete videti nova ni postojeća obaveštenja kada je uključeno Ne uznemiravaj. Ali i dalje će se prikazivati obaveštenja potrebna za osnovne aktivnosti i status telefona."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Prikazuj obaveštenja bez zvuka"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Zvuk obaveštenja će biti isključen"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon neće emitovati zvuk ni vibrirati kada stignu obaveštenja."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sakrij obaveštenja"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nećete videti nova ni postojeća obaveštenja"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon neće prikazivati nova ili postojeća obaveštenja i neće emitovati zvuk ni vibrirati. Obaveštenja se neće prikazivati kada prevučete nadole od vrha ekrana.\n\nImajte u vidu da će se važna obaveštenja o aktivnostima i statusu telefona i dalje prikazivati."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Prilagođeno"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogući prilagođeno podešavanje"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ukloni prilagođeno podešavanje"</string>
@@ -3155,8 +3166,8 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Aplikacija (<xliff:g id="APP_NAME">%s</xliff:g>) je automatski uključila režim Ne uznemiravaj"</string>
     <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Samo prioritetni prekidi"</string>
     <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Isključeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Uključeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Pitaj svaki put (ako se ne uključuje automatski)"</string>
@@ -3172,13 +3183,27 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> pravila mogu da se automatski uključe</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravila mogu da se automatski uključe</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Potvrdi"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Ponašanje"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Izuzeci"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Raspored"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Zvuk i vibracija"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Kada je uključen režim Ne uznemiravaj, zvuk i vibracija biće isključeni, osim za stavke koje ste dozvolili iznad."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Isključi zvuk za sve osim za:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Zvuk je isključen"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Zvuk nije isključen"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Zvuk je isključen, ali dozvoli za: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Zvuk je isključen, ali dozvoli za: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> i <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zvuk je isključen, ali dozvoli za: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Poruke, događaji i podsetnici"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kada je uključen režim Ne uznemiravaj, zvukovi obaveštenja za poruke, podsetnike i događaje će biti isključeni, osim za stavke koje ste dozvolili iznad. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Ažuriraj"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ne ažuriraj"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefon može još više da vam pomogne da se koncentrišete.\n\nAžurirajte podešavanja:\n\n– da biste potpuno sakrili obaveštenja\n\n– da biste omogućili da vas zovu kontakti sa zvezdicom i ponovni pozivaoci"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Želite li da ažurirate režim Ne uznemiravaj?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Podešavanja"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Ovo možete dodatno da prilagodite u podešavanjima."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokiraj kada je ekran uključen"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokiraj kada je ekran isključen"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Režim Ne uznemiravaj ima mnogo više mogućnosti od običnog blokiranja neželjenih zvukova – može da blokira i vizuelni sadržaj. To može biti korisno kada spavate, kada treba da budete usredsređeni na nešto ili kada želite da smanjite vreme koje provodite na telefonu."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokiraj zvukove i vizuelni sadržaj"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ne uključuj ekran niti budi zbog obaveštenja"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ne prikazuj nikakva obaveštenja, osim osnovnih aktivnosti i statusa telefona"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuci za profil za Work"</string>
@@ -3353,21 +3378,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od <xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Pozivi"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kada je uključen režim Ne uznemiravaj, dolazni pozivi su blokirani. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Sve poruke"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Izabrane poruke"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Poruke"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Neke poruke"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od bilo koga"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od kontakata"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata sa zvezdicom"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Od kontakata sa zvezdicom i ponovnih pozivalaca"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Od kontakata i ponovnih pozivalaca"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Samo od ponovnih pozivalaca"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ni od koga"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Mediji"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Zvukovi pri dodiru"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivaoci"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Izabrani pozivaoci"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"svi"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakti"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakti sa zvezdicom"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Samo od: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Od: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> i <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ako ista osoba pozove po drugi put u periodu od <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Prilagođeno"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski uključi"</string>
@@ -3647,7 +3682,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Uklonićemo sva pravila za režim Ne uznemiravaj koja je ova aplikacija napravila."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne optimizuj"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizuj"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Mogu brže da vam isprazne bateriju"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Preporučeno za duže trajanje baterije"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Želite li da dozvolite aplikaciji <xliff:g id="APP">%s</xliff:g> da ignoriše optimizacije baterije?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ništa"</string>
@@ -3724,7 +3760,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Pravljenje rezervne kopije je onemogućeno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostupno je ažuriranje"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Podešavanje je zaključano"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Radnja nije dozvoljena"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Ne možete da promenite jačinu zvuka"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Pozivanje nije dozvoljeno"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ovi nisu dozvoljeni"</string>
@@ -3920,7 +3956,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolišite informacije na zaključanom ekranu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pregledajte ili sakrijte sadržaj obaveštenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i saveti"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Saveti i podrška"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zahtevala pristup premijum SMS-ovima"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premijum SMS-ovi mogu da koštaju i povećaće račune kod mobilnog operatera. Ako omogućite dozvolu za neku aplikaciju, moći ćete da šaljete premijum SMS-ove pomoću te aplikacije."</string>
@@ -4123,6 +4159,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o dodeli mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje dodele mobilnog operatera"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte novi telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte novi tablet"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 861c348..b46caf6 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запыт доступу да SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> спрабуе атрымаць доступ да вашай SIM-карты. Прадастаўленне доступу да SIM-карты адключыць перадачу даных на прыладзе на час падлучэння. Даць доступ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Бачная для іншых прылад як прылада \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашы прылады"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спалучыце новую прыладу"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Дазволіць планшэту абменьвацца данымі з іншымі прыладамі праз Bluetooth"</string>
@@ -1480,6 +1482,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Немагчыма скінуць eSIM-карты"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Немагчыма скінуць eSIM-карты з-за памылкі."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Сцерці ўсе даныя (cкід да заводскіх налад)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховiшча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"Ваш улiковы запiс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады дадаткаў"</li>\n<li>"Спампаваныя дадаткі"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховiшча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"Ваш уліковы запіс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады праграм"</li>\n<li>"Спампаваныя праграмы"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
@@ -2039,6 +2043,8 @@
       <item quantity="many">Вельмі доўгая затрымка (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
       <item quantity="other">Вельмі доўгая затрымка (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Вібрацыя пры выкліках і атрыманні апавяшчэнняў выключана"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Уключана слабая вібрацыя пры выкліках і атрыманні апавяшчэнняў"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Уключана умераная вібрацыя пры выкліках і атрыманні апавяшчэнняў"</string>
@@ -2150,8 +2156,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Выкарыстанне экрана пасля поўнай зарадкі"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Расход зараду на падсвечванне экрана"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Спажыванне праграмамі з моманту поўнай зарадкі (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Спажыванне прыладай з моманту поўнай зарадкі (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2182,8 +2188,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Выводзіць прыладу з рэжыму сну ў фонавым рэжыме"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Запытвае месцазнаходжанне занадта часта"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> праграм паводзяць сябе незвычайна"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Акумулятар у добрым стане"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Праграмы працуюць нармальна"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Нізкая ёмістасць акумулятара"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Акумулятар не можа забяспечыць дастатковы тэрмін аўтаномнай працы"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Падоўжыце час працы акумулятара тэлефона"</string>
@@ -2198,9 +2210,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Планшэт выкарыстоўваецца больш, чым звычайна"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Прылада выкарыстоўваецца больш, чым звычайна"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Акумулятар хутка разрадзіцца"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Тэлефон выкарыстоўваецца інтэнсіўней, чым звычайна. Акумулятар хутка разрадзіцца.\n\nТоп-<xliff:g id="NUMBER">%1$d</xliff:g> праграм з высокім спажываннем энергіі (з моманту апошняй зарадкі<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Планшэт выкарыстоўваецца інтэнсіўней, чым звычайна. Акумулятар хутка разрадзіцца.\n\nТоп-<xliff:g id="NUMBER">%1$d</xliff:g> праграм з высокім спажываннем энергіі (з моманту апошняй зарадкі<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Прылада выкарыстоўваецца інтэнсіўней, чым звычайна. Акумулятар хутка разрадзіцца.\n\nТоп-<xliff:g id="NUMBER">%1$d</xliff:g> праграм з высокім спажываннем энергіі (з моманту апошняй зарадкі<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Неабходна абмежаваць працу %1$d праграмы</item>
       <item quantity="few">Неабходна абмежаваць працу %1$d праграм</item>
@@ -2239,8 +2254,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Гэта праграма будзе спажываць зарад акумулятара ў фонавым рэжыме. Зарад можа скончыцца хутчэй, чым звычайна."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Зняць"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Скасаваць"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Пры цяперашнім узроўні выкарыстання поўнага зараду акумулятара звычайна хапае на <xliff:g id="TIME_DURATION">%1$s</xliff:g>.\n\nКалі трэба падоўжыць час працы акумулятара, уключыце рэжым эканоміі зараду."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Калі трэба падоўжыць час працы акумулятара, уключыце рэжым эканоміі зараду"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Менеджар акумулятара"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Аўтаматычнае кіраванне праграмамі"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Абмежаваць выкарыстанне акумулятара праграмамі, якія рэдка запускаюцца"</string>
@@ -3146,15 +3165,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дазволіць візуальныя сігналы"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Абмежаваць апавяшчэнні"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Калі ўключаны рэжым \"Не турбаваць\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Апавяшчэнні"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Калі ўключаны рэжым \"Не турбаваць\""</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Выключыць гук апавяшчэнняў"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Паказваць апавяшчэнні, але выключыць гук і вібрацыю"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Падчас паступлення новых апавяшчэнняў тэлефон не выдае гук і не вібрыруе"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Схаваць апавяшчэнні і выключыць іх гук"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Апавяшчэнні ўвогуле не адлюстроўваюцца"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Калі рэжым \"Не турбаваць\" уключаны, вы не бачыце новыя ці існуючыя апавяшчэнні. Аднак стан і апавяшчэнні, неабходныя для забеспячэння базавых дзеянняў тэлефона, адлюстоўваюцца."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Паказваць апавяшчэнні бязгучна"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Гук для апавяшчэнняў будзе выключаны"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Калі будуць прыходзіць апавяшчэнні, тэлефон не будзе званіць ці вібрыраваць."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Схаваць апавяшчэнні"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Новыя ці існыя апавяшчэнні будуць схаваны"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ваш тэлефон не будзе паказваць новыя ці існыя апавяшчэнні, не будзе званіць ці вібрыраваць. Апавяшчэнні не будуць з\'яўляцца, калі правесці пальцам па экране зверху ўніз.\n\nМайце на ўвазе, што самыя неабходныя апавяшчэнні пра асноўныя дзеянні тэлефона і яго статус не будуць схаваны."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Карыстальніцкія налады"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Уключыць карыстальніцкую наладу"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Выдаліць карыстальніцкую наладу"</string>
@@ -3210,13 +3228,27 @@
       <item quantity="many">Аўтаматычна ўключаць могуць <xliff:g id="ON_COUNT">%d</xliff:g> правіл</item>
       <item quantity="other">Аўтаматычна ўключаць могуць <xliff:g id="ON_COUNT">%d</xliff:g> правіла</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Дзеянні"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Выключэнні"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Расклад"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Гук і вібрацыя"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Калі ўключаны рэжым \"Не турбаваць\", выключаюцца гук і вібрацыя для ўсіх элементаў, акрамя выбраных вамі вышэй."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Выключыць гук для ўсяго, акрамя"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Без гуку"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"З гукам"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Без гуку, акрамя элемента \"<xliff:g id="SOUND_TYPE">%1$s</xliff:g>\""</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Без гуку, акрамя элементаў \"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>\" і \"<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>\""</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Без гуку, акрамя элементаў \"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>\", \"<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>\" і \"<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>\""</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Паведамленні, падзеі і напаміны"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Калі ўключаны рэжым \"Не турбаваць\", выключаецца гук для паведамленняў, напамінаў і падзей, акрамя выбраных вамі элементаў вышэй. Вы можаце змяніць налады паведамленняў, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Абнавіць"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Не абнаўляць"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Ваш тэлефон можа дапамагчы вам сканцэнтравацца.\n\nЗмяніце налады наступным чынам:\n\n- Схаваць усе апавяшчэнні\n\n- Дазволіць выклікі ад пазначаных кантактаў і абанентаў, якія выклікаюць паўторна"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Абнавіць рэжым \"Не турбаваць\"?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Налады"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Наладзіць можна і пазней у раздзеле \"Налады\"."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Блакіраваць, калі экран уключаны"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Блакіраваць, калі экран выключаны"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"У рэжыме \"Не турбаваць\" блакіруюцца не толькі непажаданыя гукі, але і візуальныя элементы. Гэта асабліва карысна, калі карыстальнік спрабуе заснуць, хоча скараціць час карыстання тэлефонам ці яму нельга страчваць увагу."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Блакіраваць гукі і візуальныя элементы"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Не згортваць і не ўключаць экран для апавяшчэнняў"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Паказваць толькі апавяшчэнні пра базавыя дзеянні і статус тэлефона"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Гукі працоўнага профілю"</string>
@@ -3395,21 +3427,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Выклікі"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Калі ўключаны рэжым \"Не турбаваць\", уваходныя выклікі блакіруюцца. Вы можаце змяніць налады, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Паведамленні"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Усе паведамленні"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Выбраныя паведамленні"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Паведамленні"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Некаторыя паведамленні"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Ад усіх"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Толькі ад кантактаў"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Толькі ад кантактаў, пазначаных зоркай"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Ад пазначаных кантактаў і абанентаў, якія выклікаюць паўторна"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Ад кантактаў і абанентаў, якія выклікаюць паўторна"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Толькі ад абанентаў, якія выклікаюць паўторна"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ні ад каго"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будзільнікі"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Медыя"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Гукі пры дотыку"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напаміны"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Падзеі"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Усе абаненты"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбраныя выклікі"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"усе"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"кантакты"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"пазначаныя кантакты"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Паўторныя выклікі"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Толькі ад катэгорыі \"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>\""</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Ад катэгорый \"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>\" і \"<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>\""</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Калі адзін і той жа чалавек тэлефануе другі раз за наступную колькасць хвілін: <xliff:g id="MINUTES">%d</xliff:g>"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Карыстальніцкія"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Уключыць аўтаматычна"</string>
@@ -3700,7 +3742,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Усе правілы рэжыму «Не турбаваць», створаныя гэтай праграмай, будуць выдалены."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Не аптымізаваць"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Аптымізаваць"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Акумулятар можа разраджацца хутчэй"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Рэкамендавана для прадоўжвання працы акумулятара"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Дазволіць <xliff:g id="APP">%s</xliff:g> ігнараваць аптымізацыю акумулятара?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Няма"</string>
@@ -3778,7 +3821,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Рэзервовае капіраванне адключана"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Абноўлена да версіі Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ёсць абнаўленне"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Не ўдалося змяніць наладу"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Дзеянне не дапускаецца"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Не ўдалося змяніць гучнасць"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Выклікі забаронены"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Адпраўка SMS забаронена"</string>
@@ -3980,7 +4023,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Паказваць кантрольную інфармацыю на экране блакiроўцы"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Паказваць ці хаваць змесціва апавяшчэнняў"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Усе"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Падтрымка і парады"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Парады і падтрымка"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменшая шырыня"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Няма праграм з доступам да платных SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"За прэміум SMS-доступ з вас можа спаганяцца аплата, гэта можа павялічыць вашыя рахункі за паслугі аператара. Калі вы ўключыце дазвол для праграмы, вы будзеце мець магчымасць адпраўляць прэміум SMS з гэтай праграмы."</string>
@@ -4193,6 +4236,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Праграмы для фільмаў і ТБ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інфармацыя аператара"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Уключыць/выключыць забеспячэнне аператарам"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Што новага і цікавага?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Аглядны тур па новаму тэлефону"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Аглядны тур па новаму планшэту"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 824ba60..722dadf 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Заявка за достъп до SIM картата"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> иска да получи достъп до SIM картата ви. Предоставянето му ще деактивира мобилните данни на устройството ви за продължителността на връзката. Разрешаване на достъпа до <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Видимо като „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ за другите устройства"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашите устройства"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Сдвояване на ново устройство"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Разрешете на таблета си да се свързва с устройства с Bluetooth в близост"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Електронните SIM карти не могат да бъдат нулирани"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Електронните SIM карти не могат да бъдат нулирани поради грешка."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google"</li>\n<li>"данни и настройки от системата и приложенията"</li>\n<li>"изтеглени приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Много дълго забавяне (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> милисек)</item>
       <item quantity="one">Много дълго забавяне (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> милисек)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"За звъненето и известията е зададено „Изключено“"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"За звъненето и известията е зададено „Слабо“"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"За звъненето и известията е зададено „Средно“"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ползване на екрана след пълно зареждане"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Консумация от екрана"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканиране за мобилни мрежи"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Използване от приложенията след пълно зареждане (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Използване от устройството след пълно зареждане (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Устройството се активира на заден план"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Чести заявки за местоположение"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> приложения не функционират правилно"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батерията е в добро състояние"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Приложенията работят нормално"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Батерията е с нисък капацитет"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Животът на батерията не е оптимален"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Удължете живота на батерията на телефона си"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Таблетът е използван повече от обикновено"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Устройството е използвано повече от обикновено"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Батерията може скоро да се изтощи"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Телефонът ви е използван повече от обикновено. Батерията може да се изтощи по-скоро от очакваното.\n\nСледните <xliff:g id="NUMBER">%1$d</xliff:g> приложения са я ползвали най-интензивно след последното зареждане (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Таблетът ви е използван повече от обикновено. Батерията може да се изтощи по-скоро от очакваното.\n\nСледните <xliff:g id="NUMBER">%1$d</xliff:g> приложения са я ползвали най-интензивно след последното зареждане (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Устройството ви е използвано повече от обикновено. Батерията може да се изтощи по-скоро от очакваното.\n\nСледните <xliff:g id="NUMBER">%1$d</xliff:g> приложения са я ползвали най-интензивно след последното зареждане (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Ограничаване на %1$d приложения</item>
       <item quantity="one">Ограничаване на %1$d приложение</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Това приложение ще може да използва батерията на заден план. Тя може да се изтощи по-рано от очакваното."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Премахване"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Отказ"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Въз основа на използването батерията ви обикновено издържа около <xliff:g id="TIME_DURATION">%1$s</xliff:g>, когато е напълно заредена.\n\nАко се налага да удължите живота на батерията си, включете режима за запазването й."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ако се налага да удължите живота на батерията си, включете режима за запазването й"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Мениджър на батерията"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Автоматично управление на приложенията"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ограничение за батерията за приложения, които не използвате често"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуални сигнали: Разрешаване"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ограничаване на известията"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Когато режимът „Не безпокойте“ е включен"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Известия"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Когато режимът „Не безпокойте“ е включен"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Спиране на известията"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Показване на известията, но спиране на звука и вибрирането"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Когато пристигат нови известия, телефонът ви няма да издава звуци, нито ще вибрира"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Скриване и спиране на известията"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Изобщо няма да се показват известия"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Когато режимът „Не безпокойте“ е включен, няма да виждате новите, нито съществуващите известия, но необходимите за основните активност и състояние на телефона пак ще се показват."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Показване на известията без звук"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Известията ще бъдат спрени"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"При получаване на известия телефонът ви няма да издава звуци, нито ще вибрира."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Скриване на известията"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Няма да виждате новите, нито съществуващите известия"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефонът ви няма да показва новите, нито съществуващите известия и няма да издава звуци или да вибрира. Известията няма да се показват, когато прекарате пръст надолу от горната част на екрана.\n\nИмайте предвид, че критичните известия, свързани с активността и състоянието на телефона, пак ще се показват."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Персонализирано"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Активиране на персонализираната настройка"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Премахване на персонализираната настройка"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> правила могат да се включат автоматично</item>
       <item quantity="one">1 правило може да се включи автоматично</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Поведение"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Изключения"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"График"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Звук и вибриране"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Когато режимът „Не ме безпокойте“ е включен, звуците и вибрирането ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Спиране на звука за всичко освен за"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Звукът е спрян"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Звукък не е спрян"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Звукът е спрян, но <xliff:g id="SOUND_TYPE">%1$s</xliff:g> са разрешени"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Звукът е спрян, но <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> и <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> са разрешени"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Звукът е спрян, но <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> са разрешени"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Съобщения, събития и напомняния"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Когато режимът „Не безпокойте“ е включен, съобщенията, напомнянията и събитията ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе. Можете да коригирате настройките за съобщенията, за да разрешите на близки и приятели и други контакти да се свързват с вас."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Актуализиране"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Да не се актуализира"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Телефонът ви може да прави повече неща, с които да ви помогне да се съсредоточите.\n\nАктуализирайте настройките, така че:\n\n– напълно да скриете известията;\n\n– да разрешите обаждания от контактите със звезда и повторно обаждащите се."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Искате ли да актуализирате режима „Не безпокойте“?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Настройки"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Можете да персонализирате този режим допълнително от настройките."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Блокиране при включен екран"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Блокиране при изключен екран"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Режимът „Не безпокойте“ може да блокира не само нежеланите звуци, но и визуалните сигнали. Тази опция е полезна, ако се опитвате да заспите, да се съсредоточите или да използвате телефона си по-малко."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Блокиране на звуците и визуалните сигнали"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Без включване на екрана или „събуждане“ при известия"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Без показване на известия освен за основните активност и състояние на телефона"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуци за служебния потребителски профил"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"от <xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"от <xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Обаждания"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Когато режимът „Не безпокойте“ е вкл., вх. обаждания се блокират. Можете да коригирате настройките, за да разрешите на близки и приятели и др. контакти да се свързват с вас."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Съобщения"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Всички съобщения"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Избрани съобщения"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Съобщения"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Някои съобщения"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"От всички"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Само от контакти"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само от контакти със звезда"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"От контактите със звезда и повторно обаждащите се"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"От контактите и повторно обаждащите се"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Само от повторно обаждащите се"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Никакви"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будилници"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Мултимедия"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Звуци при докосване"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напомняния"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Събития"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Всички обаждащи се"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани обаждащи се"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"всички"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"контактите"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"контактите със звезда"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторно обаждащи се"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Само от <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"От <xliff:g id="CALLER_TYPE">%1$s</xliff:g> и <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ако един и същ човек се обади втори път в рамките на период от <xliff:g id="MINUTES">%d</xliff:g> мин"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Персонализирани"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Авт. включване"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Всички правила за режима „Не безпокойте“, създадени от това приложение, ще бъдат премахнати."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Без оптимизиране"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Оптимизиране"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Батерията може да се изразходва по-бързо"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Препоръчително за удължаване на живота на батерията"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Да се разреши ли на <xliff:g id="APP">%s</xliff:g> да пренебрегва оптимизациите на батерията?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Няма"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Функцията за резервно копие е деактивирана"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Извършена е актуализация до Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Налице е актуализация"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Настройката не може да се променя"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Непозволено действие"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Силата на звука не може да бъде променена"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Обажданията не са разрешени"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS съобщенията не са разрешени"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Управление на информацията на заключения екран"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показване или скриване на съдържанието на известията"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Всички"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Поддръжка и съвети"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Съвети и поддръжка"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Най-малката ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Няма инсталирани приложения, които са заявили достъп до SMS съобщения, за които се таксува получателят"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS съобщенията, за които се таксува получателят, може да ви въвлекат в разходи и ще увеличат сметката към оператора ви. Ако дадете разрешението на дадено приложение, ще можете да изпращате такива съобщения чрез него."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Приложения за филми и телевизионни предавания"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Задействане на обезпечаването от оператора"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Нови и вълнуващи неща"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознайте се с новия си телефон"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознайте се с новия си таблет"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index c1428ff..c9e0a27 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"সিম অ্যাক্সেস করার অনুরোধ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> আপনার সিম কার্ড অ্যাক্সেস করতে চায়। এই সিম কার্ড অ্যাক্সেসের অনুমোদন দিলে তা কানেকশনের সময়ে আপনার ডিভাইসে ডেটা কানেকশন অক্ষম করবে। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> -এ অ্যাক্সেস দিন"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"অন্য ডিভাইসে “<xliff:g id="DEVICE_NAME">^1</xliff:g>” নামে দেখা যাবে"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"আপনার ডিভাইসগুলি"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"নতুন ডিভাইস যুক্ত করুন"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"আপনার ট্যাবলেটটিকে আশেপাশের ব্লুটুথ ডিভাইসগুলির সাথে যোগাযোগ করার অনুমতি দিন"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"ই-সিমগুলি রিসেট করা যাচ্ছে না"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"একটি সমস্যা হয়েছে, ই-সিমগুলি রিসেট করা যাচ্ছে না।"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"এটি আপনার ট্যাবলেটের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"এটি আপনার ফোনের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে প্রবেশ করে আছেন:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">অত্যন্ত দীর্ঘ সময়ের ব্যবধানে (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> মিলি-সেকেন্ড)</item>
       <item quantity="other">অত্যন্ত দীর্ঘ সময়ের ব্যবধানে (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> মিলি-সেকেন্ড)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"রিং ও বিজ্ঞপ্তির আওয়াজ বন্ধ করা হল"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"রিং ও বিজ্ঞপ্তির আওয়াজ কমে সেট করা হল"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"রিং ও বিজ্ঞপ্তির আওয়াজ মাঝারিতে সেট করা হল"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"সম্পূর্ণ চার্জ করার সময় থেকে স্ক্রিনের ব্যবহার"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্রিনের জন্য ব্যবহার"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"সম্পূর্ণ চার্জ করার সময় থেকে অ্যাপের ব্যবহার (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"সম্পূর্ণ চার্জ করার সময় থেকে ডিভাইসের ব্যবহার (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ডিভাইসটিকে পটভূমিতে সক্রিয় করা হচ্ছে"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"বারবার অবস্থানের অনুরোধ করা হচ্ছে"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপে অস্বাভাবিক কার্যকলাপ দেখা যাচ্ছে"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ব্যাটারি ভাল অবস্থায় আছে"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"অ্যাপগুলি স্বাভাবিকভাবে কাজ করছে"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"কম ক্ষমতার ব্যাটারি"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"কম ক্ষমতার ব্যাটারিতে ভাল কাজ হয় না"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"আপনার ফোনের ব্যাটারি আরও বেশিক্ষণ চালান"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ট্যাবলেট স্বাভাবিকের চেয়ে বেশি ব্যবহৃত হয়েছে"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ডিভাইস স্বাভাবিকের চেয়ে বেশি ব্যবহৃত হয়েছে"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"চার্জ শীঘ্রই শেষ হয়ে যেতে পারে"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"আপনার ফোনটি স্বাভাবিকের থেকে অনেক বেশি ব্যবহার করা হয়েছে। প্রত্যাশিত সময়ের আগেই চার্জ শেষ হয়ে যেতে পারে।\n\nশেষবার চার্জ দেওয়ার পর থেকে(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) সবথেকে বেশি ব্যবহৃত <xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপ:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"আপনার ট্যাবলেটটি স্বাভাবিকের থেকে অনেক বেশি ব্যবহার করা হয়েছে। প্রত্যাশিত সময়ের আগেই চার্জ শেষ হয়ে যেতে পারে।\n\nশেষবার চার্জ দেওয়ার পর থেকে(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) সবথেকে বেশি ব্যবহৃত <xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপ:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"আপনার ডিভাইসটি স্বাভাবিকের থেকে অনেক বেশি ব্যবহার করা হয়েছে। প্রত্যাশিত সময়ের আগেই চার্জ শেষ হয়ে যেতে পারে।\n\nশেষবার চার্জ দেওয়ার পর থেকে(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) সবথেকে বেশি ব্যবহৃত <xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপ:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">%1$dটি অ্যাপ সীমাবদ্ধ করুন</item>
       <item quantity="other">%1$dটি অ্যাপ সীমাবদ্ধ করুন</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"এই অ্যাপটি ব্যাকগ্রাউন্ডে ব্যাটারি ব্যবহার করতে পারবে। প্রত্যাশিত সময়ের আগেই আপনার ব্যাটারির চার্জ শেষ হয়ে যেতে পারে।"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"সরান"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"বাতিল করুন"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"আপনার ব্যবহার অনুযায়ী ব্যাটারি সাধারণত সম্পূর্ণ চার্জ করা থাকলে একবারে <xliff:g id="TIME_DURATION">%1$s</xliff:g> চলে।\n\nব্যাটারি আরও বেশিক্ষণ ব্যবহার করতে চাইলে ব্যাটারি সেভার চালু করুন।"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ব্যাটারি আরও বেশিক্ষণ ব্যবহার করতে চাইলে ব্যাটারি সেভার চালু করুন"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ব্যাটারি ম্যানেজার"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"নিজে থেকে অ্যাপ পরিচালনা করুন"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"আপনি যে অ্যাপগুলি কম ব্যবহার করেন সেগুলি কতখানি ব্যাটারি ব্যবহার করবে তার সীমা নির্দিষ্ট করুন"</string>
@@ -3075,38 +3094,28 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ভিজুয়াল সঙ্কেতগুলি চালু করুন"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
+    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"বিজ্ঞপ্তি"</string>
+    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"কাস্টম"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"কাস্টম সেটিং চালু করুন"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"কাস্টম সেটিং সরান"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"দেখা যাবে"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"আংশিকভাবে আড়াল করা"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"আড়াল করা"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"কাস্টম সীমাবদ্ধতা"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"যখন স্ক্রিনটি চালু থাকে"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"যখন স্ক্রিনটি বন্ধ থাকে"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"সাউন্ড এবং ভাইব্রেশন মিউট করুন"</string>
@@ -3151,13 +3160,40 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি নিয়ম নিজে থেকে চালু হতে পারে</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি নিয়ম নিজে থেকে চালু হতে পারে</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"আচ্ছা"</string>
+    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
+    <skip />
+    <!-- no translation found for zen_sound_title (424490228488531372) -->
+    <skip />
+    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
+    <skip />
+    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
+    <skip />
+    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
+    <skip />
+    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
+    <skip />
+    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
+    <skip />
+    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
+    <skip />
+    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
+    <skip />
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"আপডেট করুন"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"আপডেট করবেন না"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"ফোকাস করার জন্য আপনার ফোন আপনাকে আরও সাহায্য করতে পারে।\n\nএতে সেটিংস আপডেট করুন:\n\n- বিজ্ঞপ্তিগুলি সম্পূর্ণভাবে লুকান\n\n- তারা চিহ্নিত পরিচিতিগুলি থেকে কলগুলির অনুমতি দিন এবং কলারকে আবার কল করুন"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\'বিরক্ত করবেন না\' মোড আপডেট করবেন?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"সেটিংস"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"আপনি সেটিংসে গিয়ে এটি আরও কাস্টমাইজ করতে পারেন।"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"স্ক্রিন চালু থাকলে ব্লক করতে চাই"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"স্ক্রিন বন্ধ থাকলে ব্লক করতে চাই"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\'বিরক্ত করবেন না\' মোডে শুধু সাউন্ড বন্ধ করা ছাড়াও আরও অনেক কিছু করা যায় - এর মাধ্যমে আপনি ভিজুয়ালও ব্লক করতে পারেন। ঘুমানোর সময়, কোনও কাজে ব্যস্ত থাকলে অথবা ফোন নিয়ে বেশি সময় কাটাতে না চাইলে এই বৈশিষ্ট্যটি আপনার কাজে লাগতে পারে।"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"সাউন্ড এবং ভিজুয়াল ব্লক করুন"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"বিজ্ঞপ্তি আসলেও স্ক্রিনে আলো দেখতে অথবা স্লিপ মোড ছেড়ে যেতে চাই না"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ফোনের প্রাথমিক অ্যাক্টিভিটি এবং স্ট্যাটাস ছাড়া অন্য কোনও বিজ্ঞপ্তি দেখতে চাই না"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"কর্মস্থলের প্রোফাইলের ধ্বনিগুলি"</string>
@@ -3328,21 +3364,42 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> থেকে <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"কল"</string>
+    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"মেসেজ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"সমস্ত মেসেজ"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"নির্বাচিত বার্তাগুলি"</string>
+    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
+    <skip />
+    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
+    <skip />
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"যে কোনো ব্যক্তির কাছ থেকে"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"শুধুমাত্র পরিচিতিদের থেকে"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"শুধুমাত্র তারকাচিহ্নিত পরিচিতিদের থেকে"</string>
+    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
+    <skip />
     <string name="zen_mode_from_none" msgid="8219706639954614136">"কোনো কিছুই নয়"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"অ্যালার্মগুলি"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"মিডিয়া"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"টাচ সাউন্ড"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"রিমাইন্ডার"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ইভেন্টগুলি"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"সমস্ত কলার"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"নির্বাচিত কলারগুলি"</string>
+    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
+    <skip />
+    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
+    <skip />
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"রিপিট কলার"</string>
+    <!-- no translation found for zen_mode_calls_summary_one (2867689575419791866) -->
+    <skip />
+    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
+    <skip />
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"একই ব্যক্তি <xliff:g id="MINUTES">%d</xliff:g> এর ভিতরে দ্বিতীয়বার কল করলে"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"কাস্টম"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"স্বয়ংক্রিয়ভাবে চালু"</string>
@@ -3612,7 +3669,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"এই অ্যাপ্লিকেশানের দ্বারা তৈরি হওয়া সমস্ত \'বিরক্ত করবেন না\' নিয়মগুলিকে সরানো হবে৷"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"অপ্টিমাইজ করবেন না"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"অপ্টিমাইজ করুন"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"আরো দ্রুত আপনার ব্যাটারির চার্জ শেষ হয়ে যেতে পারে"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ব্যাটারির আয়ু বাড়ানোর জন্য প্রস্তাবিত"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> -কে ব্যাটারি অপ্টিমাইজেশান উপেক্ষা করার অনুমতি দেবেন?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"কোনো কিছুই নয়"</string>
@@ -3688,7 +3746,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ব্যাক-আপ নেওয়া অক্ষম করা রয়েছে"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> এ আপডেট করা হয়েছে"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"আপডেট পাওয়া যাচ্ছে"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"এই সেটিং পরিবর্তন করা যাবে না"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"কাজটি অনুমোদিত নয়"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ভলিউম পরিবর্তন করা যাবে না"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"কল করার অনুমতি নেই"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"এসএমএস পাঠানোর অনুমতি নেই"</string>
@@ -3878,7 +3936,8 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"লক স্ক্রিনে নিয়ন্ত্রণের তথ্য"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"বিজ্ঞপ্তির কন্টেন্ট দেখুন বা লুকান"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"সমস্ত"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"সহায়তা এবং টিপ্স"</string>
+    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
+    <skip />
     <string name="developer_smallest_width" msgid="7516950434587313360">"সবচেয়ে কম প্রস্থ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ইনস্টল করা কোনো অ্যাপ্লিকেশানই প্রিমিয়াম SMS অ্যাক্সেসের অনুরোধ করেনি"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"প্রিমিয়াম SMS এর জন্য অর্থ খরচ হতে পারে এবং আপনার পরিষেবা প্রদানকারীর বিলে যোগ করা হবে৷ আপনি যদি কোনো অ্যাপ্লিকেশানের জন্য অনুমতি সক্ষম করেন তাহলে আপনি সেই অ্যাপ্লিকেশানটি ব্যবহার করে প্রিমিয়াম SMS পাঠাতে পারবেন৷"</string>
@@ -4071,6 +4130,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"সিনেমা ও টিভি অ্যাপ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন এবং উত্তেজনাপূর্ণ আর কি আছে?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপনার নতুন ফোন চালিয়ে দেখুন"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপনার নতুন ট্যাবলেট চালিয়ে দেখুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 867f293..3b4a87b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -168,6 +168,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti vašoj SIM kartici. Odobrenje pristupa SIM kartici će onemogućiti vezu za prijenos podataka na vašem uređaju za vrijeme trajanja veze. Odobri pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Uređaj je vidljiv drugim uređajima kao \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Omogućite tabletu da komunicira s Bluetooth uređajima u blizini"</string>
@@ -1466,6 +1468,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Nije moguće vratiti eSIM-ove na zadano"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Nije moguće vratiti eSIM-ove na zadano zbog greške."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Izbriši sve podatke (vraćanje na fabričke postavke)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ovo će izbrisati sve podatke iz "<b>"interne memorije"</b>" vašeg tableta, 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_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>
@@ -2018,6 +2022,8 @@
       <item quantity="few">Veoma dugo kašnjenje (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Veoma dugo kašnjenje (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Zvono i obavještenje su postavljeni na isključeno"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Zvono i obavještenje su postavljeni na slabo"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Zvono i obavještenje su postavljeni na srednje"</string>
@@ -2127,8 +2133,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Korištenje ekrana od potpune napunjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja ekrana"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Korištenje aplikacije od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Korištenje uređaja od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2159,8 +2165,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Podizanje uređaja iz stanja mirovanja u pozadini"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Učestalo zahtijevanje lokacije"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Ukupno aplikacija koje se ne ponašaju kako treba: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterija je u dobrom stanju"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikacije rade uobičajeno"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacije se izvode na uobičajen način"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon troši bateriju u pozadini uobičajenom brzinom"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet troši bateriju u pozadini uobičajenom brzinom"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Uređaj troši bateriju u pozadini uobičajenom brzinom"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Nizak kapacitet baterije"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Baterija ne može osigurati dobar vijek trajanja"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Poboljšajte vijek trajanja baterije telefona"</string>
@@ -2175,9 +2183,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Koristili ste tablet više nego obično"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Koristili ste uređaj više nego obično"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Baterija bi se mogla uskoro isprazniti"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon je korišten više nego obično. Baterija se može isprazniti prije očekivanog vremena.\n\nNajviše korištene aplikacije (ukupno <xliff:g id="NUMBER">%1$d</xliff:g>) od posljednjeg potpunog punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablet je korišten više nego obično. Baterija se može isprazniti prije očekivanog vremena.\n\nNajviše korištene aplikacije (ukupno <xliff:g id="NUMBER">%1$d</xliff:g>) od posljednjeg potpunog punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Uređaj je korišten više nego obično. Baterija se može isprazniti prije očekivanog vremena.\n\nNajviše korištene aplikacije (ukupno <xliff:g id="NUMBER">%1$d</xliff:g>) od posljednjeg potpunog punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Ograničite %1$d aplikaciju</item>
       <item quantity="few">Ograničite %1$d aplikacije</item>
@@ -2211,8 +2222,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ova aplikacija će moći koristiti bateriju u pozadini. Vaša baterija bi se mogla isprazniti prije nego što očekujete."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ukloni"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Otkaži"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Na osnovu vašeg korištenja, baterija obično traje oko <xliff:g id="TIME_DURATION">%1$s</xliff:g> kada je potpuno napunjena.\n\nAko želite produžiti trajanje baterije, uključite Uštedu baterije."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ako želite produžiti trajanje baterije, uključite Uštedu baterije"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Vaše aplikacije troše bateriju uobičajenom brzinom. Ako aplikacije budu prebrzo trošile bateriju, telefon će vam predložiti što biste mogli poduzeti.\n\nAko je razina baterije niska, možete uključiti Štednju baterije."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Vaše aplikacije troše bateriju uobičajenom brzinom. Ako aplikacije budu prebrzo trošile bateriju, tablet će vam predložiti što biste mogli poduzeti.\n\nAko je razina baterije niska, možete uključiti Štednju baterije."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Vaše aplikacije troše bateriju uobičajenom brzinom. Ako aplikacije budu prebrzo trošile bateriju, uređaj će vam predložiti što biste mogli poduzeti.\n\nAko je razina baterije niska, možete uključiti Štednju baterije."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Upravitelj baterije"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Automatsko upravljanje aplikacijama"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ograničite upotrebu baterije za aplikacije koje ne koristite često"</string>
@@ -3110,15 +3122,14 @@
     <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">"Blokiranje vizuelnih ometanja"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dozvolite vizualnu signalizaciju"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ograniči obavještenja"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kada je uključen način rada Ne ometaj"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obavještenja"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kada je uključen način rada Ne ometaj"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Isključi zvuk obavještenja"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Prikaži obavještenja, ali isključi zvuk i vibraciju"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Kada stignu nova obavještenja, telefon neće pustiti zvuk niti vibrirati"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Sakrij i isključi zvuk obavještenja"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Obavještenja se neće nikako prikazivati"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Kada je uključen način rada Ne ometaj, nećete vidjeti nova niti postojeća obavještenja. Međutim, i dalje će se prikazivati obavještenja potrebna za osnovne aktivnosti telefona i status."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Nečujno prikaži obavještenja"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Zvuk obavještenja će biti isključen"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon neće puštati zvuk ili vibrirati kada stignu nova obavještenja."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sakrij obavještenja"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nećete vidjeti nova ili postojeća obavještenja"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon neće prikazivati nova ili postojeća obavještenja, puštati zvuk ili vibrirati. Obavještenja se neće prikazivati kada prevučete od vrha ekrana prema dolje.\n\nImajte na umu da će se kritična obavještenja o aktivnosti i statusu telefona i dalje pojavljivati."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Prilagođeno"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogući prilagođenu postavku"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ukloni prilagođenu postavku"</string>
@@ -3172,13 +3183,27 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> pravila se mogu automatski uključiti</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravila se može automatski uključiti</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Uredu"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Ponašanje"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Izuzeci"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Zakaži"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Zvuk i vibracija"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Kada je uključen način rada Ne ometaj, zvuk i vibracija će biti isključeni, osim za stavke koje omogućite iznad."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Isključi zvuk za sve osim"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Isključen zvuk"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Zvuk nije isključen"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Zvuk je isključen, ali omogući <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Zvuk je isključen, ali omogući <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> i <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zvuk je isključen, ali omogući <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Poruke, događaji i podsjetnici"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kada je uključen način rada Ne ometaj, zvuk poruka, podsjetnika i događaja će biti isključen, osim za stavke koje omogućite iznad. Postavke poruka možete podesiti tako da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Ažuriraj"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Nemoj ažurirati"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Vaš telefon vam može pomoći više da se fokusirate.\n\nAžurirajte postavke da:\n\n- U potpunosti sakrijete obavještenja\n\n- Dozvolite pozive od kontakata označenih zvjezdicom i čestih pozivalaca"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Ažurirati način rada Ne ometaj?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Postavke"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Ovo možete dodatno prilagoditi u Postavkama"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokiraj kada je ekran uključen"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokiraj kada je ekran isključen"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Način rada Ne ometaj ne služi samo za blokiranje neželjenih zvukova. Može blokirati i vizuelne elemente. To može biti korisno ukoliko pokušavate zaspati, usredotočiti se ili ograničiti vrijeme koje provodite na telefonu."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokiraj zvukove i vizuelne elemente"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Nemoj uključivati ekran ili buditi zbog obavještenja"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Nikako ne prikazuj obavještenja, osim osnovnih aktivnosti i statusa telefona"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvukovi radnog profila"</string>
@@ -3353,21 +3378,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Pozivi"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kada je uključen način rada Ne ometaj, blokirani su dolazni pozivi. Postavke možete podesiti tako da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Sve poruke"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Odabrane poruke"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Poruke"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Neke poruke"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od bilo koga"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od kontakata"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata označenih zvjezdicom"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Od kontakata označenih zvjezdicom i ponovljenih pozivalaca"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Od kontakata i ponovljenih pozivalaca"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Samo od ponovljenih pozivalaca"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Mediji"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Zvuci dodira"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivi"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Odabrani pozivaoci"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"bilo ko"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakti"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakti označeni zvjezdicom"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Samo od pozivaoca <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Od pozivaoca <xliff:g id="CALLER_TYPE">%1$s</xliff:g> i <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ukoliko ista osoba pozove ponovo u roku od <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Prilagođeno"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski upaliti"</string>
@@ -3647,7 +3682,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Sva pravila za uslugu Ne ometaj koje je kreirala ova aplikacija, biti će uklonjena."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne optimiziraj"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizuj"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Baterija se može brže isprazniti"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Preporučuje se za duže trajanje baterije"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Želite da dozvolite aplikaciji <xliff:g id="APP">%s</xliff:g> da ignoriše optimizacije baterije?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nijedno"</string>
@@ -3724,7 +3760,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Izrada sigurnosnih kopija je onemogućena"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostupno je ažuriranje"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Nije moguće promijeniti postavku"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Radnja nije dozvoljena"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Nije moguće promijeniti jačinu zvuka"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Pozivanje nije dozvoljeno"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS poruka nije dozvoljena"</string>
@@ -3920,7 +3956,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolirajte informacije na zaključanom ekranu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaži ili sakrij sadržaj obavještenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i savjeti"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Savjeti i podrška"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila pristup premijum SMS-ovima"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Usluga Premium SMS se možda dodatno plaća te će trošak biti na računu koji dobijate od operatera. Ukoliko aplikaciji date odobrenje, moći ćete slati premium SMS poruke putem te aplikacije."</string>
@@ -4123,6 +4159,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operater koji pruža informacije"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktiviranje dodjele resursa operatera"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte se s novim telefonom"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte se s novim tabletom"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0dbe3af..6d30dba 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Sol·licitud d\'accés a la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vol accedir a la targeta SIM. Si hi concedeixes accés, es desactivarà la connectivitat de dades al dispositiu mentre duri la connexió. Dona accés a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible com a <xliff:g id="DEVICE_NAME">^1</xliff:g> per a altres dispositius"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Els teus dispositius"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincula un dispositiu nou"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permet que la tauleta es comuniqui amb dispositius Bluetooth que estiguin a prop"</string>
@@ -276,7 +278,7 @@
     <string name="locale_not_translated" msgid="516862628177166755">"És possible que no estigui disponible en algunes aplicacions"</string>
     <string name="action_drag_label_move_up" msgid="9052210023727612540">"Mou amunt"</string>
     <string name="action_drag_label_move_down" msgid="7448713844582912157">"Mou avall"</string>
-    <string name="action_drag_label_move_top" msgid="557081389352288310">"Mou al principi"</string>
+    <string name="action_drag_label_move_top" msgid="557081389352288310">"Mou a la part superior"</string>
     <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Mou al final"</string>
     <string name="action_drag_label_remove" msgid="2861038147166966206">"Suprimeix l\'idioma"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Selecció de l\'activitat"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"No es poden restablir les eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"S\'ha produït un error i no es poden restablir les eSIM."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, també:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Retard molt llarg (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Retard molt llarg (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"S\'ha desactivat la vibració per als sons i per a les notificacions"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Baixa per a trucades i notificacions"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"La vibració per als sons i per a les notificacions està establerta en Mitjana"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Consum de la pantalla des de l\'última càrrega completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consum de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes mòbils"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Ús de les aplicacions des de la càrrega completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Consum del dispositiu des de l\'última càrrega completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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">"Consum del dispositiu des de l\'última càrrega completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Consum de la bateria des que s\'ha desconnectat"</string>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"S\'activa el dispositiu en segon pla"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se sol·licita la ubicació massa sovint"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicacions no funcionen correctament"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La bateria està en bon estat"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Les aplicacions funcionen amb normalitat"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"La bateria té poca capacitat"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La durada de la bateria no és bona"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Millora la durada de la bateria del telèfon"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"La tauleta s\'ha utilitzat més del que és habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"El dispositiu s\'ha utilitzat més del que és habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"És possible que la bateria s\'esgoti aviat"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"El telèfon s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAquestes són les <xliff:g id="NUMBER">%1$d</xliff:g> aplicacions que han consumit més bateria des de l\'última càrrega (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"La tauleta s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAquestes són les <xliff:g id="NUMBER">%1$d</xliff:g> aplicacions que han consumit més bateria des de l\'última càrrega (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"El dispositiu s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAquestes són les <xliff:g id="NUMBER">%1$d</xliff:g> aplicacions que han consumit més bateria des de l\'última càrrega (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restringeix %1$d aplicacions</item>
       <item quantity="one">Restringeix %1$d aplicació</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Aquesta aplicació podrà consumir bateria en segon pla, cosa que pot provocar que s\'esgoti abans del previst."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Suprimeix"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancel·la"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Segons l\'ús que en fas, la bateria normalment dura <xliff:g id="TIME_DURATION">%1$s</xliff:g> aproximadament quan està totalment carregada.\n\nPer augmentar la durada de la bateria, activa l\'estalvi de bateria."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Per augmentar la durada de la bateria, activa l\'estalvi de bateria."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestor de bateria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gestiona les aplicacions automàticament"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limita el consum de bateria de les aplicacions que no utilitzes habitualment"</string>
@@ -3075,15 +3094,14 @@
     <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">"Bloqueja interrupcions visuals"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permet senyals visuals"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restringeix les notificacions"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quan el mode No molestis estigui activat"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificacions"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Quan el mode No molestis estigui activat"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Silencia les notificacions"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostra les notificacions, però silencia els sons i la vibració"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Quan arribin notificacions noves, el telèfon no farà cap soroll ni vibrarà"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Amaga i silencia les notificacions"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"No es mostrarà cap notificació"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"No veuràs cap notificació nova ni anterior quan el telèfon tingui el mode No molestis activat. Tot i això, es continuaran mostrant les notificacions necessàries per a les activitats bàsiques i l\'estat del telèfon."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostra les notificacions de manera silenciosa"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Les notificacions se silenciaran"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Quan arribin notificacions, el telèfon no emetrà cap so ni vibrarà."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Amaga les notificacions"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"No veuràs cap notificació nova ni anterior"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"El telèfon no et mostrarà les notificacions noves o anteriors ni tampoc no vibrarà ni emetrà cap so. No veuràs les notificacions quan llisquis cap avall des de la part superior de la pantalla.\n\nTingues en compte que les notificacions importants relacionades amb l\'activitat i l\'estat del telèfon es continuaran mostrant."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalitzat"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activa la configuració personalitzada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Suprimeix la configuració personalitzada"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regles ho poden activar automàticament</item>
       <item quantity="one">1 regla ho pot activar automàticament</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"D\'acord"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportament"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Excepcions"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Programació"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"So i vibració"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Quan actives el mode No molestis, el so i la vibració se silencien excepte per a aquells elements que hagis permès més amunt."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Silencia-ho tot excepte"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Silenciat"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"No silenciat"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Silenciat, però permet <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Silenciat, però permet <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> i <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciat, però permet <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Missatges, esdeveniments i recordatoris"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quan actives el mode No molestis, els missatges, els recordatoris i els esdeveniments se silencien, excepte aquells elements que hagis permès més amunt. Pots ajustar la configuració dels missatges per permetre que amics, familiars i altres contactes puguin contactar amb tu."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Actualitza"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"No actualitzis"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"El teu telèfon pot ajudar-te a no perdre la concentració.\n\nActualitza la configuració per poder fer el següent:\n\n- Amagar les notificacions completament.\n\n- Permetre les trucades dels contactes destacats i les trucades repetides."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Vols actualitzar al mode No molestis?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configuració"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Pots personalitzar-ho a Configuració."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloqueja quan la pantalla estigui activada"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloqueja quan la pantalla estigui desactivada"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"El mode No molestis, a més de bloquejar els sons no desitjats, també pot bloquejar els elements visuals. Et pot resultar útil quan vulguis dormir, concentrar-te o limitar el temps que passes fent servir el telèfon."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloqueja els sons i els elements visuals"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"No activis la pantalla ni el dispositiu per mostrar les notificacions"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"No mostris cap notificació, excepte de l\'activitat bàsica i l\'estat del telèfon"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons del perfil professional"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Trucades"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quan actives el mode No molestis, les trucades entrants es bloquegen. Pots ajustar la configuració per permetre que amics, familiars i altres persones puguin contactar amb tu."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Missatges"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tots els missatges"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Missatges seleccionats"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Missatges"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Alguns missatges"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De qualsevol persona"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Només dels contactes"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Només dels contactes destacats"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De contactes destacats i trucades repetides"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De contactes i trucades repetides"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Només de trucades repetides"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Cap"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Multimèdia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sons en tocar"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatoris"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Esdeveniments"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Totes les trucades"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactes seleccionats"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"qualsevol persona"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contactes"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contactes destacats"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Trucades repetides"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Només de: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> i <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si una mateixa persona truca dues vegades en menys de <xliff:g id="MINUTES">%d</xliff:g> minuts"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalitzat"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activa automàticam."</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se suprimiran totes les regles del mode No molestis creades per aquesta aplicació."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"No optimitzis la bateria"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimitza la bateria"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"És possible que la bateria es consumeixi més ràpidament"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Es recomana per allargar la bateria"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Vols permetre que <xliff:g id="APP">%s</xliff:g> ignori les optimitzacions de la bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Cap"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Còpia de seguretat desactivada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualitzat a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualització disponible"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"No es pot canviar aquesta opció"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Acció no permesa"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"No es pot canviar el volum"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"No està permès fer trucades"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"No està permès enviar SMS"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Controla la informació de la pantalla de bloqueig"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o oculta el contingut de la notificació"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tots"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Ajuda i consells"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Ajuda i consells"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Amplada més petita"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Cap aplicació instal·lada no ha sol·licitat accés a SMS prèmium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Els SMS prèmium et poden costar diners, i aquest import s\'afegirà a la facturació de l\'operador de telefonia mòbil. Si actives el permís en una aplicació, podràs enviar SMS prèmium utilitzant-la."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicacions de pel·lícules i TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informació de serveis de l\'operador de telefonia mòbil"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activa els serveis de l\'operador de telefonia mòbil"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quines són les novetats més importants?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Dona una ullada al teu telèfon nou"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Dona una ullada a la teva tauleta nova"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c152d0e..14bcdf0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žádost o přístup k SIM kartě"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zařízení <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> žádá o přístup k SIM kartě. Po dobu přístupu zařízení k SIM kartě bude datové připojení ve vašem zařízení vypnuto. Chcete zařízení <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> povolit přístup?"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Viditelné pro ostatní zařízení jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zařízení"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Spárovat nové zařízení"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Povolte tabletu komunikovat se zařízeními Bluetooth v okolí"</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM karty nelze resetovat"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM karty kvůli chybě nelze resetovat."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Vymazat data (tovární reset)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mj. i:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mj. i:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="other">Velmi dlouhá prodleva (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Velmi dlouhá prodleva (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Vibrace pro vyzvánění a oznámení jsou vypnuty"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Pro vyzvánění a oznámení jsou nastaveny slabé vibrace"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Pro vyzvánění a oznámení jsou nastaveny střední vibrace"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Využití obrazovky od úplného nabití"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotřeba obrazovky"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Využití aplikace od posledního úplného nabití (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Využití zařízení od posledního úplného nabití (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Buzení zařízen na pozadí"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Časté žádosti o polohu"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Počet aplikací, které se nechovají správně: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterie pracuje bez problémů"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikace běží normálně"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Nízká kapacita baterie"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Baterie není schopna zajistit dobrou výdrž"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Zvyšte životnost baterie telefonu"</string>
@@ -2197,9 +2209,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet byl využíván víc než obvykle"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Zařízení bylo využíváno víc než obvykle"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Baterie se brzy vybije"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon byl využíván víc než obvykle. Baterie se možná vybije dříve, než bylo očekáváno.\n\nNejvíce využívané aplikace (<xliff:g id="NUMBER">%1$d</xliff:g>) od posledního nabití (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablet byl využíván víc než obvykle. Baterie se možná vybije dříve, než bylo očekáváno.\n\nNejvíce využívané aplikace (<xliff:g id="NUMBER">%1$d</xliff:g>) od posledního nabití (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Zařízení bylo využíváno víc než obvykle. Baterie se možná vybije dříve, než bylo očekáváno.\n\nNejvíce využívané aplikace (<xliff:g id="NUMBER">%1$d</xliff:g>) od posledního nabití (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="few">Omezit %1$d aplikace</item>
       <item quantity="many">Omezit %1$d aplikace</item>
@@ -2238,8 +2253,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Aplikace bude moci využívat baterii na pozadí. Baterie se možná vybije dříve, než bylo očekáváno."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Odebrat"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Zrušit"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Při vašem způsobu používání vám baterie po úplném nabití vydrží přibližně <xliff:g id="TIME_DURATION">%1$s</xliff:g>.\n\nPokud výdrž baterie potřebujete prodloužit, zapněte spořič baterie."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Pokud potřebujete prodloužit výdrž baterie, zapněte spořič baterie"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Správce baterie"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Automatická správa aplikací"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Omezte využití baterie u aplikací, které používáte zřídka"</string>
@@ -3145,15 +3164,14 @@
     <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">"Blokovat vizuální vyrušení"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Povolit vizuální signály"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Omezit oznámení"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Když je zapnut režim Nerušit"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Oznámení"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Když je zapnut režim Nerušit"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Vypnout oznámení"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Zobrazit oznámení, ale ztlumit zvuk a vibrace"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Nová oznámení nebudou vydávat zvuk ani vibrovat"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Skrytí a vypnutí oznámení"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Oznámení se vůbec nebudou zobrazovat"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Když je zapnut režim Nerušit, nebudou se zobrazovat nová ani stávající oznámení. Oznámení potřebná pro základní činnost a stav telefonu se však zobrazovat budou."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Zobrazovat oznámení tiše"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Oznámení budou ztlumena"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Nová oznámení nebudou vydávat zvuk ani vibrovat"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skrýt oznámení"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nebudou se zobrazovat nová ani stávající oznámení."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon nebude zobrazovat nová ani stávající oznámení a nebude vydávat zvuky ani vibrovat. Oznámení se nezobrazí, ani když přejedete prstem z horní části obrazovky.\n\nKritická oznámení související s aktivitou a stavem telefonu se však nadále zobrazovat budou."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Vlastní"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivovat vlastní nastavení"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Odstranit vlastní nastavení"</string>
@@ -3209,13 +3227,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravidel se může zapnout automaticky</item>
       <item quantity="one">1 pravidlo se může zapnout automaticky</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Chování"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Výjimky"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Plán"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Zvuk a vibrace"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Když je zapnut režim Nerušit, zvuky a vibrace budou ztlumeny (kromě položek, které povolíte výše)."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Ztlumeno vše kromě"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Ztlumeno"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Neztlumeno"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Ztlumeno, ale povolit <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Ztlumeno, ale povolit <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> a <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ztlumeno, ale povolit <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> a <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Zprávy, události a připomenutí"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Když je zapnut režim Nerušit, zprávy, připomenutí a události budou ztlumeny (kromě položek, které povolíte výše). Nastavení zpráv můžete upravit, aby vás mohli kontaktovat kamarádi, členové rodiny nebo jiní vybraní lidé."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Aktualizovat"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Neaktualizovat"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefon vám může pomáhat se soustředěním.\n\nAktualizováním nastavení aktivujte následující funkce:\n\n– úplné skrytí oznámení,\n\n– povolení hovorů od kontaktů s hvězdičkou a opakovaných volání."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Aktualizovat nastavení režimu Nerušit?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nastavení"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Tuto možnost můžete více přizpůsobit v Nastavení."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokovat, když je obrazovka zapnutá"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokovat, když je obrazovka vypnutá"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Režim Nerušit dokáže více, než jen blokovat nechtěné zvuky – dokáže blokovat i vizuální vyrušení. To může být užitečné, když chcete spát, soustředit se nebo omezit čas strávený na telefonu."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokovat zvuky a vizuální vyrušení"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Nezapínat obrazovku ani nebudit kvůli oznámení"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Oznámení vůbec nezobrazovat, s výjimkou základní aktivity a stavu telefonu"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuky pracovního profilu"</string>
@@ -3394,21 +3426,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> až <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Volání"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Když je zapnut režim Nerušit, příchozí hovory jsou blokovány. Nastavení můžete upravit, aby se vám dovolali kamarádi, členové rodiny nebo jiné vybrané kontakty."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Zprávy"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Všechny zprávy"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Vybrané zprávy"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Zprávy"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Některé zprávy"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od kohokoli"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Pouze od kontaktů"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Pouze od oblíbených kontaktů"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Od kontaktů s hvězdičkou a lidí, co volají opakovaně"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Od kontaktů a lidí, co volají opakovaně"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Pouze od lidí, co volají opakovaně"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žádné"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Média"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Zvuky při dotyku"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Připomenutí"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Události"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Všichni volající"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volající"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"kdokoli"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakty"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakty s hvězdičkou"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Volající, kteří volají opakovaně"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Pouze <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> a <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Pokud stejná osoba zavolá podruhé během <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Vlastní"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnout"</string>
@@ -3698,7 +3740,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Všechna pravidla pro režim Nerušit vytvořená touto aplikací budou odstraněna."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Neoptimalizovat"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimalizovat"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Baterie se může vybíjet rychleji"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Doporučeno k zajištění delší výdrže baterie"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Chcete aplikaci <xliff:g id="APP">%s</xliff:g> povolit ignorování optimalizace využití baterie?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Žádné"</string>
@@ -3776,7 +3819,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Zálohování bylo zakázáno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aktualizováno na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"K dispozici je aktualizace"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Toto nastavení nelze změnit"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Akce není povolena."</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Hlasitost nelze změnit"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Volání není povoleno"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Zprávy SMS nejsou povoleny"</string>
@@ -3978,7 +4021,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Nastavte informace na obrazovce uzamčení"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazit nebo skrýt obsah oznámení"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Vše"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora a tipy"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tipy a podpora"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minimální šířka"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Žádné nainstalované aplikace o přístup k prémiovým SMS nepožádaly"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Prémiové SMS mohou být zpoplatněny a jejich cena se přičte k fakturaci operátora. Pokud aplikaci udělíte příslušné oprávnění, budete pomocí této aplikace moci odesílat prémiové SMS."</string>
@@ -4191,6 +4234,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikace pro filmy a TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informace o zprovoznění služby u operátora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustit zprovoznění služby u operátora"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co je nové a zajímavé?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Prohlédněte si svůj nový telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Prohlédněte si svůj nový tablet"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 76e618d..701a702 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anmodning om SIM-adgang"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil have adgang til dit SIM-kort. Hvis du giver adgang til SIM-kortet, deaktiveres dataforbindelsen på din enhed, så længe den anden enhed er forbundet. Giv adgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vises som \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" på andre enheder"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dine enheder"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Par ny enhed"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tillad, at din tablet kommunikerer med Bluetooth-enheder i nærheden"</string>
@@ -201,7 +203,7 @@
     <string name="proxy_error" msgid="8926675299638611451">"Bemærk"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"Det indtastede hostname er ikke gyldigt."</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"Den indtastede udeladelsesliste er ikke korrekt formateret. Indtast en kommasepareret liste over udeladte domæner."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"Den indtastede udeladelsesliste er ikke korrekt formateret. Angiv en kommasepareret liste over udeladte domæner."</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Du skal udfylde portfeltet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Den indtastede port er ikke gyldig."</string>
@@ -478,7 +480,7 @@
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Du låser din tablet ved at slukke og tænde den."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Du låser din telefon ved at slukke og tænde den."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Advarsel! Enheden ryddes efter <xliff:g id="COUNT">^1</xliff:g> mislykkede oplåsningsforsøg mere."</string>
-    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Indtast din adgangskode"</string>
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Angiv din adgangskode"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af din  tablet, skal du udføre en gendannelse af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af telefonen, skal du udføre en gendannelse af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
@@ -656,7 +658,7 @@
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrer forbindelser, angiv enhedens navn og søgbarhed"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"Vil du parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Bluetooth-parringskode"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Indtast parringskoden, og tryk på Enter"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Angiv parringskoden, og tryk på Enter"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Pinkode indeholder bogstaver eller symboler"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Normalt 0000 eller 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"Skal bestå af 16 cifre"</string>
@@ -827,7 +829,7 @@
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Rullelisten Avancerede valgmuligheder. Tryk to gange for at skjule listen."</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Rullelisten Avancerede valgmuligheder. Tryk to gange for at udvide listen."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Netværksnavn"</string>
-    <string name="wifi_ssid_hint" msgid="897593601067321355">"Indtast SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Angiv SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhed"</string>
     <string name="wifi_hidden_network" msgid="973162091800925000">"Skjult netværk"</string>
     <string name="wifi_hidden_network_warning" msgid="6674068093531603452">"Hvis din router ikke udsender et netværks-id, men du gerne vil oprette forbindelse til netværket i fremtiden, kan du indstille det til at være skjult.\n\nDette kan medføre et sikkerhedsproblem, da din telefon med jævne mellemrum udsender et signal for at finde netværket.\n\nDine routerindstillinger ændres ikke, når du skjuler netværket."</string>
@@ -867,7 +869,7 @@
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domæne skal angives."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Indtast adgangskoden til dit netværk"</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Angiv adgangskoden til dit netværk"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi-Fi-netværk for mobilselskab"</string>
     <string name="wifi_carrier_content" msgid="4634077285415851933">"Opret forbindelse via <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For bl.a. at kunne angive en mere nøjagtig placering vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
@@ -911,9 +913,9 @@
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Avancerede Wi-Fi-indstillinger er ikke tilgængelige for denne bruger"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Gem"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annuller"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Indtast en gyldig IP-adresse."</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Angiv en gyldig IP-adresse."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"Angiv en gyldig gatewayadresse."</string>
-    <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"Indtast en gyldig DNS-adresse."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"Angiv en gyldig DNS-adresse."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"Angiv gyldigt netværkspræfiks på 0-32 tegn."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
@@ -1159,7 +1161,7 @@
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Lås op for SIM-kortet"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Nuværende pinkode til SIM-kort"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Ny pinkode til SIM-kort"</string>
-    <string name="sim_reenter_new" msgid="6523819386793546888">"Indtast ny pinkode igen"</string>
+    <string name="sim_reenter_new" msgid="6523819386793546888">"Angiv ny pinkode igen"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"Pinkode til SIM-kort"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Forkert pinkode"</string>
     <string name="sim_pins_dont_match" msgid="1695021563878890574">"Pinkoderne er ikke ens"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-kort kan ikke gendannes"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Dine eSIM-kort kan ikke gendannes på grund af en fejl."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Ryd alle data (gendan fabriksindstillinger)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dette sletter alle data fra tablettens "<b>"interne lagerplads"</b>", f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dette sletter alle data fra telefonens "<b>"interne lagerplads"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og apps"</li>\n<li>"downloadede apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
@@ -1513,7 +1517,7 @@
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Vil du bruge <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> til at administrere dine netværksforbindelser?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Vil du bruge <xliff:g id="NEW_APP">%s</xliff:g> til at administrere dine netværksforbindelser?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"SIM fra ukendt mobilselskab"</string>
-    <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> har intet kendt website til levering"</string>
+    <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> har intet kendt website til provisionering"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Indsæt SIM-kort, og genstart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Opret forbindelse til internettet"</string>
     <string name="location_title" msgid="1029961368397484576">"Min placering"</string>
@@ -1587,11 +1591,11 @@
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Pinkoden er blevet indstillet"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønsteret er blevet indstillet"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Brug mønsteret til din enhed for at fortsætte"</string>
-    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Indtast pinkoden til din enhed for at fortsætte"</string>
-    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Indtast adgangskoden til din enhed for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Angiv pinkoden til din enhed for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Angiv adgangskoden til din enhed for at fortsætte"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Brug mønsteret til din arbejdsprofil for at fortsætte"</string>
-    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Indtast pinkoden til din arbejdsprofil for at fortsætte"</string>
-    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Indtast adgangskoden til din arbejdsprofil for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"Angiv pinkoden til din arbejdsprofil for at fortsætte"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"Angiv adgangskoden til din arbejdsprofil for at fortsætte"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"Brug mønsteret til din enhed for at opnå øget sikkerhed"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"Angiv pinkoden til din enhed for at opnå øget sikkerhed"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"Angiv adgangskoden til din enhed for at opnå øget sikkerhed"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Meget stor forsinkelse (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Meget stor forsinkelse (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Vibration ved opkald og underretninger er slået fra"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Vibration ved opkald og underretninger er indstillet til Lav"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Vibration ved opkald og underretninger er indstillet til Middel"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Brug af skærmen siden fuld opladning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skærmens strømforbrug"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Appforbrug siden fuld opladning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Brug af enheden siden fuld opladning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2117,7 +2123,7 @@
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skærm tændt"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS slået til"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"Kameraet er slået til"</string>
-    <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"Lommelygten er slået til"</string>
+    <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"Lommelygten er tændt"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilnetværkets signal"</string>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Aktiverer enheden i baggrunden"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Anmoder ofte om placering"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps fungerer ikke korrekt"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batteriforbruget er normalt"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apps kører normalt"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Apps kører normalt"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonen har et normalt batteriforbrug i baggrunden"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Din tablet har et normalt batteriforbrug i baggrunden"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Enheden har et normalt batteriforbrug i baggrunden"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Lav batterikapacitet"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batteriet kan ikke levere en god batteritid"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Forlæng telefonens batteritid"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Din tablet er blevet brugt mere end normalt"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Enheden er blevet brugt mere end normalt"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Enheden løber muligvis snart tør for batteri"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Din telefon er blevet brugt mere end normalt. Telefonen løber muligvis tør for batteri hurtigere end forventet.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> apps, der har brugt mest batteri siden sidste fulde opladning (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Din tablet er blevet brugt mere end normalt. Din tablet løber muligvis tør for batteri hurtigere end forventet.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> apps, der har brugt mest batteri siden sidste fulde opladning (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Din enhed er blevet brugt mere end normalt. Enheden løber muligvis tør for batteri hurtigere end forventet.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> apps, der har brugt mest batteri siden sidste fulde opladning (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Begræns %1$d app</item>
       <item quantity="other">Begræns %1$d apps</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Denne app vil kunne bruge batteriet i baggrunden. Enheden løber muligvis tør for batteri hurtigere end forventet."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Fjern"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Annuller"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Dit batteri holder normalt ca. <xliff:g id="TIME_DURATION">%1$s</xliff:g>, når det er fuldt opladet, baseret på dit batteriforbrug.\n\nHvis du vil forlænge din batteritid, skal du aktivere Batterisparefunktion."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Hvis du vil forlænge din batteritid, skal du aktivere Batterisparefunktion"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Dine apps har et normalt batteriforbrug. Hvis apps bruger for meget batteri, foreslår din telefon, hvad du kan gøre.\n\nDu kan altid aktivere batterisparefunktionen, hvis telefonen er ved at løbe tør for batteri."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Dine apps har et normalt batteriforbrug. Hvis apps bruger for meget batteri, foreslår din tablet, hvad du kan gøre.\n\nDu kan altid aktivere batterisparefunktionen, hvis din tablet er ved at løbe tør for batteri."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Dine apps har et normalt batteriforbrug. Hvis apps bruger for meget batteri, foreslår din enhed, hvad du kan gøre.\n\nDu kan altid aktivere batterisparefunktionen, hvis enheden er ved at løbe tør for batteri."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Batteriadministration"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Administrer automatisk apps"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Begræns batteriforbrug for apps, du ikke bruger så ofte"</string>
@@ -2483,7 +2495,7 @@
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Tryk på et netværk for at oprette forbindelse til det"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Opret forbindelse til eksisterende netværk"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Tilslut til usikret netværk"</string>
-    <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Indtast netværkskonfiguration"</string>
+    <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Angiv netværkskonfiguration"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Opret forbindelse til nyt netværk"</string>
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Opretter forbindelse..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Gå til næste trin"</string>
@@ -2898,7 +2910,7 @@
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM-kort: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"Intet SIM-kort"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"Navn på SIM-kort"</string>
-    <string name="sim_name_hint" msgid="7038643345238968930">"Indtast SIM-kortnavn"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"Angiv SIM-kortnavn"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"SIM-kortrille %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Mobilselskab"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Nummer"</string>
@@ -3075,15 +3087,14 @@
     <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">"Bloker visuelle forstyrrelser"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillad visuelle signaler"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Begræns underretninger"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Når Forstyr ikke er aktiveret"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Underretninger"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Når Forstyr ikke er aktiveret"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Slå lyden fra for underretninger"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Vis underretninger, men slå lyd og vibration fra"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Telefonen vil ikke give lyd eller vibrere, når du får nye underretninger"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Skjul og slå lyden fra for underretninger"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Underretninger vises slet ikke"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Du får ikke vist nye eller eksisterende underretninger, når Forstyr ikke er aktiveret. Underretninger, der er nødvendige for grundlæggende telefonaktivitet og -status, vises dog stadig."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Vis underretninger lydløst"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Lyden slås fra for underretninger"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Din telefon vil ikke afspille lyd eller vibrere, når du får underretninger."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skjul underretninger"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Du får ikke vist nogen nye eller eksisterende underretninger"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Din telefon vil ikke vise nye eller eksisterende underretninger på din telefon, og den vil ikke afspille lyd eller vibrere. Der bliver ikke vist underretninger, når du stryger nedad fra toppen af skærmen.\n\nHusk! Der vises stadig kritiske underretninger for telefonaktivitet og -status."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tilpassede indstillinger"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivér tilpasset indstilling"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fjern tilpasset indstilling"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> regel kan aktiveres automatisk</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regler kan aktiveres automatisk</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Adfærd"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Undtagelser"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Planlæg"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Lyd og vibration"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Når Forstyr ikke er aktiveret, er der kun lyd eller vibration ved de elementer, du tillader ovenfor."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Slå lyden fra for alle med undtagelse af"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Lyden er slået fra"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Lyden er ikke slået fra"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Lyden er slået fra, men tillad <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Lyden er slået fra, men tillad <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> og <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Lyden er slået fra, men tillad <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Beskeder, begivenheder og påmindelser"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Når Forstyr ikke er aktiveret, slås lyden fra for beskeder, påmindelser og begivenheder med undtagelse af de elementer, du tillader ovenfor. Du kan ændre beskedindstillingerne, så dine venner, din familie eller andre kontaktpersoner kan få fat i dig."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Opdater"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Opdater ikke"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Din telefon kan gøre det nemmere at fokusere.\n\nOpdater indstillingerne for at:\n\n- Skjule underretninger helt\n\n- Tillade opkald fra stjernemarkerede kontaktpersoner og gentagne opkald"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Vil du opdatere Forstyr ikke?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Indstillinger"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Du kan tilpasse dette yderligere under Indstillinger."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloker, når skærmen er tændt"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloker, når skærmen er slukket"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Forstyr ikke kan gøre mere end at blokere uønsket lyd – den kan også blokere visuelle signaler. Det kan være nyttigt, hvis du prøver at sove, koncentrere dig eller begrænse, hvor meget tid du bruger på telefonen."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloker lyd og visuelle signaler"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Tænd ikke skærmen, og væk ikke ved underretninger"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Vis slet ingen underretninger, undtagen om grundlæggende telefonaktivitet og status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Lyde for arbejdsprofil"</string>
@@ -3274,7 +3299,7 @@
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Slet"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Omdøb"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnavn"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Indtast regelnavn"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Angiv regelnavn"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Regelnavnet er allerede i brug"</string>
     <string name="zen_mode_add_rule" msgid="9100929184624317193">"Tilføj regel"</string>
     <string name="zen_mode_add_event_rule" msgid="3997335103633946552">"Tilføj regel for begivenheder"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>-<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Opkald"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Når Forstyr ikke er aktiveret, blokeres indgående opkald. Du kan ændre indstillingerne, så dine venner, dine familie eller andre kontaktpersoner kan få fat i dig."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Beskeder"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Alle meddelelser"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Valgte beskeder"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Beskeder"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Nogle beskeder"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Fra hvem som helst"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kun fra kontaktpersoner"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kun fra stjernemarkerede kontaktpersoner"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Fra stjernemarkerede kontaktpersoner og ved gentagne opkald"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Fra kontaktpersoner og ved gentagne opkald"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Kun ved gentagne opkald"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Medier"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Lyd ved berøring"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påmindelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Begivenheder"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle opkaldere"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Udvalgte opkald"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"alle"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktpersoner"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"stjernemarkerede kontaktpersoner"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gentagne opkald"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Kun fra <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Fra <xliff:g id="CALLER_TYPE">%1$s</xliff:g> og <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Hvis den samme person ringer for anden gang inden for <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Tilpasset"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivér automatisk"</string>
@@ -3355,7 +3390,7 @@
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Underretningsindstillinger"</string>
     <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Indtast administratorpinkoden"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Angiv administratorpinkoden"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Fra"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Skærmfastholdelse"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle Forstyr ikke-regler, der er oprettet af denne app, fjernes."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Undlad at optimere"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimer"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Kan medføre, at batteriet aflades hurtigere."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Anbefales for længere batteritid"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Vil du tillade, at <xliff:g id="APP">%s</xliff:g> ignorerer batterioptimeringer?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ingen"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup er slået fra"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Opdateret til Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Der er en tilgængelig opdatering"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Indstillingen kan ikke ændres"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Handlingen er ikke tilladt"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Lydstyrken kan ikke ændres"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Opkald er ikke tilladt"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Sms er ikke tilladt"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Bestem selv, hvilke oplysninger der vises på din låseskærm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul indhold i underretninger"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Support og tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Support og tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mindste bredde"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerede apps har anmodet om adgang til overtakseret sms"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Overtakseret sms kan koste dig penge, som opkræves via din mobilregning. Hvis du aktiverer tilladelsen for en app, kan du sende overtakserede sms-beskeder ved hjælp af denne app."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- og tv-apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Oplysninger om mobilselskab"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivér mobilselskab"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvad er nyt og spændende?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en rundvisning på din nye telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en rundvisning på din nye tablet"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 43cfa56..75d4f55 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -166,6 +166,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anfrage wegen Zugriff auf SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> möchte auf deine SIM-Karte zugreifen. Wenn du den Zugriff auf die SIM-Karte gewährst, wird die Datenverbindung auf deinem Gerät für die Dauer der Verbindung deaktiviert. Möchtest du <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> den Zugriff erlauben?"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Für andere Geräte als \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" sichtbar"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Meine Geräte"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Neues Gerät koppeln"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Kommunikation zwischen deinem Tablet und Bluetooth-Geräten in der Nähe zulassen"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMs können nicht zurückgesetzt werden"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Aufgrund eines Fehler können die eSIMs nicht zurückgesetzt werden."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Alle Daten löschen (Werkseinstellungen)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Tablets gelöscht, u. a.\n\n"<li>"dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"heruntergeladene Apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Telefons gelöscht, u. a.\n\n"<li>"dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"heruntergeladene Apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Sehr lange Verzögerung (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Sehr lange Verzögerung (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Vibration bei Klingeln und Benachrichtigungseingang auf \"Aus\" eingestellt"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Vibration bei Klingeln und Benachrichtigungseingang auf \"Gering\" eingestellt"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Vibration bei Klingeln und Benachrichtigungseingang auf \"Mittel\" eingestellt"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Displaynutzung seit letzter vollständiger Aufladung"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Displayverbrauch"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"App-Nutzung seit vollständiger Aufladung (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Geräteverbrauch seit vollständiger Aufladung (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Gerät wird im Hintergrund aktiviert"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Häufige Standortabfrage"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> fehlerhafte Apps"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bei deinem Akku ist alles okay"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apps funktionieren normal"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Geringe Akkuleistung"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akku bietet keine gute Akkulaufzeit"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Akkulaufzeit des Smartphones verbessern"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet mehr als üblich genutzt"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Gerät mehr als üblich genutzt"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Der Akku ist fast leer"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Dein Smartphone wurde mehr als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nDie <xliff:g id="NUMBER">%1$d</xliff:g> Apps mit dem höchsten Akkuverbrauch seit dem letzten vollständigen Ladevorgang (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Dein Tablet wurde mehr als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nDie <xliff:g id="NUMBER">%1$d</xliff:g> Apps mit dem höchsten Akkuverbrauch seit dem letzten vollständigen Ladevorgang (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Dein Gerät wurde mehr als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nDie <xliff:g id="NUMBER">%1$d</xliff:g> Apps mit dem höchsten Akkuverbrauch seit dem letzten vollständigen Ladevorgang (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d Apps einschränken</item>
       <item quantity="one">%1$d App einschränken</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Diese App läuft im Hintergrund und beansprucht dabei den Akku. Er könnte deshalb früher als erwartet leer sein."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Entfernen"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Abbrechen"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Bei deiner Nutzung reicht der Akku in der Regel <xliff:g id="TIME_DURATION">%1$s</xliff:g>, wenn er vollständig aufgeladen ist.\n\nUm die Akkulaufzeit zu verlängern, aktiviere den Energiesparmodus."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Um die Akkulaufzeit zu verlängern, aktiviere den Energiesparmodus"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Akku-Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Apps automatisch verwalten"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Akkunutzung für selten verwendete Apps einschränken"</string>
@@ -3075,38 +3094,21 @@
     <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">"Visuelle Störungen blockieren"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Visuelle Signale zulassen"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wenn \"Bitte nicht stören\" aktiviert ist"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Benachrichtigungen"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Benachrichtigungen ohne Ton anzeigen lassen"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Benachrichtigungen werden stummgeschaltet"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Wenn auf deinem Smartphone neue Benachrichtigungen eingehen, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Benachrichtigungen ausblenden"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Du siehst keine neuen oder vorhandenen Benachrichtigungen"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Auf deinem Smartphone werden keine neuen oder vorhandenen Benachrichtigungen angezeigt. Es ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren. Es erscheinen auch keine Benachrichtigungen, wenn du vom oberen Bildschirmrand nach unten wischst.\n\nBenachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden weiterhin angezeigt."</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Benutzerdefiniert"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Benutzerdefinierte Einstellung aktivieren"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Benutzerdefinierte Einstellung entfernen"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Werden angezeigt"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Teilweise ausgeblendet"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ausgeblendet"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Benutzerdefinierte Einschränkungen"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Bei aktiviertem Display"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Bei deaktiviertem Display"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"Töne und Vibration ausschalten"</string>
@@ -3151,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> Regeln können die Option automatisch aktivieren</item>
       <item quantity="one">1 Regel kann die Option automatisch aktivieren</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Verhalten"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Ausnahmen"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Zeitplan"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Ton &amp; Vibration"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Wenn \"Bitte nicht stören\" aktiviert ist, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren, außer für die Elemente, die du oben ausdrücklich zulässt."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Alle stummschalten außer"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Stummgeschaltet"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Nicht stummgeschaltet"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Stummgeschaltet, aber <xliff:g id="SOUND_TYPE">%1$s</xliff:g> zulassen"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Stummgeschaltet, aber <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> und <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> zulassen"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Stummgeschaltet, aber <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> und <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> erlauben"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Nachrichten, Termine &amp; Erinnerungen"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet, die du oben nicht ausdrücklich zulässt. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Aktualisieren"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Nicht aktualisieren"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Dein Smartphone kann noch mehr tun, damit du dich besser konzentrieren kannst.\n\nStelle einfach Folgendes ein:\n\n– Benachrichtigungen ausblenden\n\n– Anrufe von markierten Kontakten und wiederholten Anrufern zulassen"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\"Bitte nicht stören\" aktualisieren?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Einstellungen"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Du kannst dies unter \"Einstellungen\" weiter anpassen."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bei aktiviertem Bildschirm blockieren"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bei deaktiviertem Bildschirm blockieren"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Der Modus \"Bitte nicht stören\" kann neben unerwünschten Tönen auch visuelle Signale blockieren. Dies kann nützlich sein, wenn du schlafen möchtest, dich konzentrieren musst oder versuchst, weniger Zeit mit dem Smartphone zu verbringen."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Töne und visuelle Signale blockieren"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Bildschirm nicht einschalten und \"Bitte nicht stören\"-Modus beim Erhalt von Benachrichtigungen nicht beenden"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Keine Benachrichtigungen anzeigen, mit Ausnahme von grundlegender Smartphoneaktivitäten und Status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Töne für Arbeitsprofil"</string>
@@ -3193,7 +3209,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Wie sollen Profilbenachrichtigungen angezeigt werden, wenn dein Gerät gesperrt ist?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilbenachrichtigungen"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Benachrichtigungen"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigung"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Benachrichtigungskategorie"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Kategoriegruppe für Benachrichtigungen"</string>
     <string name="notification_importance_title" msgid="4368578960344731828">"Verhalten"</string>
@@ -3328,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> bis <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Anrufe"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Wenn \"Bitte nicht stören\" aktiviert ist, werden eingehende Anrufe blockiert. Die Einstellungen lassen sich anpassen, sodass Freunde, Familie oder andere Kontakte dich erreichen können."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Nachrichten"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Alle Nachrichten"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Ausgewählte Nachrichten"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Nachrichten"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Einige Nachrichten"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Von allen"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Nur von Kontakten"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Nur von markierten Kontakten"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Von markierten Kontakten und wiederholten Anrufern"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Von Kontakten und wiederholten Anrufern"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Nur von wiederholten Anrufern"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Keine"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wecker"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Medien"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Töne bei Berührung"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Erinnerungen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Termine"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle Anrufer"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ausgewählte Anrufer"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"Alle"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"Kontakten"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"markierten Kontakten"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wiederholte Anrufer"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Nur von <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Von <xliff:g id="CALLER_TYPE">%1$s</xliff:g> und <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Wenn dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten noch einmal anruft"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Benutzerdefiniert"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. aktivieren"</string>
@@ -3612,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle von dieser App erstellten \"Nicht stören\"-Regeln werden entfernt."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Nicht optimieren"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimieren"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Dein Akku entleert sich hierdurch möglicherweise schneller."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Zur Verlängerung der Akkulaufzeit empfohlen"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> das Ignorieren von Akku-Leistungsoptimierungen gestatten?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Keine"</string>
@@ -3688,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"\"Sichern\" deaktiviert"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aktualisiert auf Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update verfügbar"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Einstellung nicht änderbar"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Aktion nicht zulässig"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Lautstärke nicht änderbar"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Anrufe nicht zulässig"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS nicht zulässig"</string>
@@ -3878,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Infos auf Sperrbildschirm festlegen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Benachrichtigungsinhalt ein- oder ausblenden"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; Tipps"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tipps &amp; Support"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Geringste Breite"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Keine installierte App hat Zugriff auf Premium-SMS angefordert."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Bei Premium-SMS können Kosten entstehen, die über den Mobilfunkanbieter abgerechnet werden. Wenn du für eine App Premium-SMS zulässt, kannst du aus ihr Premium-SMS versenden."</string>
@@ -4071,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- &amp; TV-Apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informationen zur Nutzerverwaltung durch den Anbieter"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Nutzerverwaltung durch den Anbieter auslösen"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Was gibt\'s Neues?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Lass dir zeigen, was dein neues Smartphone alles kann"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Lass dir zeigen, was dein neues Tablet alles kann"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0632133..ce3df55 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Αίτημα πρόσβασης SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Η συσκευή <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> επιθυμεί πρόσβαση στην κάρτα SIM. Η χορήγηση πρόσβασης στην κάρτα SIM θα απενεργοποιήσει τη σύνδεση δεδομένων στη συσκευή σας κατά τη διάρκεια της σύνδεσης. Παραχώρηση πρόσβασης στη συσκευή <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Ορατή ως \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" σε άλλες συσκευές"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Οι συσκευές σας"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Σύζευξη νέας συσκευής"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Θα επιτρέπεται στο tablet σας να επικοινωνεί με συσκευές Bluetooth σε κοντινή απόσταση"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Αδυναμία επαναφοράς eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Δεν είναι δυνατή η επαναφορά των eSIM λόγω κάποιου σφάλματος."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Διαγραφή δεδ. (επαναφορά)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Πολύ μεγάλη καθυστέρηση (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> χιλιοστά δευτερολέπτου)</item>
       <item quantity="one">Πολύ μεγάλη καθυστέρηση (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> χιλιοστό δευτερολέπτου)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Η δόνηση κλήσεων και ειδοποιήσεων έχει οριστεί ως ανενεργή"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Το επίπεδο της δόνησης κλήσεων και ειδοποιήσεων έχει οριστεί ως χαμηλό"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Το επίπεδο της δόνησης κλήσεων και ειδοποιήσεων έχει οριστεί ως μεσαίο"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Χρήση οθόνης από την πλήρη φόρτιση"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Κατανάλωση οθόνης"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Σάρωση δικτύου κινητής τηλεφωνίας"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Χρήση της εφαρμογής από την πλήρη φόρτιση (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Χρήση της συσκευής από την πλήρη φόρτιση (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ενεργοποίηση συσκευής στο παρασκήνιο"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Συχνό αίτημα τοποθεσίας"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> εφαρμογές που δεν λειτουργούν σωστά"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Η μπαταρία δεν είναι σε καλή κατάσταση"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Οι εφαρμογές εκτελούνται κανονικά"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Μικρή χωρητικότητα μπαταρίας"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Η μπαταρία δεν μπορεί να προσφέρει καλή διάρκεια ζωής"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Βελτιώστε τη διάρκεια ζωής της μπαταρίας του τηλεφώνου σας"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Το tablet χρησιμοποιείται περισσότερο από το συνηθισμένο"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Η συσκευή χρησιμοποιείται περισσότερο από το συνηθισμένο"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Η μπαταρία μπορεί να εξαντληθεί σύντομα"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Το τηλέφωνό σας χρησιμοποιήθηκε περισσότερο από το συνηθισμένο. Η μπαταρία ενδέχεται να εξαντληθεί πιο σύντομα από το αναμενόμενο.\n\nΟι κορυφαίες <xliff:g id="NUMBER">%1$d</xliff:g> εφαρμογές από την προηγούμενη πλήρη φόρτιση(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Το tablet χρησιμοποιήθηκε περισσότερο από το συνηθισμένο. Η μπαταρία ενδέχεται να εξαντληθεί πιο σύντομα από το αναμενόμενο.\n\nΟι κορυφαίες <xliff:g id="NUMBER">%1$d</xliff:g> εφαρμογές από την προηγούμενη πλήρη φόρτιση(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Η συσκευή σας χρησιμοποιήθηκε περισσότερο από το συνηθισμένο. Η μπαταρία ενδέχεται να εξαντληθεί πιο σύντομα από το αναμενόμενο.\n\nΟι κορυφαίες <xliff:g id="NUMBER">%1$d</xliff:g> εφαρμογές από την προηγούμενη πλήρη φόρτιση(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Περιορισμός %1$d εφαρμογών</item>
       <item quantity="one">Περιορισμός %1$d εφαρμογής</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Αυτή η εφαρμογή θα μπορεί να χρησιμοποιήσει μπαταρία στο παρασκήνιο. Η μπαταρία σας μπορεί να εξαντληθεί πιο σύντομα από το αναμενόμενο."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Κατάργηση"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Ακύρωση"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Βάσει της χρήσης σας, η μπαταρία σας συνήθως διαρκεί περίπου <xliff:g id="TIME_DURATION">%1$s</xliff:g> όταν είναι πλήρως φορτισμένη.\n\nΕάν θέλετε να επεκτείνετε τη διάρκεια ζωής της μπαταρίας σας, ενεργοποιήστε την Εξοικονόμηση μπαταρίας."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Εάν θέλετε να επεκτείνετε τη διάρκεια ζωής της μπαταρίας σας, ενεργοποιήστε την Εξοικονόμηση μπαταρίας"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Διαχείριση μπαταρίας"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Αυτόματη διαχείριση εφαρμογών"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Περιορισμός μπαταρίας για εφαρμογές τις οποίες δεν χρησιμοποιείτε συχνά"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Να επιτρέπονται οπτικά σήματα"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Περιορισμός ειδοποιήσεων"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Ειδοποιήσεις"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\""</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Σίγαση ειδοποιήσεων"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Εμφάνιση ειδοποιήσεων, αλλά σίγαση ήχων και δονήσεων"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Όταν φτάνουν νέες ειδοποιήσεις στο τηλέφωνό σας, θα ειδοποιείστε με κάποιον ήχο ή δόνηση"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Απόκρυψη και σίγαση ειδοποιήσεων"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Οι ειδοποιήσεις δεν θα εμφανίζονται καθόλου"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Δεν θα βλέπετε νέες ή υπάρχουσες ειδοποιήσεις όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\". Ωστόσο, θα εξακολουθήσουν να εμφανίζονται οι ειδοποιήσεις που απαιτούνται για τη βασική δραστηριότητα και την κατάσταση του τηλεφώνου."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Εμφάνιση ειδοποιήσεων χωρίς ήχο"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Οι ειδοποιήσεις θα τεθούν σε σίγαση"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Όταν φτάνουν ειδοποιήσεις στο τηλέφωνό σας, θα ειδοποιείστε με κάποιον ήχο ή δόνηση."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Απόκρυψη ειδοποιήσεων"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Δεν θα βλέπετε νέες ή υπάρχουσες ειδοποιήσεις"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Το τηλέφωνό σας δεν θα εμφανίζει νέες ή υπάρχουσες ειδοποιήσεις και δεν θα χρησιμοποιεί ήχους ή δόνηση. Οι ειδοποιήσεις δεν θα εμφανίζονται όταν κάνετε ολίσθηση προς τα κάτω από την κορυφή της οθόνης σας.\n\nΛάβετε υπόψη ότι θα εξακολουθήσουν να εμφανίζονται σημαντικές ειδοποιήσεις για τη δραστηριότητα και την κατάσταση του τηλεφώνου."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Προσαρμοσμένες"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ενεργοποίηση προσαρμοσμένης ρύθμισης"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Κατάργηση προσαρμοσμένης ρύθμισης"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> κανόνες μπορούν να ενεργοποιηθούν αυτόματα</item>
       <item quantity="one">1 κανόνας μπορεί να ενεργοποιηθεί αυτόματα</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ΟΚ"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Συμπεριφορά"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Εξαιρέσεις"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Χρονοδιάγραμμα"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Ήχος και δόνηση"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", ο ήχος και η δόνηση θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Σίγαση όλων εκτός"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Σε σίγαση"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Δεν έχουν τεθεί σε σίγαση"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Σε σίγαση, αλλά να επιτρέπεται <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Σε σίγαση, αλλά να επιτρέπονται <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> και <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Σε σίγαση, αλλά να επιτρέπονται <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> και <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Μηνύματα, συμβάντα και υπενθυμίσεις"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", τα μηνύματα, οι υπενθυμίσεις και τα συμβάντα θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω. Μπορείτε να προσαρμόσετε τις ρυθμίσεις μηνυμάτων για να επιτρέπετε στους φίλους και την οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Ενημέρωση"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Να μην γίνει ενημέρωση"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Το τηλέφωνό σας μπορεί να κάνει περισσότερα για να σας βοηθήσει να εστιάζετε σε αυτά που σας ενδιαφέρουν.\n\nΕνημερώστε τις ρυθμίσεις για να κάνετε τα εξής:\n\n- Να αποκρύψετε πλήρως τις ειδοποιήσεις\n\n- Να επιτρέψετε τις κλήσεις από επαφές με αστέρι και καλούντες κατ\' επανάληψη"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Να ενημερωθεί η λειτουργία \"Μην ενοχλείτε\";"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ρυθμίσεις"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Μπορείτε να την προσαρμόσετε περαιτέρω στις Ρυθμίσεις."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Αποκλεισμός όταν η οθόνη είναι ενεργή"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Αποκλεισμός όταν η οθόνη είναι απενεργοποιημένη"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Η λειτουργία \"Μην ενοχλείτε\" μπορεί να εκτελέσει περισσότερες ενέργειες πέρα από τον αποκλεισμό ανεπιθύμητων ήχων. Μπορεί να αποκλείσει επίσης οπτικά στοιχεία. Αυτό μπορεί να είναι χρήσιμο εάν προσπαθείτε να κοιμηθείτε, να εστιάσετε κάπου ή να περιορίσετε τον χρόνο χρήσης του τηλεφώνου σας."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Αποκλεισμός ήχων και οπτικών στοιχείων"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Να μην ενεργοποιείται η οθόνη και να μην γίνεται αφύπνιση για ειδοποιήσεις"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Να μην εμφανίζονται καθόλου ειδοποιήσεις, εκτός από τη βασική δραστηριότητα τηλεφώνου και την κατάσταση του τηλεφώνου"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ήχοι προφίλ εργασίας"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> έως <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Κλήσεις"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", οι εισερχόμενες κλήσεις αποκλείονται. Μπορείτε να προσαρμόσετε τις ρυθμίσεις για να επιτρέπετε στους φίλους και την οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Μηνύματα"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Όλα τα μηνύματα"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Επιλεγμένα μηνύματα"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Μηνύματα"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Ορισμένα μηνύματα"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Από κανέναν"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Από τις επαφές μόνο"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Μόνο από τις επαφές με αστέρι"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Από επαφές με αστέρι και καλούντες κατ\' επανάληψη"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Από επαφές και καλούντες κατ\' επανάληψη"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Μόνο από καλούντες κατ\' επανάληψη"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Κανένα"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ξυπνητήρια"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Μέσα"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Ήχοι αφής"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Υπενθυμίσεις"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Συμβάντα"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Όλοι οι καλούντες"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Επιλεγμένοι καλούντες"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"όλοι οι καλούντες"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"επαφές"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"επαφές με αστέρι"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Καλούντες κατ\' επανάληψη"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Μόνο από <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Από <xliff:g id="CALLER_TYPE">%1$s</xliff:g> και <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Εάν το ίδιο άτομο καλέσει δεύτερη φορά εντός διαστήματος <xliff:g id="MINUTES">%d</xliff:g> λεπτών"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Προσαρμοσμένοι"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Αυτόματη ενεργοπ."</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Όλοι οι κανόνες της λειτουργίας \"Μην ενοχλείτε\" που δημιουργήθηκαν από αυτήν την εφαρμογή θα καταργηθούν."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Να μη γίνει βελτιστοποίηση"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Βελτιστοποίηση"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Η μπαταρία σας ενδέχεται να εξαντλείται πιο γρήγορα."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Συνιστάται για μεγαλύτερη διάρκεια μπαταρίας"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Να επιτρέπεται στην εφαρμογή <xliff:g id="APP">%s</xliff:g> να αγνοεί τις βελτιστοποιήσεις μπαταρίας;"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Κανένα"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Η δημιουργία αντιγράφων ασφαλείας έχει απενεργοποιηθεί"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ενημερώθηκε σε Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Διαθέσιμη ενημέρωση"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Αδύνατη η αλλαγή της ρύθμισης"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Δεν επιτρέπεται η ενέργεια"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Δεν είναι δυνατή η αλλαγή της έντασης του ήχου"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Δεν επιτρέπεται η πραγματοποίηση κλήσεων"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Δεν επιτρέπεται η αποστολή SMS"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Έλεγχος πληροφοριών στην οθόνη κλειδώματος"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Εμφάνιση ή απόκρυψη περιεχομένου ειδοποιήσεων"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Όλες"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Υποστήριξη και συμβουλές"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Συμβουλές και υποστήριξη"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Μικρότερο πλάτος"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Δεν ζητήθηκε πρόσβαση σε SMS ειδικής χρέωσης από εγκατεστημένες εφαρμογές"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Τα SMS ειδικής χρέωσης ενδέχεται να κοστίσουν και θα αυξήσουν το συνολικό ποσό των λογαριασμών σας κινητού τηλεφώνου. Εάν ενεργοποιήσετε την πρόσβαση για μια εφαρμογή, θα μπορείτε να στέλνετε SMS ειδικής χρέωσης χρησιμοποιώντας τη συγκεκριμένη εφαρμογή."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Εφαρμογές ταινιών/TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Πληροφορίες παροχής εταιρείας κινητής τηλεφωνίας"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Τι νέο και συναρπαστικό υπάρχει;"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Περιηγηθείτε στο νέο τηλέφωνό σας"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Περιηγηθείτε στο νέο σας tablet"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 8602db0..e3702c8 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -167,6 +167,7 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
+    <string name="bluetooth_off_footer" msgid="8406865700572772936">"Turn on Bluetooth to connect to other devices."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
@@ -1453,6 +1454,7 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
+    <string name="master_clear_short_title" msgid="8652450915870274285">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
@@ -1998,6 +2000,7 @@
       <item quantity="other">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Ring <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, touch <xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Ring &amp; notification set to off"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Ring &amp; notification set to low"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Ring &amp; notification set to medium"</string>
@@ -2105,8 +2108,7 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</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>
@@ -2137,8 +2139,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Battery is in good shape"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apps are running normally"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Device has typical background battery usage"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Improve your phone\'s battery life"</string>
@@ -2153,9 +2157,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Battery may run out soon"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="2806861679225286129">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restrict %1$d apps</item>
       <item quantity="one">Restrict %1$d app</item>
@@ -2184,8 +2188,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"This app will be able to use battery in the background. Your battery may run out sooner than expected."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remove"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancel"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Based on your usage, your battery usually lasts about <xliff:g id="TIME_DURATION">%1$s</xliff:g> when fully charged.\n\nIf you need to extend your battery life, turn on Battery Saver."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"If you need to extend your battery life, turn on Battery Saver."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Manage apps automatically"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limit battery for apps that you don’t use often"</string>
@@ -3075,15 +3080,14 @@
     <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">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restrict notifications"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"When do not disturb is turned on"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Show notifications, but mute sounds &amp; vibrations"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"When new notifications arrive, your phone won’t make a sound or vibration"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Hide &amp; mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Notifications will not appear at all"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"You won’t see new or existing notifications when do not disturb is on. However, notifications needed for basic phone activity and status will still appear."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
@@ -3135,13 +3139,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rules can turn on automatically</item>
       <item quantity="one">1 rule can turn on automatically</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Behaviour"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceptions"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Schedule"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Sound &amp; vibration"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Mute all except"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Muted"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Not muted"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Muted, but allow <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> and <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Update"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Don\'t update"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Your phone can do more to help you focus.\n\nUpdate settings to:\n\n– Hide notifications completely\n\n– Allow calls from starred contacts and repeat callers"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Update Do Not Disturb?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"You can customise this further in Settings."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Block when the screen is on"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Block when the screen is off"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Do Not Disturb can do more than block unwanted sounds – it can block visuals too. This may be helpful if you\'re trying to sleep, focus or limit time spent on your phone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Block sounds and visuals"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Don\'t turn on the screen or wake for notifications"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Don\'t show notifications at all, except for basic phone activity and status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
@@ -3312,21 +3330,33 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> to <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Calls"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
+    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
+      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
+      <item quantity="one">and 1 other</item>
+    </plurals>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"All messages"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Selected messages"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Some messages"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"From anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"From contacts only"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"From starred contacts and repeat callers"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"From contacts and repeat callers"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"From repeat callers only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Touch sounds"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"anyone"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contacts"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"starred contacts"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> only"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> and <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g>-minute period"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Custom"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
@@ -3596,7 +3626,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"All Do Not Disturb rules created by this app will be removed."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Don’t optimise"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimise"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"May drain your battery more quickly"</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"May drain your battery more quickly. App will no longer be restricted from using background battery."</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recommended for better battery life"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Allow <xliff:g id="APP">%s</xliff:g> to ignore battery optimisations?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"None"</string>
@@ -3672,7 +3702,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Can’t change this setting"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Action not allowed"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Can’t change volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Calling not allowed"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
@@ -3862,7 +3892,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tips &amp; support"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
@@ -4055,6 +4085,8 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Movie &amp; TV apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
+    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index ca49075..ce32d8f 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -167,6 +167,7 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
+    <string name="bluetooth_off_footer" msgid="8406865700572772936">"Turn on Bluetooth to connect to other devices."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
@@ -1453,6 +1454,7 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
+    <string name="master_clear_short_title" msgid="8652450915870274285">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
@@ -1998,6 +2000,7 @@
       <item quantity="other">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Ring <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, touch <xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Ring &amp; notification set to off"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Ring &amp; notification set to low"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Ring &amp; notification set to medium"</string>
@@ -2105,8 +2108,7 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</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>
@@ -2137,8 +2139,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Battery is in good shape"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apps are running normally"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Device has typical background battery usage"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Improve your phone\'s battery life"</string>
@@ -2153,9 +2157,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Battery may run out soon"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="2806861679225286129">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restrict %1$d apps</item>
       <item quantity="one">Restrict %1$d app</item>
@@ -2184,8 +2188,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"This app will be able to use battery in the background. Your battery may run out sooner than expected."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remove"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancel"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Based on your usage, your battery usually lasts about <xliff:g id="TIME_DURATION">%1$s</xliff:g> when fully charged.\n\nIf you need to extend your battery life, turn on Battery Saver."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"If you need to extend your battery life, turn on Battery Saver."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Manage apps automatically"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limit battery for apps that you don’t use often"</string>
@@ -3075,15 +3080,14 @@
     <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">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restrict notifications"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"When do not disturb is turned on"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Show notifications, but mute sounds &amp; vibrations"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"When new notifications arrive, your phone won’t make a sound or vibration"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Hide &amp; mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Notifications will not appear at all"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"You won’t see new or existing notifications when do not disturb is on. However, notifications needed for basic phone activity and status will still appear."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
@@ -3135,13 +3139,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rules can turn on automatically</item>
       <item quantity="one">1 rule can turn on automatically</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Behaviour"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceptions"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Schedule"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Sound &amp; vibration"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Mute all except"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Muted"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Not muted"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Muted, but allow <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> and <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Update"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Don\'t update"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Your phone can do more to help you focus.\n\nUpdate settings to:\n\n– Hide notifications completely\n\n– Allow calls from starred contacts and repeat callers"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Update Do Not Disturb?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"You can customise this further in Settings."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Block when the screen is on"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Block when the screen is off"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Do Not Disturb can do more than block unwanted sounds – it can block visuals too. This may be helpful if you\'re trying to sleep, focus or limit time spent on your phone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Block sounds and visuals"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Don\'t turn on the screen or wake for notifications"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Don\'t show notifications at all, except for basic phone activity and status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
@@ -3312,21 +3330,33 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> to <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Calls"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
+    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
+      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
+      <item quantity="one">and 1 other</item>
+    </plurals>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"All messages"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Selected messages"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Some messages"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"From anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"From contacts only"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"From starred contacts and repeat callers"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"From contacts and repeat callers"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"From repeat callers only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Touch sounds"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"anyone"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contacts"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"starred contacts"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> only"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> and <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g>-minute period"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Custom"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
@@ -3596,7 +3626,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"All Do Not Disturb rules created by this app will be removed."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Don’t optimise"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimise"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"May drain your battery more quickly"</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"May drain your battery more quickly. App will no longer be restricted from using background battery."</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recommended for better battery life"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Allow <xliff:g id="APP">%s</xliff:g> to ignore battery optimisations?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"None"</string>
@@ -3672,7 +3702,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Can’t change this setting"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Action not allowed"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Can’t change volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Calling not allowed"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
@@ -3862,7 +3892,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tips &amp; support"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
@@ -4055,6 +4085,8 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Movie &amp; TV apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
+    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8602db0..e3702c8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -167,6 +167,7 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
+    <string name="bluetooth_off_footer" msgid="8406865700572772936">"Turn on Bluetooth to connect to other devices."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
@@ -1453,6 +1454,7 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
+    <string name="master_clear_short_title" msgid="8652450915870274285">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
@@ -1998,6 +2000,7 @@
       <item quantity="other">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Ring <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, touch <xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Ring &amp; notification set to off"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Ring &amp; notification set to low"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Ring &amp; notification set to medium"</string>
@@ -2105,8 +2108,7 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</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>
@@ -2137,8 +2139,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Battery is in good shape"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apps are running normally"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Device has typical background battery usage"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Improve your phone\'s battery life"</string>
@@ -2153,9 +2157,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Battery may run out soon"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="2806861679225286129">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restrict %1$d apps</item>
       <item quantity="one">Restrict %1$d app</item>
@@ -2184,8 +2188,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"This app will be able to use battery in the background. Your battery may run out sooner than expected."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remove"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancel"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Based on your usage, your battery usually lasts about <xliff:g id="TIME_DURATION">%1$s</xliff:g> when fully charged.\n\nIf you need to extend your battery life, turn on Battery Saver."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"If you need to extend your battery life, turn on Battery Saver."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Manage apps automatically"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limit battery for apps that you don’t use often"</string>
@@ -3075,15 +3080,14 @@
     <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">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restrict notifications"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"When do not disturb is turned on"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Show notifications, but mute sounds &amp; vibrations"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"When new notifications arrive, your phone won’t make a sound or vibration"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Hide &amp; mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Notifications will not appear at all"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"You won’t see new or existing notifications when do not disturb is on. However, notifications needed for basic phone activity and status will still appear."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
@@ -3135,13 +3139,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rules can turn on automatically</item>
       <item quantity="one">1 rule can turn on automatically</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Behaviour"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceptions"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Schedule"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Sound &amp; vibration"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Mute all except"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Muted"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Not muted"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Muted, but allow <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> and <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Update"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Don\'t update"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Your phone can do more to help you focus.\n\nUpdate settings to:\n\n– Hide notifications completely\n\n– Allow calls from starred contacts and repeat callers"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Update Do Not Disturb?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"You can customise this further in Settings."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Block when the screen is on"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Block when the screen is off"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Do Not Disturb can do more than block unwanted sounds – it can block visuals too. This may be helpful if you\'re trying to sleep, focus or limit time spent on your phone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Block sounds and visuals"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Don\'t turn on the screen or wake for notifications"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Don\'t show notifications at all, except for basic phone activity and status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
@@ -3312,21 +3330,33 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> to <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Calls"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
+    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
+      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
+      <item quantity="one">and 1 other</item>
+    </plurals>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"All messages"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Selected messages"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Some messages"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"From anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"From contacts only"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"From starred contacts and repeat callers"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"From contacts and repeat callers"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"From repeat callers only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Touch sounds"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"anyone"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contacts"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"starred contacts"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> only"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> and <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g>-minute period"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Custom"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
@@ -3596,7 +3626,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"All Do Not Disturb rules created by this app will be removed."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Don’t optimise"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimise"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"May drain your battery more quickly"</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"May drain your battery more quickly. App will no longer be restricted from using background battery."</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recommended for better battery life"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Allow <xliff:g id="APP">%s</xliff:g> to ignore battery optimisations?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"None"</string>
@@ -3672,7 +3702,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Can’t change this setting"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Action not allowed"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Can’t change volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Calling not allowed"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
@@ -3862,7 +3892,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tips &amp; support"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
@@ -4055,6 +4085,8 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Movie &amp; TV apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
+    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8602db0..e3702c8 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -167,6 +167,7 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible as “<xliff:g id="DEVICE_NAME">^1</xliff:g>” to other devices"</string>
+    <string name="bluetooth_off_footer" msgid="8406865700572772936">"Turn on Bluetooth to connect to other devices."</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
@@ -1453,6 +1454,7 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Can\'t reset eSIMs"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"The eSIMs can’t be reset due to an error."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Erase all data (factory reset)"</string>
+    <string name="master_clear_short_title" msgid="8652450915870274285">"Erase all data (factory reset)"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
@@ -1998,6 +2000,7 @@
       <item quantity="other">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Ring <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, touch <xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Ring &amp; notification set to off"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Ring &amp; notification set to low"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Ring &amp; notification set to medium"</string>
@@ -2105,8 +2108,7 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"App usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Device usage since full charge (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</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>
@@ -2137,8 +2139,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Battery is in good shape"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apps are running normally"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Device has typical background battery usage"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Low battery capacity"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery can\'t provide good battery life"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Improve your phone\'s battery life"</string>
@@ -2153,9 +2157,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Battery may run out soon"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps since last full charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="2806861679225286129">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="NUMBER">%1$d</xliff:g> apps that you used since full charge:"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restrict %1$d apps</item>
       <item quantity="one">Restrict %1$d app</item>
@@ -2184,8 +2188,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"This app will be able to use battery in the background. Your battery may run out sooner than expected."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remove"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancel"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Based on your usage, your battery usually lasts about <xliff:g id="TIME_DURATION">%1$s</xliff:g> when fully charged.\n\nIf you need to extend your battery life, turn on Battery Saver."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"If you need to extend your battery life, turn on Battery Saver."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Manage apps automatically"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limit battery for apps that you don’t use often"</string>
@@ -3075,15 +3080,14 @@
     <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">"Block visual disturbances"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restrict notifications"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"When do not disturb is turned on"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Show notifications, but mute sounds &amp; vibrations"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"When new notifications arrive, your phone won’t make a sound or vibration"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Hide &amp; mute notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Notifications will not appear at all"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"You won’t see new or existing notifications when do not disturb is on. However, notifications needed for basic phone activity and status will still appear."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
@@ -3135,13 +3139,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rules can turn on automatically</item>
       <item quantity="one">1 rule can turn on automatically</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Behaviour"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceptions"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Schedule"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Sound &amp; vibration"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Mute all except"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Muted"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Not muted"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Muted, but allow <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> and <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Update"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Don\'t update"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Your phone can do more to help you focus.\n\nUpdate settings to:\n\n– Hide notifications completely\n\n– Allow calls from starred contacts and repeat callers"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Update Do Not Disturb?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"You can customise this further in Settings."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Block when the screen is on"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Block when the screen is off"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Do Not Disturb can do more than block unwanted sounds – it can block visuals too. This may be helpful if you\'re trying to sleep, focus or limit time spent on your phone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Block sounds and visuals"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Don\'t turn on the screen or wake for notifications"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Don\'t show notifications at all, except for basic phone activity and status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
@@ -3312,21 +3330,33 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> to <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Calls"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
+    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
+      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
+      <item quantity="one">and 1 other</item>
+    </plurals>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"All messages"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Selected messages"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Some messages"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"From anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"From contacts only"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"From starred contacts and repeat callers"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"From contacts and repeat callers"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"From repeat callers only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Touch sounds"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Selected callers"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"anyone"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contacts"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"starred contacts"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repeat callers"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> only"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"From <xliff:g id="CALLER_TYPE">%1$s</xliff:g> and <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"If the same person calls a second time within a <xliff:g id="MINUTES">%d</xliff:g>-minute period"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Custom"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatically turn on"</string>
@@ -3596,7 +3626,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"All Do Not Disturb rules created by this app will be removed."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Don’t optimise"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimise"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"May drain your battery more quickly"</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"May drain your battery more quickly. App will no longer be restricted from using background battery."</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recommended for better battery life"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Allow <xliff:g id="APP">%s</xliff:g> to ignore battery optimisations?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"None"</string>
@@ -3672,7 +3702,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Can’t change this setting"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Action not allowed"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Can’t change volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Calling not allowed"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
@@ -3862,7 +3892,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Control info on lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tips &amp; support"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
@@ -4055,6 +4085,8 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Movie &amp; TV apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
+    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 5ffa1b1..e25b712 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -166,6 +166,7 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎SIM access request‎‏‎‎‏‎"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to ‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎Visible as “‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">^1</xliff:g>‎‏‎‎‏‏‏‎” to other devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_off_footer" msgid="8406865700572772936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎Turn on Bluetooth to connect to other devices.‎‏‎‎‏‎"</string>
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎Your devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎Pair new device‎‏‎‎‏‎"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎Allow your tablet to communicate with nearby Bluetooth devices‎‏‎‎‏‎"</string>
@@ -1452,6 +1453,7 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎Cant’t reset eSIMs‎‏‎‎‏‎"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎The eSIMs can’tt be reset due to an error.‎‏‎‎‏‎"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
+    <string name="master_clear_short_title" msgid="8652450915870274285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎This will erase all data from your tablet’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎This will erase all data from your phone’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You are currently signed into the following accounts:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -1997,6 +1999,7 @@
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎Very long delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎Very long delay (‎‏‎‎‏‏‎<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms)‎‏‎‎‏‎</item>
     </plurals>
+    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎Ring ‎‏‎‎‏‏‎<xliff:g id="SUMMARY_RING">%1$s</xliff:g>‎‏‎‎‏‏‏‎, touch ‎‏‎‎‏‏‎<xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎Ring &amp; notification set to off‎‏‎‎‏‎"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎Ring &amp; notification set to low‎‏‎‎‏‎"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎Ring &amp; notification set to medium‎‏‎‎‏‎"</string>
@@ -2104,8 +2107,7 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎Screen usage since full charge‎‏‎‎‏‎"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎Screen consumption‎‏‎‎‏‎"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎Mobile network scanning‎‏‎‎‏‎"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎App usage since full charge (‎‏‎‎‏‏‎<xliff:g id="RELATIVE_TIME">^1</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎Device usage since full charge (‎‏‎‎‏‏‎<xliff:g id="RELATIVE_TIME">^1</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎Battery usage since full charge‎‏‎‎‏‎"</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>
@@ -2136,8 +2138,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎Waking up device in background‎‏‎‎‏‎"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎Requesting location frequently‎‏‎‎‏‎"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps misbehaving‎‏‎‎‏‎"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎Battery is in good shape‎‏‎‎‏‎"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎Apps are running normally‎‏‎‎‏‎"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎Apps are running normally‎‏‎‎‏‎"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎Phone has typical background battery usage‎‏‎‎‏‎"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎Tablet has typical background battery usage‎‏‎‎‏‎"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎Device has typical background battery usage‎‏‎‎‏‎"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎Low battery capacity‎‏‎‎‏‎"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎Battery can\'t provide good battery life‎‏‎‎‏‎"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎Improve your phone\'s battery life‎‏‎‎‏‎"</string>
@@ -2152,9 +2156,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎Tablet used more than usual‎‏‎‎‏‎"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎Device used more than usual‎‏‎‎‏‎"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎Battery may run out soon‎‏‎‎‏‎"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎Your phone has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps since last full charge(‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>‎‏‎‎‏‏‏‎):‎‏‎‎‏‎"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎Your tablet has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps since last full charge(‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>‎‏‎‎‏‏‏‎):‎‏‎‎‏‎"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎Your device has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps since last full charge(‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>‎‏‎‎‏‏‏‎):‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎Your phone has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps you used since full charge:‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎Your tablet has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps you used since full charge:‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="2806861679225286129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎Your device has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top ‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps you used since full charge:‎‏‎‎‏‎"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎Restrict %1$d apps‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎Restrict %1$d app‎‏‎‎‏‎</item>
@@ -2183,8 +2187,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎This app will be able to use battery in the background. Your battery may run out sooner than expected.‎‏‎‎‏‎"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎Remove‎‏‎‎‏‎"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎Cancel‎‏‎‎‏‎"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎Based on your usage, your battery usually lasts about ‎‏‎‎‏‏‎<xliff:g id="TIME_DURATION">%1$s</xliff:g>‎‏‎‎‏‏‏‎ when fully charged.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If you need to extend your battery life, turn on Battery Saver.‎‏‎‎‏‎"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎If you need to extend your battery life, turn on Battery Saver‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions you can take.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can always turn on Battery Saver if you’re running low on battery.‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions you can take.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can always turn on Battery Saver if you’re running low on battery.‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions you can take.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You can always turn on Battery Saver if you’re running low on battery.‎‏‎‎‏‎"</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎Battery Manager‎‏‎‎‏‎"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎Manage apps automatically‎‏‎‎‏‎"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎Limit battery for apps that you don’t use often‎‏‎‎‏‎"</string>
@@ -3074,15 +3079,14 @@
     <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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎Block visual disturbances‎‏‎‎‏‎"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎Allow visual signals‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎Restrict notifications‎‏‎‎‏‎"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎When Do Not Disturb is turned on‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎Notifications‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎When Do Not Disturb is turned on‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎Mute notifications‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎Show notifications but mute sounds &amp; vibrations‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎When new notifications arrive your phone won’t make a sound or vibration‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎Hide &amp; mute notifications‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎Notifications will not appear at all‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎You won’t see new or existing notifications when Do Not Disturb is on. However, notifications needed for basic phone activity and status will still appear.‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎Show notifications silently‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎Notifications will be muted‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎When notifications arrive, your phone won’t make a sound or vibrate.‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎Hide notifications‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎You won’t see new or existing notifications‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind, critical notifications for phone activity and status will still appear.‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎Custom‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎Enable custom setting‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎Remove custom setting‎‏‎‎‏‎"</string>
@@ -3134,13 +3138,27 @@
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="ON_COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ rules can turn on automatically‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎1 rule can turn on automatically‎‏‎‎‏‎</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎Ok‎‏‎‎‏‎"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎Behavior‎‏‎‎‏‎"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎Exceptions‎‏‎‎‏‎"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎Schedule‎‏‎‎‏‎"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎Sound &amp; vibration‎‏‎‎‏‎"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.‎‏‎‎‏‎"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎Mute all except‎‏‎‎‏‎"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎Muted‎‏‎‎‏‎"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎Not muted‎‏‎‎‏‎"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎Muted, but allow ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎Muted, but allow ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎Muted, but allow ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎Messages, events &amp; reminders‎‏‎‎‏‎"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎Update‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎Don\'t update‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎Your phone can do more to help you focus.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Update settings to:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎- Hide notifications completely‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎- Allow calls from starred contacts and repeat callers‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎Update Do Not Disturb?‎‏‎‎‏‎"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎Settings‎‏‎‎‏‎"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎You can further customize this in Settings.‎‏‎‎‏‎"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎Block when the screen is on‎‏‎‎‏‎"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎Block when the screen is off‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎Do Not Disturb can do more than block unwanted sounds - it can block visuals too. This may be helpful if you\'re trying to sleep, focus, or limit time spent on your phone.‎‏‎‎‏‎"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎Block sounds and visuals‎‏‎‎‏‎"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎Don\'t turn on the screen or wake for notifications‎‏‎‎‏‎"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎Don\'t show notifications at all, except for basic phone activity and status‎‏‎‎‏‎"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎Work profile sounds‎‏‎‎‏‎"</string>
@@ -3311,21 +3329,33 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="START">%1$s</xliff:g>‎‏‎‎‏‏‏‎ - ‎‏‎‎‏‏‎<xliff:g id="END">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="START">%1$s</xliff:g>‎‏‎‎‏‏‏‎ to ‎‏‎‎‏‏‎<xliff:g id="END">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎Calls‎‏‎‎‏‎"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
+    <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎Starred contacts‎‏‎‎‏‎"</string>
+    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎and ‎‏‎‎‏‏‎<xliff:g id="NUM_PEOPLE">%d</xliff:g>‎‏‎‎‏‏‏‎ others‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎and 1 other‎‏‎‎‏‎</item>
+    </plurals>
     <string name="zen_mode_messages" msgid="5886440273537510894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎Messages‎‏‎‎‏‎"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎All messages‎‏‎‎‏‎"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎Selected messages‎‏‎‎‏‎"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎Messages‎‏‎‎‏‎"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎Some messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎From anyone‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎From contacts only‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎From starred contacts only‎‏‎‎‏‎"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎From starred contacts and repeat callers‎‏‎‎‏‎"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎From contacts and repeat callers‎‏‎‎‏‎"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎From repeat callers only‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎None‎‏‎‎‏‎"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎Alarms‎‏‎‎‏‎"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎Media‎‏‎‎‏‎"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎Touch sounds‎‏‎‎‏‎"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎Reminders‎‏‎‎‏‎"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎Events‎‏‎‎‏‎"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎All callers‎‏‎‎‏‎"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎Selected callers‎‏‎‎‏‎"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎anyone‎‏‎‎‏‎"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎contacts‎‏‎‎‏‎"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎starred contacts‎‏‎‎‏‎"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎Repeat callers‎‏‎‎‏‎"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎From ‎‏‎‎‏‏‎<xliff:g id="CALLER_TYPE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ only‎‏‎‎‏‎"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎From ‎‏‎‎‏‏‎<xliff:g id="CALLER_TYPE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎If the same person calls a second time within a ‎‏‎‎‏‏‎<xliff:g id="MINUTES">%d</xliff:g>‎‏‎‎‏‏‏‎ minute period‎‏‎‎‏‎"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎Custom‎‏‎‎‏‎"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎Automatically turn on‎‏‎‎‏‎"</string>
@@ -3595,7 +3625,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎All Do Not Disturb rules created by this app will be removed.‎‏‎‎‏‎"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎Don’t optimize‎‏‎‎‏‎"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎Optimize‎‏‎‎‏‎"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎May drain your battery more quickly‎‏‎‎‏‎"</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎May drain your battery more quickly. App will no longer be restricted from using background battery.‎‏‎‎‏‎"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎Recommended for better battery life‎‏‎‎‏‎"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎Allow ‎‏‎‎‏‏‎<xliff:g id="APP">%s</xliff:g>‎‏‎‎‏‏‏‎ to ignore battery optimizations?‎‏‎‎‏‎"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎None‎‏‎‎‏‎"</string>
@@ -3671,7 +3701,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎Back up disabled‎‏‎‎‏‎"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎Updated to Android ‎‏‎‎‏‏‎<xliff:g id="VERSION">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎Update available‎‏‎‎‏‎"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎Can’t change this setting‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎Action not allowed‎‏‎‎‏‎"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎Can’t change volume‎‏‎‎‏‎"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎Calling not allowed‎‏‎‎‏‎"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎SMS not allowed‎‏‎‎‏‎"</string>
@@ -3861,7 +3891,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎Control info on lock screen‎‏‎‎‏‎"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎Show or hide notification content‎‏‎‎‏‎"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎All‎‏‎‎‏‎"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎Support &amp; tips‎‏‎‎‏‎"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎Tips &amp; support‎‏‎‎‏‎"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎Smallest width‎‏‎‎‏‎"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎No installed apps have requested Premium SMS access‎‏‎‎‏‎"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎Premium SMS may cost you money and will add up to your carrier bills. If you enable permission for an app, you will be able to send premium SMS using that app.‎‏‎‎‏‎"</string>
@@ -4054,6 +4084,8 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎Movie &amp; TV apps‎‏‎‎‏‎"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎Carrier Provisioning Info‎‏‎‎‏‎"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎Trigger Carrier Provisioning‎‏‎‎‏‎"</string>
+    <string name="zen_suggestion_title" msgid="798067603460192693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎Update Do Not Disturb‎‏‎‎‏‎"</string>
+    <string name="zen_suggestion_summary" msgid="4573237195296808909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎Hide notifications to stay focused‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎What\'s new and exciting?‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎Take a tour of your new phone‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new tablet‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e0b7053..08aaa70 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso a SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"El dispositivo <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Al otorgar el acceso a la tarjeta SIM, inhabilitarás la conectividad de datos en el dispositivo por el tiempo que dure la conexión. Otorga el acceso al dispositivo <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo nuevo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permite que la tablet se comunique con dispositivos Bluetooth cercanos"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"No se pueden restablecer las tarjetas eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Se produjo un error al restablecer las tarjetas eSIM."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos los datos (restablecer la configuración de fábrica)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, por ejemplo:\n\n"<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:\n\n"<li>"La cuenta de Google"</li>\n<li>"Datos de apps y configuraciones"</li>\n<li>"Apps descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Accediste a las siguientes cuentas:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Demora muy prolongada (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Demora muy prologada (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Desactivada para notificaciones y llamadas"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Baja para notificaciones y llamadas"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Media para notificaciones y llamadas"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Escaneo de redes móviles"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de la app desde la última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso del dispositivo desde la última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activa el dispositivo en segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita la ubicación frecuentemente"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps no funcionan correctamente"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La batería se encuentra en buen estado"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Las apps se ejecutan con normalidad"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacidad de batería baja"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La batería no tiene una buena duración"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Mejora la duración de batería del teléfono"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"La tablet se usó más de lo habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"El dispositivo se usó más de lo habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Es posible que pronto se agote la batería"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"El teléfono se usó más de lo habitual. La batería podría agotarse antes de lo esperado.\n\nEstas son las <xliff:g id="NUMBER">%1$d</xliff:g> apps con mayor consumo desde la última carga(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"La tablet se usó más de lo habitual. La batería podría agotarse antes de lo esperado.\n\nEstas son las <xliff:g id="NUMBER">%1$d</xliff:g> apps con mayor consumo desde la última carga(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"El dispositivo se usó más de lo habitual. La batería podría agotarse antes de lo esperado.\n\nEstas son las <xliff:g id="NUMBER">%1$d</xliff:g> apps con mayor consumo desde la última carga(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restringir %1$d apps</item>
       <item quantity="one">Restringir %1$d app</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esta app podrá usar la batería en segundo plano. La batería podría agotarse antes de lo esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Quitar"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Según tu uso, la batería suele durar aproximadamente <xliff:g id="TIME_DURATION">%1$s</xliff:g> cuando la carga está completa.\n\nSi necesitas extender su duración, activa el Ahorro de batería."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Si necesitas extender la duración de la batería, activa el Ahorro de batería"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Administrador de batería"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Administra apps automáticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitar el consumo de batería de las apps que no uses con frecuencia"</string>
@@ -3075,15 +3094,14 @@
     <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">"Bloquear alteraciones visuales"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir señales visuales"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restringir notificaciones"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Qué sucede si activas el modo No interrumpir"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Cuando No interrumpir está activado"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Silenciar notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostrar notificaciones pero silenciar los sonidos y las vibraciones"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Cuando recibas notificaciones, el teléfono no vibrará ni emitirá ningún sonido"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ocultar y silenciar notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"No aparecerán las notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Cuando el modo No interrumpir esté activado, no verás notificaciones nuevas ni anteriores. No obstante, se seguirán mostrando las notificaciones necesarias para el estado y las actividades básicas del teléfono."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificaciones silenciosamente"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Se silenciarán las notificaciones"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"El teléfono no sonará ni vibrará cuando recibas notificaciones."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificaciones"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"No verás notificaciones nuevas ni existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Tu teléfono no mostrará notificaciones nuevas o existentes. Tampoco vibrará ni sonará. Las notificaciones no aparecerán cuando deslices el dedo hacia abajo desde la parte superior de la pantalla.\n\nTen en cuenta que seguirán apareciendo las notificaciones clave de la actividad del teléfono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizada"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Habilitar configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Quitar configuración personalizada"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other">Se pueden activar automáticamente <xliff:g id="ON_COUNT">%d</xliff:g> reglas</item>
       <item quantity="one">Se puede activar automáticamente 1 regla</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Aceptar"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamiento"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Excepciones"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Horarios"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Sonido y vibración"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Si activas el modo No interrumpir, se silenciarán el sonido y la vibración, excepto para los elementos que habilites arriba."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Silenciar todo excepto"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Silenciar"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"No silenciar"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Silenciar, pero permitir <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Silenciar, pero permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> y <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciar, pero permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> y <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensajes, eventos y recordatorios"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Si activas el modo No interrumpir, se silenciarán los mensajes, recordatorios y eventos, excepto los elementos que habilites arriba. Puedes ajustar la configuración de los mensajes para permitir que tus amigos, tu familia y otros contactos se comuniquen contigo."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Actualizar"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"No actualizar"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Tu teléfono puede ayudarte a no perder la concentración.\n\nActualiza la configuración para que ocurre lo siguiente:\n\n- Se oculten las notificaciones por completo.\n\n- Se permitan las llamadas de contactos destacados o personas que ya te hayan llamado."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"¿Actualizar el modo No interrumpir?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configuración"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Puedes personalizar esta opción en Configuración."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquear cuando la pantalla está encendida"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquear cuando la pantalla está apagada"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"No interrumpir puede bloquear tanto sonidos no deseados como imágenes. Esta función es útil cuando necesitas dormir, mantener la concentración o limitar el tiempo que pasas con el teléfono."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquear imágenes y sonido"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"No activar la pantalla con las notificaciones"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"No mostrar ninguna notificación, excepto la actividad básica y el estado del teléfono"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sonidos del perfil de trabajo"</string>
@@ -3310,21 +3342,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Llamadas"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Si activas el modo No interrumpir, se bloquearán las llamadas entrantes. Puedes ajustar la configuración para permitir que tus amigos, tu familia y otros contactos puedan comunicarse contigo."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Todos los mensajes"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mensajes seleccionados"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensajes"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Algunos mensajes"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De cualquier persona"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Solo de contactos"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo de contactos destacados"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De contactos destacados y emisores repetidos"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De contactos y emisores repetidos"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Solo de emisores repetidos"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ninguno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Contenido multimedia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Tonos táctiles"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos los emisores"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactos seleccionados"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"cualquiera"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contactos"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contactos destacados"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Solo de <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De <xliff:g id="CALLER_TYPE">%1$s</xliff:g> y <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si la misma persona llama por segunda vez en un plazo de <xliff:g id="MINUTES">%d</xliff:g> minuto(s)"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizado"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticam."</string>
@@ -3594,7 +3636,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se quitarán todas las normas del modo No interrumpir que creó esta app."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"No optimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizar"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Puede agotar la batería más rápido"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Es recomendable para una mayor duración de la batería"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"¿Deseas permitir que la aplicación <xliff:g id="APP">%s</xliff:g> ignore las optimizaciones de la batería?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ninguno"</string>
@@ -3670,7 +3713,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Copia de seguridad inhabilitada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Se actualizó a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualización disponible"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"No se puede cambiar esa opción"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Acción no permitida"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"No se puede cambiar el volumen"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"No está permitido hacer llamadas"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"No está permitido enviar SMS"</string>
@@ -3860,7 +3903,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar los datos que aparecen en la pantalla bloqueada"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ocultar o mostrar el contenido de las notificaciones"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Asistencia"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Sugerencias y asistencia"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna app que instalaste solicitó acceso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium podría implicar cargos en la factura de tu proveedor. Si otorgaste permiso a alguna app, podrás enviar SMS premium con esa app."</string>
@@ -4053,6 +4096,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de películas y TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información del aprovisionamiento del proveedor"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar aprovisionamiento del proveedor"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las novedades y qué es lo más emocionante?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nueva tablet"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e14840d..2eb9376 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso de SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Si lo permites, se inhabilitará la conexión de datos del dispositivo durante la conexión. Conceder acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincular nuevo dispositivo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permite que tu tablet se comunique con dispositivos Bluetooth cercanos"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"No se ha podido recuperar el estado de las tarjetas eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"No se ha podido recuperar el estado de las tarjetas eSIM debido a un error."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos los datos"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has iniciado sesión en las cuentas que se indican a continuación:\n"</string>
@@ -1825,9 +1829,9 @@
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
-    <string name="language_settings" msgid="8758655933029560944">"Idiomas e intr. de texto"</string>
+    <string name="language_settings" msgid="8758655933029560944">"Idiomas e introducción de texto"</string>
     <string name="language_empty_list_user_restricted" msgid="5984015900102140696">"No tienes permiso para cambiar el idioma del dispositivo."</string>
-    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e intr. de texto"</string>
+    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introd. de texto"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Asistencia de introducción de texto"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado e introducción de texto"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomas"</string>
@@ -1923,7 +1927,7 @@
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"Controles de interacción"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Servicios descargados"</string>
-    <string name="experimental_category_title" msgid="5272318666666893547">"Experimentales"</string>
+    <string name="experimental_category_title" msgid="5272318666666893547">"Experimental"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"El lector de pantalla está destinado principalmente a personas ciegas y con problemas de visión"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Toca cualquier elemento de la pantalla para oírlo"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Retraso muy largo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Retraso muy largo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Desactivada para notificaciones y llamadas"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Baja para notificaciones y llamadas"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Media para notificaciones y llamadas"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde la última carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Búsqueda de redes móviles"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de aplicaciones desde última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso del dispositivo desde la última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"El dispositivo se está activando en segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"La ubicación se solicita con frecuencia"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Hay <xliff:g id="NUMBER">%1$d</xliff:g> aplicaciones que no funcionan correctamente"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La batería está en buen estado"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Las aplicaciones funcionan correctamente"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Las aplicaciones funcionan correctamente"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"El teléfono tiene un consumo normal de batería en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"El tablet tiene un consumo normal de batería en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"El dispositivo tiene un consumo normal de batería en segundo plano"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"La capacidad de la batería es baja"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Queda poca batería"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Mejorar la duración de la batería del teléfono"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"El tablet se ha usado más de lo normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"El dispositivo se ha usado más de lo normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Es posible que te quedes sin batería pronto"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Tu teléfono se ha usado más de lo normal y es posible que te quedes sin batería antes de lo que pensabas.\n\nEstas son las <xliff:g id="NUMBER">%1$d</xliff:g> aplicaciones que han consumido más batería desde la última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tu tablet se ha usado más de lo normal y es posible que te quedes sin batería antes de lo que pensabas.\n\nEstas son las <xliff:g id="NUMBER">%1$d</xliff:g> aplicaciones que han consumido más batería desde la última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Tu dispositivo se ha usado más de lo normal y es posible que te quedes sin batería antes de lo que pensabas.\n\nEstas son las <xliff:g id="NUMBER">%1$d</xliff:g> aplicaciones que han consumido más batería desde la última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restringir %1$d aplicaciones</item>
       <item quantity="one">Restringir %1$d aplicación</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esta aplicación puede utilizar la batería en segundo plano y provocar que te quedes sin batería antes de lo que pensabas."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Quitar"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Según tu uso, la batería suele durar aproximadamente <xliff:g id="TIME_DURATION">%1$s</xliff:g> cuando el dispositivo está cargado completamente.\n\nSi necesitas que dure más, activa la función Ahorro de batería."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Si necesitas que la batería dure más, activa la función Ahorro de batería"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Tus aplicaciones usan una cantidad normal de batería. Si consumen demasiada batería, tu teléfono te recomendará acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Tus aplicaciones usan una cantidad normal de batería. Si consumen demasiada batería, tu tablet te recomendará acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Tus aplicaciones usan una cantidad normal de batería. Si consumen demasiada batería, tu dispositivo te recomendará acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestor de batería"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gestionar aplicaciones automáticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitar el consumo de batería de las aplicaciones que no utilices con frecuencia"</string>
@@ -3075,15 +3087,14 @@
     <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">"Bloquear interrupciones visuales"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir señales visuales"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restringir notificaciones"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Cuando el modo No molestar esté activado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Cuando el modo No molestar esté activado"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Silenciar notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostrar notificaciones, pero silenciar el sonido y la vibración"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Cuando recibas nuevas notificaciones, el teléfono no sonará ni vibrará"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ocultar y silenciar notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"No aparecerán las notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"No verás notificaciones nuevas ni anteriores cuando el modo No molestar esté activado. No obstante, se seguirán mostrando las notificaciones necesarias para el estado y las actividades básicas del teléfono."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificaciones en silencio"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Las notificaciones se silenciarán"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Cuando recibas notificaciones, tu teléfono no sonará ni vibrará."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificaciones"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"No verás notificaciones nuevas ni anteriores"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Tu teléfono no mostrará notificaciones nuevas ni anteriores y no sonará ni vibrará. Las notificaciones no aparecerán cuando deslices el dedo hacia abajo desde la parte superior de la pantalla.\n\nTen en cuenta que se seguirán mostrando las notificaciones importantes sobre el estado y la actividad del teléfono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizado"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Habilitar configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Quitar configuración personalizada"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reglas se pueden activar automáticamente</item>
       <item quantity="one">1 regla se puede activar automáticamente</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Aceptar"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamiento"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Excepciones"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Programación"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Sonido y vibración"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Cuando el modo No molestar esté activado, el sonido y la vibración se silenciarán, excepto en los casos que permitas más arriba."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Silenciar todo excepto"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Silenciados"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Sin silenciar"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Silenciados, pero permitir <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Silenciados, pero permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> y <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciados, permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> y <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensajes, eventos y recordatorios"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Cuando el modo No molestar esté activado, los mensajes, recordatorios y eventos se silenciarán, excepto los que permitas más arriba. Ajusta la configuración de los mensajes para que tus amigos, familiares u otros puedan contactarte."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Actualizar"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"No actualizar"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Tu teléfono puede ayudarte a no perder la concentración.\n\nCambia los ajustes para:\n\n- Ocultar las notificaciones por completo\n\n- Permitir llamadas de contactos destacados o personas que ya te han llamado"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"¿Quieres actualizar el modo No molestar?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ajustes"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Puedes personalizar esta opción en Ajustes."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquear cuando la pantalla esté encendida"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquear cuando la pantalla esté apagada"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"El modo No molestar, además de bloquear los sonidos no deseados, también puede bloquear los elementos visuales. Esto puede resultarte útil si quieres dormir, concentrarte o limitar el tiempo que pasas usando el teléfono."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquear sonidos y elementos visuales"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"No encender la pantalla ni activar con notificaciones"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"No mostrar notificaciones, excepto las que estén relacionadas con el estado y la actividad básica del teléfono"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sonidos del perfil de trabajo"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>-<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Llamadas"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"El modo No Molestar bloquea las llamadas entrantes. Ajusta la configuración para que tus amigos, familiares u otros puedan contactarte."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Todos los mensajes"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mensajes seleccionados"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensajes"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Algunos mensajes"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De cualquier usuario"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Solo de contactos"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo de contactos destacados"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De contactos destacados y de personas que insisten"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De contactos y de personas que insisten"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Solo de personas que insisten"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Multimedia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sonidos al tocar"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Todas las llamadas"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactos seleccionados"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"todo el mundo"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contactos"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contactos destacados"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Solo de <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De <xliff:g id="CALLER_TYPE">%1$s</xliff:g> y <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Permitir llamadas que procedan de la misma persona si no han pasado más de <xliff:g id="MINUTES">%d</xliff:g> minutos desde su primera llamada"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizado"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticamente"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se quitarán todas las reglas de No molestar que esta aplicación haya creado."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"No optimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizar"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"La batería se puede agotar más rápido"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para mejorar la duración de la batería"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"¿Permitir que <xliff:g id="APP">%s</xliff:g> ignore las optimizaciones de la batería?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ninguna"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Copia de seguridad inhabilitada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualizado a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualización disponible"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"No se puede cambiar la opción"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Acción no permitida"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"No se puede cambiar el volumen"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"No se permite llamar"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"No se permite enviar SMS"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar los datos que aparecen en la pantalla de bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar u ocultar contenido de las notificaciones"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Ayuda y consejos"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Ayuda y consejos"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna aplicación instalada ha solicitado acceso SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Es posible que el envío de SMS premium te cueste dinero y el importe correspondiente se sume a las facturas de tu operador. Si habilitas el permiso para una aplicación, puedes enviar SMS premium con ella."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicaciones de películas y TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de servicios del operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar servicios del operador"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las fascinantes novedades?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nuevo tablet"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ed5c0c6..2fbce73 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Juurdepääsutaotlus SIM-kaardile"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Seade <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> soovib juurdepääsu teie SIM-kaardile. Kui annate juurdepääsu SIM-kaardile, keelatakse seadmes ühenduse ajaks andmesideühendus. Juurdepääsu andmine seadmele <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Teistele seadmetele nähtav seadmena „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Teie seadmed"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uue seadme sidumine"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Lubage oma tahvelarvutil lähedalasuvate Bluetoothi seadmetega suhelda"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-kaarte ei saa lähtestada"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Vea tõttu ei saa eSIM-kaarte lähtestada."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Väga pikk viivitus (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Väga pikk viivitus (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Helina ja märguannete vibreerimine lülitati välja"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Helina ja märguannete vibreerimine seati tasemele Nõrk"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Helina ja märguannete vibreerimine seati tasemele Keskmine"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekraani kasutus alates täislaadimisest"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekraani energiatarve"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Rakenduste kasutus alates täislaadimisest (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Seadme kasutus alates täislaadimisest (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Seadme äratamine taustal"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Asukohateabe sage taotlemine"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> valesti käituvat rakendust"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Aku on heas seisukorras"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Rakendused töötavad tavapäraselt"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Aku tühjeneb"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Aku tööiga on lühike"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Parandage telefoni aku tööiga"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tahvelarvutit on kasutatud tavapärasest rohkem"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Seadet on kasutatud tavapärasest rohkem"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Aku võib peagi tühjaks saada"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Teie telefoni on kasutatud rohkem kui tavaliselt. Teie aku võib oodatust kiiremini tühjaks saada.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> kõige enam akut kasutanud rakendust pärast viimast täislaadimist (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Teie tahvelarvutit on kasutatud rohkem kui tavaliselt. Teie aku võib oodatust kiiremini tühjaks saada.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> kõige enam akut kasutanud rakendust pärast viimast täislaadimist (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Teie seadet on kasutatud rohkem kui tavaliselt. Teie aku võib oodatust kiiremini tühjaks saada.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> kõige enam akut kasutanud rakendust pärast viimast täislaadimist (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Piira %1$d rakendust</item>
       <item quantity="one">Piira %1$d rakendus</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"See rakendus saab taustal akut kasutada. Aku võib oodatust varem tühjaks saada."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Eemalda"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Tühista"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Teie kasutuse põhjal kestab aku tavaliselt <xliff:g id="TIME_DURATION">%1$s</xliff:g>, kui see on täielikult täis laetud.\n\nKui soovite aku tööiga pikendada, lülitage sisse akusäästja."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Kui soovite aku tööiga pikendada, lülitage sisse akusäästja"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Akuhaldur"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Halda rakendusi automaatselt"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Akukasutuse piiramine rakenduste puhul, mida te ei kasuta sageli"</string>
@@ -3075,15 +3094,14 @@
     <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">"Visuaalsete häirimiste blok."</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Luba visuaalsed signaalid"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Märguannete piiramine"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kui režiim Mitte segada on sisse lülitatud"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Märguanded"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kui režiim Mitte segada on sisse lülitatud"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Märguannete vaigistamine"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Kuva märguanded, kuid vaigista heli ja vibreerimine"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Teie telefon ei helise ega vibreeri uute märguannete saabumisel"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Märguannete peitmine ja vaigistamine"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Märguandeid ei kuvata üldse"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Kui režiim Mitte segada on sisse lülitatud, ei näe te uusi ega olemasolevaid märguandeid. Olek ja märguanded, mis on vajalikud telefoni põhitoiminguteks, kuvatakse siiski."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Kuva märguanded vaikselt"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Märguanded vaigistatakse"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Teie telefon ei helise ega vibreeri märguannete saabumisel."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Peida märguanded"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Te ei näe uusi ega olemasolevaid märguandeid"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Teie telefon ei kuva uusi ega olemasolevaid märguandeid ega helise või vibreeri. Kui pühite ekraanikuva ülaosast alla, siis märguandeid ei kuvata.\n\nPidage meeles, et kriitilised märguanded telefoni tegevuste ja oleku kohta kuvatakse siiski."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Kohandatud"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Kohandatud seade lubamine"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Kohandatud seade eemaldamine"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reeglit võivad automaatselt sisse lülituda</item>
       <item quantity="one">1 reegel võib automaatselt sisse lülituda</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Käitumine"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Erandid"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Ajakava"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Heli ja vibreerimine"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse heli ja vibreerimine (v.a ülal lubatud üksuste puhul)."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Vaigista kõik, v.a"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Vaigistatud"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Pole vaigistatud"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Vaigistatud, kuid lubatakse <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Vaigistatud, kuid lubatakse <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ja <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Vaigistatud, kuid lubatakse <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ja <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Sõnumid, sündmused ja meeldetuletused"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse sõnumid, meeldetuletused ja sündmused. Teil on võimalik sõnumite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Värskenda"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ära värskenda"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefon saab teid keskendumisel rohkem aidata.\n\nVärskendage seadeid:\n\n- Peida märguanded täielikult\n\n- Luba kõned tärniga tähistatud kontaktidelt ja korduvatelt helistajatelt"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Kas värskendada režiimi Mitte segada?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Seaded"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Jaotises Seaded saate seda täpsemini kohandada."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokeeri, kui ekraan on sisse lülitatud"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokeeri, kui ekraan on välja lülitatud"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Režiim Mitte segada teeb muudki peale soovimatute helide keelamise – see võib blokeerida ka visuaalse sisu. See võib olla kasulik magamise või keskendumise ajal või juhul, kui püüate telefoni kasutamise aega vähendada."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Helide ja visuaalse sisu blokeerimine"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ära ärata ega lülita ekraani märguannete puhul sisse"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ekraanil ei kuvata ühtki märguannet peale telefoni põhitoimingute ja -oleku."</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Tööprofiili helid"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> kuni <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Kõned"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kui funktsioon Mitte segada on sisse lülitatud, blokeeritakse sissetulevad kõned. Teil on võimalik seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sõnumid"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Kõik sõnumid"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Valitud sõnumid"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Sõnumid"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Teatud sõnumid"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Kõigilt"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Ainult kontaktidelt"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Ainult tärniga tähistatud kontaktidelt"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Tärniga tähistatud kontaktidelt ja korduvatelt helistajatelt"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kontaktidelt ja korduvatelt helistajatelt"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Ainult korduvatelt helistajatelt"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Mitte kelleltki"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Äratused"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Meedia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Puutehelid"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Meeldetuletused"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sündmused"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Kõik helistajad"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitud helistajad"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"igaüks"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktid"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"tärniga tähistatud kontaktid"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Korduvad helistajad"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Ainult helistajatelt <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Helistajatelt <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ja <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Kui sama inimene helistab teile <xliff:g id="MINUTES">%d</xliff:g> minuti jooksul teist korda"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Kohandatud"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. sisselülitus"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Kõik selle rakenduse loodud režiimi Mitte segada reeglid eemaldatakse."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ära optimeeri"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimeeri"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Aku võib kiiremini tühjeneda"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Soovitatav aku kasutusaja pikendamiseks"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Kas lubada rakendusel <xliff:g id="APP">%s</xliff:g> eirata aku optimeerimisi?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Puudub"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Varundamine on keelatud"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android värskendati versioonile <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Värskendus on saadaval"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Seda seadet ei saa muuta"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Keelatud toiming"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Helitugevust ei saa muuta"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Helistamine ei ole lubatud"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-id ei ole lubatud"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrollige lukustuskuva teavet"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Märguande sisu kuvamine või peitmine"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Kõik"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Tugi ja nõuanded"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Nõuanded ja tugi"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kõige väiksem laius"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ükski installitud rakendus pole taotlenud juurdepääsu tasuliste SMS-ide saatmiseks"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Tasuliste SMS-ide saatmisel võidakse teilt nõuda tasu, mis lisatakse operaatori esitatud arvele. Kui annate rakendusele loa, saate selle rakendusega tasulisi SMS-e saata."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmi- ja TV-rakendused"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaatori ettevalmistamise teave"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operaatori ettevalmistamise päästik"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mis on uut ja põnevat?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutvuge oma uue telefoniga"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutvuge oma uue tahvelarvutiga"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index bd2d05a..dc6825b 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM txartelerako sarbide-eskaera"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> gailuak SIM txartela atzitu nahi du. SIM txartelerako sarbidea ematen badiozu, gailuaren datu-konexioa desgaituko da, txartelerako konexioak dirauen bitartean. Eman sarbidea <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> gailuari"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" gisa dago ikusgai beste gailuetan"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Zure gailuak"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parekatu gailu batekin"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Baimendu tabletari inguruko Bluetooth gailuekin komunikatzea"</string>
@@ -402,7 +404,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Erabili hatz-marka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Sakatu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun. Hatz-marka bakar bat gehituta ere gauza daitezke aipatutako ekintzak.\n\nOharra: baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: ezin duzu erabili hatz-marka gailu hau desblokeatzeko. Informazio gehiago lortzeko, jarri zure erakundearen administratzailearekin harremanetan."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: agian hatz-marka ez da izango eredu edo PIN kode sendo bat bezain segurua."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Utzi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jarraitu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Saltatu"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Ezin dira berrezarri eSIM txartelak"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Ezin dira berrezarri eSIM txartelak errore bat gertatu delako."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Ezabatu datu guztiak (berrezarri fabrikako ezarpenak)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
@@ -1905,7 +1909,7 @@
     <string name="widget_picker_title" msgid="9130684134213467557">"Aukeratu widgeta"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widgeta sortu eta sarbidea baimendu?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Widgeta sortu ondoren, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariak bistaratzen dituen datu guztiak atzitu ahal izango ditu."</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Baimendu beti <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari widgetak sortzea eta horietako datuak atzitzea"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Baimendu beti <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari widgetak sortzea eta haietako datuak atzitzea"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Erabilera-estatistikak"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Erabilera-estatistikak"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenatzeko irizpidea:"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Oso atzerapen luzea (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Oso atzerapen luzea (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Dardara desaktibatuta tonua jotzean eta jakinarazpenak daudenean"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Dardara txikia tonua jotzean eta jakinarazpenak daudenean"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Dardara ertaina tonua jotzean eta jakinarazpenak daudenean"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Pantailaren erabilera gailua guztiz kargatu zenetik"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pantailaren kontsumoa"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Aplikazioen erabilera gailua guztiz kargatu zenetik (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Gailuaren erabilera guztiz kargatu zenetik (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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">"Bateria-erabilera entxufea atera ondoren"</string>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Zerbait gailua esnarazten aritu da atzeko planoan"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Gailua sarriegi ari da eskatzen kokapena"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateriaren egoera ona da"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikazioak ohiko moduan dabiltza"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Bateriaren edukiera txikiegia da"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateriak ezin du eskaini iraupen onargarria"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Hobetu telefonoaren bateriaren iraupena"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tableta ohi baino gehiago erabili da"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Gailua ohi baino gehiago erabili da"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Baliteke bateria laster agortzea"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Ohi baino gehiago erabili da telefonoa. Baliteke bateria espero baino lehenago agortzea.\n\nHauek dira telefonoa guztiz kargatu zenetik (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) bateria gehien erabili duten <xliff:g id="NUMBER">%1$d</xliff:g> aplikazioak:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Ohi baino gehiago erabili da tableta. Baliteke bateria espero baino lehenago agortzea.\n\nHauek dira tableta guztiz kargatu zenetik (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) bateria gehien erabili duten <xliff:g id="NUMBER">%1$d</xliff:g> aplikazioak:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Ohi baino gehiago erabili da gailua. Baliteke bateria espero baino lehenago agortzea.\n\nHauek dira gailua guztiz kargatu zenetik (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) bateria gehien erabili duten <xliff:g id="NUMBER">%1$d</xliff:g> aplikazioak:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Mugatu %1$d aplikazio</item>
       <item quantity="one">Mugatu %1$d aplikazio</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Atzeko planoan exekutatu arren, baliteke aplikazio honek bateria erabiltzea. Horregatik, baliteke espero baino lehenago agortzea."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Kendu"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Utzi"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Erabileraren arabera, bateriak <xliff:g id="TIME_DURATION">%1$s</xliff:g> inguru irauten du guztiz kargatuta dagoenean.\n\nBateriaren iraupena luzatzeko, aktibatu bateria-aurrezlea."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Bateriaren iraupena luzatzeko, aktibatu bateria-aurrezlea"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Bateria-kudeatzailea"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Kudeatu aplikazioak automatikoki"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Mugatu gutxi erabiltzen dituzun aplikazioen bateria-erabilera"</string>
@@ -2359,7 +2378,7 @@
     <string name="voice_input_settings" msgid="1099937800539324567">"Ahozko idazketaren ezarpenak"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Ahozko idazketa"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ahozko idazketa-zerbitzuak"</string>
-    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ahozko pasahitzak eta erabateko interakzioa"</string>
+    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ahozko gako-hitzak eta erabateko interakzioa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Ahoz idazteko eginbide arrunta"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Aginduak ahoz emateko zerbitzu honek une oro kontrolatuko du ahotsa eta ahozko gaitasuna duten aplikazioak ere kontrolatu ahal izango ditu. <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikazioarena da. Zerbitzu hau erabiltzeko aukera gaitu nahi duzu?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"Motor hobetsia"</string>
@@ -3075,15 +3094,14 @@
     <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">"Blokeatu oztopo bisualak"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Baimendu seinale bisualak"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Mugatu jakinarazpenak"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Ez molestatu\" aktibatuta dagoenean"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Jakinarazpenak"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"\"Ez molestatu\" aktibatuta dagoenean"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Desaktibatu jakinarazpenen soinua"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Erakutsi jakinarazpenak, baina desaktibatu soinuak eta dardarak"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Jakinarazpen berriak iristen direnean, telefonoak ez du egingo soinurik edo dardararik"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ezkutatu jakinarazpenak eta desaktibatu haien soinua"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Ez da agertuko jakinarazpenik"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"\"Ez molestatu\" aktibatuta dagoenean, ez duzu ikusiko lehendik dauden edo berriak diren jakinarazpenik. Hala ere, agertu egingo dira telefonoaren egoerarekin eta oinarrizko jarduerekin erlazionatutakoak."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Erakutsi jakinarazpenak soinurik egin gabe"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Jakinarazpenen audioa eta dardara desaktibatuko dira"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Jakinarazpenak iristen direnean, telefonoak ez du egingo soinurik edo dardararik."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ezkutatu jakinarazpenak"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Ez duzu ikusiko lehendik dagoen edo berria den jakinarazpenik"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonoak ez ditu erakutsiko lehendik dauden edo berriak diren jakinarazpenak, eta ez du egingo soinurik edo dardararik. Ez da jakinarazpenik agertuko hatza goitik behera pasatzen duzunean.\n\nHala ere, telefonoaren jarduerekin eta egoerarekin erlazionatutako funtsezko jakinarazpenak agertuko dira."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Gaitu ezarpen pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Kendu ezarpen pertsonalizatua"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> arau aktiba daitezke automatikoki</item>
       <item quantity="one">1 arau aktiba daiteke automatikoki</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ados"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Portaera"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Salbuespenak"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Antolaketa"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Audioa eta dardara"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"\"Ez molestatu\" modua aktibatuta dagoenean, audioa eta dardara desaktibatu egingo dira, goian baimendutako elementuetan izan ezik."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Desaktibatu guztien audioa eta dardara, hauena izan ezik:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Audioa eta dardara desaktibatuta"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Audioa eta dardara desaktibatu gabe"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Audioa eta dardara desaktibatuta, baina baimendu <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Audioa eta dardara desaktibatuta, baina baimendu <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> eta <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Audioa eta dardara desaktibatuta, baina baimendu <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> eta <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mezuak, gertaerak eta abisuak"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatu egingo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Eguneratu"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ez eguneratu"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefonoak arreta mantentzen lagun zaitzake orain.\n\nEguneratu ezarpenak:\n\n- Jakinarazpen guztiak ezkutatzeko.\n\n- Kontaktu izardunen eta berriro deitzen dutenen deiak soilik onartzeko."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\"Ez molestatu\" modua eguneratu nahi duzu?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ezarpenak"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Aukera hau gehiago pertsonalizatzeko, joan ezarpenetara."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokeatu pantaila piztuta dagoenean"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokeatu pantaila itzalita dagoenean"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\"Ez molestatu\" moduarekin, entzun nahi ez dituzun soinuak blokeatu ez ezik, ikusi nahi ez duzuna ere blokea dezakezu. Oso lagungarria da hobeto lo egiteko, kontzentratzeko, edo telefonoa erabiltzen igarotako denbora mugatzeko."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokeatu soinuak eta ikusizko elementuak"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ez piztu pantaila edo esnarazi jakinarazpenekin"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ez erakutsi jakinarazpenik, telefonoaren egoerarekin eta oinarrizko jarduerekin erlazionatutakoak izan ezik"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Laneko profilaren soinuak"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Deiak"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Ez molestatu\" modua aktibatuta dagoenean, jasotako deiak blokeatzen dira. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mezuak"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Mezu guztiak"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Hautatutako mezuak"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mezuak"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Mezu batzuk"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Edonorenak"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kontaktuenak soilik"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kontaktu izardunenak soilik"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Kontaktu izardunen eta berriro deitu dutenen deiak"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kontaktuen eta berriro deitu dutenen deiak"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Berriro deitu dutenen deiak soilik"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Bat ere ez"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmak"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Multimedia-edukia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sakatze-soinuak"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Abisuak"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Gertaerak"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Deitzaile guztiak"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Hautatutako deitzaileak"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"edonor"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktuak"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontaktu izardunak"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Berriro deitu dutenak"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> motako deitzaileenak soilik"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> eta <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> motetako deitzaileenak"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> minutuko epean pertsona berak berriz deitzen badu"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Pertsonalizatua"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktibatu automatikoki"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Kendu egingo dira aplikazioak sortu dituen ez molestatzeko arau guztiak."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ez optimizatu"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizatu"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Hori aukeratuz gero, bizkorrago agortuko da bateria"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Bateriak luzeago irauteko gomendatzen da"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Bateriaren optimizazioei ez ikusi egitea baimendu nahi diozu <xliff:g id="APP">%s</xliff:g> aplikazioari?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Bat ere ez"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Desgaituta dago babeskopiak egiteko aukera"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> bertsiora eguneratuta"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Eguneratu egin daiteke"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Ezin da aldatu ezarpena"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Ezin da hori egin"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Ezin da aldatu bolumena"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Ez da onartzen deiak egitea"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Ez da onartzen SMS mezuak bidaltzea"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Pantaila blokeatuko kontrolari buruzko informazioa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Erakutsi edo ezkutatu jakinarazpenaren edukia"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Guztiak"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Laguntza eta aholkuak"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Aholkuak eta laguntza"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Zabalerarik txikiena"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ez dago premium SMSetarako sarbidea eskatu duen aplikaziorik."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMSak ordaindu egin behar izan ditzakezu eta, hala bada, operadorearen fakturan gehituko da haien kostua. Aplikazioei baimen hau ematen badiezu, premium SMSak bidaltzeko gai izango dira."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Zinema- eta telebista-aplikazioak"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operadorearen hornikuntza-informazioa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Abiarazi operadorearen hornikuntza"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Zer berri dago?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Eman txango bat telefono berrian barrena"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Eman txango bat tableta berrian barrena"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 7c2593d..197e3e4 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -70,7 +70,7 @@
     <item msgid="8934131797783724664">"اسکن کردن..."</item>
     <item msgid="8513729475867537913">"در حال اتصال…"</item>
     <item msgid="515055375277271756">"در حال راستی‌آزمایی..."</item>
-    <item msgid="1943354004029184381">"‏در حال دریافت آدرس IP..."</item>
+    <item msgid="1943354004029184381">"‏درحال دریافت نشانی IP…"</item>
     <item msgid="4221763391123233270">"متصل"</item>
     <item msgid="624838831631122137">"معلق"</item>
     <item msgid="7979680559596111948">"در حال قطع اتصال..."</item>
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"اسکن کردن..."</item>
     <item msgid="355508996603873860">"در حال اتصال به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"در حال راستی‌آزمایی با <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
-    <item msgid="7928343808033020343">"‏در حال دریافت آدرس IP از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"‏درحال دریافت نشانی IP از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="8937994881315223448">"متصل شد به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="1330262655415760617">"معلق"</item>
     <item msgid="7698638434317271902">"اتصال قطع شد از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d143e4c..bba217e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"درخواست دسترسی به سیم‌‌کارت"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> می‌خواهد به سیم‌کارت شما دسترسی پیدا کند. درصورتی‌که به دسترسی به سیم‌کارت اجازه دهید، اتصال داده در مدت اتصال در دستگاه شما غیرفعال می‌شود. به <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> اجازه دسترسی دهید"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"به‌عنوان «<xliff:g id="DEVICE_NAME">^1</xliff:g>» برای دستگاه‌های دیگر قابل مشاهده است"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"دستگاه‌های شما"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"مرتبط‌سازی دستگاه جدید"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"به رایانه لوحی‌تان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
@@ -835,7 +837,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"وضعیت"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"سرعت پیوند"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"فرکانس"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"‏آدرس IP"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"‏نشانی IP"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"ذخیره از طریق"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"اعتبارنامه‌های <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"‏روش EAP"</string>
@@ -901,7 +903,7 @@
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏Wi-Fi پیشرفته"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏آدرس MAC"</string>
-    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏آدرس IP"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏نشانی IP"</string>
     <string name="wifi_details_title" msgid="8954667664081737098">"جزئیات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"پوشش زیرشبکه"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
@@ -911,7 +913,7 @@
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‏تنظیمات پیشرفته Wi‑Fi برای این کاربر در دسترس نیست"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"ذخیره"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"لغو"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"‏یک آدرس IP معتبر تایپ کنید."</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"‏نشانی IP معتبری تایپ کنید."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"یک آدرس دروازه معتبر را تایپ کنید."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"‏یک آدرس DNS معتبر را تایپ کنید."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"یک پیشوند شبکه با طول بین 0 تا 32 نویسه تایپ کنید."</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"نمی‌توان سیم‌کارت‌های داخلی را بازنشانی کرد"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"به علت خطای داخلی، سیم‌کارت داخلی بازنشانی نشد."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های بارگیری شده"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"تنیمات و داده‌های برنامه و سیستم"</li>\n<li>"برنامه‌های بارگیری شده"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">تأخیر بسیار طولانی (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> میلی‌ثانیه)</item>
       <item quantity="other">تأخیر بسیار طولانی (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> میلی‌ثانیه)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"زنگ زدن و اعلان روی «خاموش» تنظیم شده است"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"زنگ زدن و اعلان روی «خفیف» تنظیم شده است"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"زنگ زدن و اعلان روی «متوسط» تنظیم شده است"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"مصرف صفحه‌نمایش از زمان شارژ کامل"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"مصرف صفحه‌نمایش"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"اسکن شبکه تلفن همراه"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"مصرف برنامه از زمان شارژ کامل (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"مصرف دستگاه از زمان شارژ کامل (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"دستگاه را در پس‌زمینه بیدار می‌کند"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"به‌طور مکرر مکان را درخواست می‌کند"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> برنامه عملکرد نادرست دارند"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"باتری وضعیت خوبی دارد"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"برنامه‌ها به‌طور معمول اجرا می‌شوند"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ظرفیت باتری پایین"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"عمر باتری ضعیف است"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"عمر باتری تلفنتان را بهبود ببخشید"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"رایانه لوحی بیشتر از حد معمول استفاده شده است"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"دستگاه بیشتر از حد معمول استفاده شده است"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ممکن است شارژ باتری به‌زودی تمام شود"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"تلفنتان بیش از حد معمول استفاده است. ممکن است شارژ باتری زودتر از انتظار تمام شود.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> برنامه پرمصرف از آخرین شارژ شدن (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"رایانه لوحی‌تان بیش از حد معمول استفاده است. ممکن است شارژ باتری زودتر از انتظار تمام شود.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> برنامه پرمصرف از آخرین شارژ شدن (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"دستگاهتان بیش از حد معمول استفاده است. ممکن است شارژ باتری زودتر از انتظار تمام شود.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> برنامه پرمصرف از آخرین شارژ شدن (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">‏%1$d برنامه را محدود کنید</item>
       <item quantity="other">‏%1$d برنامه را محدود کنید</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"این برنامه می‌تواند در پس‌زمینه از باتری استفاده کند. ممکن است شارژ باتری زودتر از حد انتظار تمام شود."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"برداشتن"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"لغو"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"وقتی شارژ کامل شد، معمولاً باتوجه به میزان مصرف باتری تقریباً <xliff:g id="TIME_DURATION">%1$s</xliff:g> ماندگار است.\n\nدرصورت نیاز به افزایش عمر باتری، بهینه‌سازی باتری را روشن کنید."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"درصورت نیاز به افزایش عمر باتری، بهینه‌سازی باتری را روشن کنید"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"مدیر باتری"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"مدیریت خودکار برنامه‌ها"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"محدود کردن باتری برای برنامه‌هایی که زیاد استفاده نمی‌کنید"</string>
@@ -2703,7 +2722,7 @@
     <string name="vpn_require_connection_title" msgid="159053539340576331">"‏به اتصال VPN‌ نیاز است؟"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏یک نمایه VPN انتخاب کنید تا همیشه متصل بمانید. فقط درصورتی‌که به این VPN متصل باشید ترافیک شبکه مجاز خواهد بود."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"هیچ‌کدام"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏VPN همیشه فعال به یک آدرس IP برای سرور و DNS نیاز دارد."</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏VPN همیشه‌فعال به نشانی IP برای DNS و سرور نیاز دارد."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"اتصال شبکه موجود نیست. لطفاً دوباره امتحان کنید."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"‏ارتباط VPN قطع شد"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"هیچ‌کدام"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"مجاز کردن همه سیگنال‌های تصویری"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"اعلان‌های محدود‌شده"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"وقتی «مزاحم نشوید» روشن باشد"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"اعلان‌ها"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"وقتی «مزاحم نشوید» روشن باشد"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"بی‌صدا کردن اعلان‌"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"نشان دادن اعلان‌، اما بی‌صدا و لرزش"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"هنگام دریافت اعلان‌، تلفنتان صدا نمی‌دهد یا نمی‌لرزد"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"پنهان و بی‌صدا کردن اعلان‌ها"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"اعلان‌ به‌هیچ‌وجه نشان داده نخواهد شد"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"وقتی «مزاحم نشوید» روشن باشد، اعلان‌های جدید یا موجود را نمی‌بینید. درهرحال، اعلان‌های لازم برای وضعیت و فعالیت اصلی تلفن همچنان نشان داده می‌شود."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"نمایش اعلان‌ به‌صورت بی‌صدا"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"اعلان‌ها صامت خواهند شد"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"هنگام دریافت اعلان‌، تلفنتان صدا نمی‌دهد یا نمی‌لرزد."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"پنهان کردن اعلان‌ها"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"اعلان‌های جدید یا موجود را نخواهید دید"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"تلفنتان اعلان‌های جدید یا موجود را نشان نخواهد داد و صدا یا لرزشی ایجاد نخواهد کرد. وقتی صفحه را از بالا به پایین تند می‌کشید، اعلان‌ها نشان داده نخواهند شد.\n\nبه خاطر داشته باشید که اعلان‌های مهم مربوط به فعالیت و وضعیت تلفن همچنان نشان داده می‌شوند."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"سفارشی"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"فعال کردن تنظیم سفارشی"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"حذف تنظیم سفارشی"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> قانون می‌تواند به‌طور خودکار روشن شود</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> قانون می‌تواند به‌طور خودکار روشن شود</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"تأیید"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"رفتار"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"استثناها"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"زمان‌بندی"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"صدا و لرزش"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"وقتی «مزاحم نشوید» روشن است، به‌غیر از مواردی که در بالا مجاز می‌کنید، صدا و لرزش صامت می‌شوند."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"صامت کردن همه به‌جز"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"صامت"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"صامت نشده است"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"صامت شده است، اما <xliff:g id="SOUND_TYPE">%1$s</xliff:g> را مجاز کنید"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"صامت شده است، اما <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> را مجاز کنید"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"صامت شده است، اما <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>، <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> و <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> را مجاز کنید"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"پیام‌ها، رویدادها و یادآوری‌ها"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"وقتی «مزاحم نشوید» روشن است، به‌جز مواردی که در بالا مجاز می‌کنید، پیام‌ها، یادآوری‌ها و رویدادها صامت می‌شوند. می‌توانید تنظیمات پیام را به‌گونه‌ای انجام دهید که دوستانتان، خانواده یا سایر مخاطبین بتوانند به شما دسترسی پیدا کنند."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"به‌روزرسانی"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"به‌روزرسانی نشود"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"تلفنتان می‌تواند کارهای بیشتری برای کمک به تمرکز کردن شما انجام دهد.\n\nتنظیمات را به‌روزرسانی کنید:\n\n- پنهان کردن کامل اعلان‌ها\n\n- اجازه دادن به تماس‌های مخاطبین ستاره‌دار و تماس‌گیرندگانی که ظرف ۱۵ دقیقه دو بار تماس گرفته‌اند"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"«مزاحم نشوید» به‌روزرسانی شود؟"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"تنظیمات"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"در «تنظیمات» می‌توانید سفارشی‌سازی بیشتری انجام دهید."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"مسدود کردن وقتی صفحه روشن است"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"مسدود کردن وقتی صفحه خاموش است"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"«مزاحم نشوید» می‌تواند کارهای بیشتری از مسدود کردن صداهای ناخواسته انجام دهد - این ویژگی می‌تواند موارد تصویری را هم مسدود کند. هنگام تلاش برای خوابیدن، تمرکز کردن یا محدود کردن زمانی که صرف استفاده از تلفن می‌کنید، این ویژگی می‌تواند مفید باشد."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"مسدود کردن صداها و موارد تصویری"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"با دریافت اعلان صفحه روشن نشود یا دستگاه بیدار نشود"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"هیچ اعلانی نشان داده نشود، به‌جز فعالیت و وضعیت پایه تلفن"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"صداهای نمایه کاری"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> ‏- <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> تا <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"تماس‌ها"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"وقتی «مزاحم نشوید» روشن است، تماس‌های ورودی مسدود می‌شوند. می‌توانید تنظیماتتان را به‌گونه‌ای انجام دهید که دوستانتان، خانواده یا سایر مخاطبین بتوانند به شما دسترسی پیدا کنند."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیام‌ها"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"همه پیام‌ها"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"پیام‌های انتخاب شده"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"پیام‌ها"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"برخی پیام‌ها"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"از هر کسی"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"تنها از مخاطبین"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"تنها از مخاطین ستاره‌دار"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"از مخاطبین ستاره‌دار و تماس‌گیرنده‌های تکراری"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"از مخاطبین و تماس‌گیرنده‌های تکراری"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"فقط از تماس‌گیرنده‌های تکراری"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"هیچ‌کدام"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"هشدارها"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"رسانه"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"صداهای لمس"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یادآوری‌ها"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"رویدادها"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"همه تماس‌گیرندگان"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"تماس‌گیرنده‌های انتخاب شده"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"همه"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"مخاطبین"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"مخاطبین ستاره‌دار"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"تماس‌گیرنده‌های تکراری"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"فقط از <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"از <xliff:g id="CALLER_TYPE">%1$s</xliff:g> و <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"اگر فردی در طول یک دوره <xliff:g id="MINUTES">%d</xliff:g> دقیقه‌ای، برای بار دوم تماس بگیرد"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"سفارشی"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"روشن شدن خودکار"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"همه قوانین «مزاحم نشوید» ایجادشده توسط این برنامه حذف می‌شوند."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"بهینه‌سازی نشود"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"بهینه‌سازی"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ممکن است باتری شما را سریع‌تر خالی کند"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"برای ماندگاری بیشتر باتری توصیه می‌شود"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"به <xliff:g id="APP">%s</xliff:g> اجازه داده شود بهینه‌سازی‌های باتری را نادیده بگیرد؟"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"هیچ‌کدام"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"پشتیبان‌گیری غیرفعال است"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏به‌روزرسانی‌شده به Android نسخه <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"به‌روزرسانی در دسترس است"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"تغییر این تنظیم ممکن نیست"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"عملکرد مجاز نیست"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"نمی‌توان بلندی صدا را تغییر داد"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"برقراری تماس تلفنی مجاز نیست"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"استفاده از پیامک مجاز نیست"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"کنترل اطلاعات روی صفحه درحالت قفل"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"نمایش یا پنهان کردن محتوای اعلان"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"همه"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"پشتیبانی و نکته‌ها"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"نکته‌ها و پشتیبانی"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"کوچک‌ترین عرض"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"هیچ برنامه نصب‌شده‌ای دسترسی به پیامک ممتاز را درخواست نکرده است"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ممکن است استفاده از «پیامک ممتاز» برای شما هزینه داشته باشد و مبلغ صورت‌حساب‌های شرکت مخابراتی‌تان را افزایش دهد. اگر مجوز را برای برنامه‌ای فعال کنید، می‌توانید با استفاده از آن برنامه پیامک ممتاز ارسال کنید."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"فیلم و برنامه‌های تلویزیونی"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"اطلاعات ارائه شرکت مخابراتی"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"شروع ارائه شرکت مخابراتی"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"چه مواردی جدید و هیجان‌انگیز هستند؟"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"در تلفن جدیدتان گشتی بزنید"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"در رایانه لوحی جدیدتان گشتی بزنید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fd77a33..6a7a504 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-kortin käyttöoikeuspyyntö"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> haluaa käyttää SIM-korttiasi. SIM-kortin käyttöoikeuden myöntäminen poistaa laitteesi datayhteyden käytöstä yhteyden ajaksi. Myönnä käyttöoikeus laitteelle <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Muille laitteille näkyvä nimi: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Omat laitteet"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Muodosta laitepari uuden laitteen kanssa"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Anna tabletin viestiä lähellä olevien Bluetooth-laitteiden kanssa"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMien nollaus epäonnistui"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIMien nollaus epäonnistui virheen vuoksi."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Poista kaikki tiedot (palauta tehdasasetukset)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Erittäin pitkä viive (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Erittäin pitkä viive (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Puhelu- ja ilmoitusvärinä on pois käytöstä"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Puhelu- ja ilmoitusvärinä on heikko"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Puhelu- ja ilmoitusvärinä on keskitasoinen"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Näytön käyttö täyden latauksen jälkeen"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Näytön virrankulutus"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiiliverkkojen haku"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Laitteen virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Käynnistää näytön taustalla"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Pyytää sijaintitietoja usein"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> sovellusta ei toimi oikein"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akku on hyvässä kunnossa"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Sovellukset toimivat normaalisti."</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Huono akunkesto"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akku ei kestä kauaa"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Paranna puhelimesi akunkestoa"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablettia on käytetty tavallista enemmän"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Laitetta on käytetty tavallista enemmän"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Akku voi loppua pian"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Puhelintasi on käytetty tavallista enemmän, ja sen akku voi loppua odotettua aiemmin.\n\n <xliff:g id="NUMBER">%1$d</xliff:g> käytetyintä sovellusta edellisen täyden latauksen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) jälkeen:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablettiasi on käytetty tavallista enemmän, ja sen akku voi loppua odotettua aiemmin.\n\n <xliff:g id="NUMBER">%1$d</xliff:g> käytetyintä sovellusta edellisen täyden latauksen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) jälkeen:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Laitettasi on käytetty tavallista enemmän, ja sen akku voi loppua odotettua aiemmin.\n\n <xliff:g id="NUMBER">%1$d</xliff:g> käytetyintä sovellusta edellisen täyden latauksen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) jälkeen:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Rajoita %1$d sovellusta</item>
       <item quantity="one">Rajoita %1$d sovellusta</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Tämä sovellus voi käyttää akkua taustalla, joten akku saattaa loppua odotettua aiemmin."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Poista"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Peruuta"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Käyttösi perusteella akku kestää yleensä noin <xliff:g id="TIME_DURATION">%1$s</xliff:g> täydellä latauksella.\n\nJos haluat pidentää akunkestoa, ota virransäästö käyttöön."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Jos haluat pidentää akunkestoa, ota virransäästö käyttöön."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Virranhallinta"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Hallinnoi sovelluksia automaattisesti"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Rajoita harvoin käytettyjen sovellusten akunkäyttöä."</string>
@@ -3075,15 +3094,14 @@
     <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">"Estä näkyvät häiriötekijät"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Salli visuaaliset signaalit"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Rajoita ilmoituksia"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kun älä häiritse ‑tila on käytössä"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Ilmoitukset"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kun älä häiritse ‑tila on käytössä"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Ohita ilmoitukset"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Näytä ilmoitukset, mutta mykistä äänet ja värinä"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Puhelin ei anna äänimerkkiä eikä värise ilmoituksen saapuessa."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Piilota ja ohita ilmoitukset"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Ilmoituksia ei näytetä ollenkaan."</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Kun älä häiritse ‑tila on käytössä, et näe uusia tai nykyisiä ilmoituksia. Puhelimen perustoimintojen ja ‑tilan edellyttämät ilmoitukset kuitenkin näkyvät edelleen."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Näytä ilmoitukset hiljennettyinä"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ilmoitukset mykistetään"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Puhelin ei anna äänimerkkiä eikä värise ilmoituksen saapuessa."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Piilota ilmoitukset"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Uusia tai nykyisiä ilmoituksia ei näytetä"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Kun älä häiritse ‑tila on käytössä, et näe puhelimen uusia tai nykyisiä ilmoituksia tai saa niistä äänimerkkiä tai värinää. Niitä ei näytetä, kun pyyhkäiset näytön ylälaidasta alaspäin.\n\nTärkeät puhelimen perustoimintojen ja ‑tilan ilmoitukset näytetään silti."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Oma"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ota oma asetus käyttöön"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Poista oma asetus"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> sääntöä voi käynnistyä automaattisesti</item>
       <item quantity="one">1 sääntö voi käynnistyä automaattisesti</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Käyttäytyminen"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Poikkeukset"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Aikataulu"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Ääni ja värinä"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Älä häiritse ‑tilassa äänimerkit ja värinä mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Mykistä kaikki paitsi"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Mykistetty"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Älä mykistä"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Mykistä, salli <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Mykistä, salli <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ja <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Mykistä, salli <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ja <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Viestit, tapahtumat ja muistutukset"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Älä häiritse ‑tilassa viestit, muistutukset ja tapahtumat mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta. Voit määrittää viestiasetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Päivitä"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Älä päivitä"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Puhelimesi voi auttaa sinua keskittymään.\n\nPäivittämällä asetuksia voit\n\n– piilottaa ilmoitukset kokonaan\n\n– sallia vain tähdellä merkittyjen kontaktien ja uudelleen soittavien henkilöiden puhelut."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Päivitetäänkö Älä häiritse ‑tila?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Asetukset"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Voit räätälöidä tätä lisää asetuksissa."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Estä näytön ollessa päällä"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Estä näytön ollessa pois päältä"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Älä häiritse ‑tila voi tehdä muutakin kuin estää ei-toivottuja ääniä – se voi estää myös grafiikoita. Tästä voi olla hyötyä, jos yrität nukkua, keskittyä tai rajoittaa puhelimen käyttöaikaasi."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Estä äänet ja grafiikat"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Älä anna ilmoitusten käynnistää tai aktivoida näyttöä"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Älä näytä ilmoituksia lainkaan, paitsi jos ne koskevat puhelimen toimintaa ja tilaa"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Työprofiilin äänet"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Puhelut"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Saapuvat puhelut estetään Älä häiritse ‑tilassa. Voit määrittää asetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Viestit"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Kaikki viestit"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Valitut viestit"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Viestit"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Osa viesteistä"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Keneltä tahansa"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Vain kontakteilta"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vain tähdellä merkityiltä kontakteilta"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Tähdellä merkityiltä yhteyshenkilöiltä ja toistuvilta soittajilta"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Yhteyshenkilöiltä ja toistuvilta soittajilta"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Vain toistuvilta soittajilta"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ei keneltäkään"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Herätykset"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Kosketusäänet"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Muistutukset"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tapahtumat"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Kaikki soittajat"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valitut soittajat"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"kuka tahansa"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"yhteyshenkilöt"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"tähdellä merkityt yhteyshenkilöt"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Toistuvat soitot"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Vain <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Vain <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ja <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jos sama henkilö soittaa uudelleen <xliff:g id="MINUTES">%d</xliff:g> minuutin kuluessa"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Muokattu"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ota autom. käyttöön"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Kaikki tämän sovelluksen luomat Älä häiritse -säännöt poistetaan."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Älä optimoi"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimoi"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Akku voi tyhjentyä tavallista nopeammin."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Pidentää akun kestoa."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Saako <xliff:g id="APP">%s</xliff:g> ohittaa akun optimoinnit?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ei mitään"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Varmuuskopiointi poistettu käytöstä"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Päivitetty Android-versioon <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Päivitys saatavilla"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Tätä asetusta ei voi muuttaa"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Toiminto ei ole sallittu"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Äänenvoimakkuutta ei voi muuttaa"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Puheluja ei sallita"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Tekstiviestejä ei sallita"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Hallinnoi lukitusnäytön tietoja"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Näytä tai piilota ilmoituksien sisältö."</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Kaikki"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Tuki ja vinkit"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Vinkit ja tuki"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Pienin leveys"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Yksikään asennettu sovellus ei ole pyytänyt premium-tekstiviestien käyttöoikeutta."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium-tekstiviestien käyttö saattaa olla maksullista, ja kulut lisätään operaattorisi laskuun. Jos annat sovellukselle käyttöoikeuden, voit lähettää premium-tekstiviestejä kyseisellä sovelluksella."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Elokuva- ja TV-sovellukset"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaattorin hallintatiedot"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ota operaattorin hallinta käyttöön"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Uutta"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutustu uuteen puhelimeesi"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutustu uuteen tablettiisi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6e81d2f..6d95d86 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> souhaite accéder à votre carte SIM. Le fait d\'accorder l\'accès à la carte SIM désactive la connectivité de données sur votre appareil pendant la durée de la connexion. Accorder l\'accès à <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible comme « <xliff:g id="DEVICE_NAME">^1</xliff:g> » aux autres appareils"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un appareil"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permettre à votre tablette de communiquer avec les appareils Bluetooth à proximité"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Impossible de réinitialiser les cartes eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Les cartes eSIM ne peuvent pas être réinitialisées à cause d\'une erreur."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Effacer toutes les données (réinitialisation d\'usine)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Très long délai (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Très long délai (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"La vibration pour la sonnerie et les notifications est désactivée"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"La vibration pour la sonnerie et les notifications est réglée à Faible"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"La vibration pour la sonnerie et les notifications est réglée à Moyenne"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilisation des applications depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilisation de l\'appareil depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Réveillent l\'appareil en arrière-plan"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Demandent la position fréquemment"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications se comportent de manière anormale"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La pile est en bon état"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Les applications fonctionnent normalement"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Les applications fonctionnent normalement"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Le téléphone utilise une quantité typique d\'énergie en arrière-plan"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"La tablette utilise une quantité typique d\'énergie en arrière-plan"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"L\'appareil utilise une quantité typique d\'énergie en arrière-plan"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Pile faible"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La pile ne peut pas fournir une autonomie suffisante"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Améliorer l\'autonomie du téléphone"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"La tablette a été sollicitée plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"L\'appareil a été sollicité plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"La pile sera bientôt épuisée"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Votre téléphone a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge complète (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) :"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Votre tablette a été sollicitée plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge complète (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) :"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Votre appareil a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge complète (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) :"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Restreindre %1$d application</item>
       <item quantity="other">Restreindre %1$d applications</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Cette application pourra utiliser la pile en arrière-plan. Cela pourrait épuiser la pile plus rapidement."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Supprimer"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Annuler"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"En fonction de votre usage, la pile de votre appareil dure habituellement environ <xliff:g id="TIME_DURATION">%1$s</xliff:g> lorsqu\'elle est complètement chargée.\n\nPour prolonger son autonomie, activez le mode Économie d\'énergie."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Pour prolonger l\'autonomie, activez le mode Économie d\'énergie."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Vos applications utilisent une quantité normale d\'énergie. Si les applications utilisent trop d\'énergie, votre téléphone vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économie d\'énergie si la pile est trop faible."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Vos applications utilisent une quantité normale d\'énergie. Si les applications utilisent trop d\'énergie, votre tablette vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économie d\'énergie si la pile est trop faible."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Vos applications utilisent une quantité normale d\'énergie. Si les applications utilisent trop d\'énergie, votre appareil vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économie d\'énergie si la pile est trop faible."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestionnaire de pile"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gérer les applications automatiquement"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Restreindre l\'usage de la pile pour les applications que vous n\'utilisez pas souvent"</string>
@@ -3075,15 +3087,14 @@
     <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">"Bloquer dérangements visuels"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Autoriser les signaux visuels"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restreindre les notifications"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Lorsque le mode Ne pas déranger est activé"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Quand la fonction Ne pas déranger est activée"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Ignorer les notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Afficher les notifications, couper les sons et les vibrations"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Lorsque de nouvelles notifications arrivent, votre téléphone n\'émettra aucun son et ne vibrera pas"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Masquer et mettre en veille les notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Aucune notification ne s\'affichera"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Vous ne verrez pas les notifications nouvelles ou existantes lorsque la fonction Ne pas déranger est activée. Cependant, les notifications nécessaires pour l\'activité et l\'état de base du téléphone s\'afficheront toujours."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Afficher les notifications en mode silencieux"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Les notifications seront interrompues"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Lorsque de nouvelles notifications arrivent, votre téléphone n\'émettra aucun son et ne vibrera pas."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Masquer les notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Aucune notification (nouvelle ou existante) n\'est visible"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Aucune notification (nouvelle ou existante) n\'est visible. Le téléphone n\'émet aucun son et ne vibre pas. Aucune notification ne s\'affiche lorsque vous balayez l\'écran vers le bas.\n\nÀ titre de rappel, les notifications nécessaires pour l\'activité du téléphone et son état s\'afficheront toujours."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personnalisés"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activer les paramètres personnalisés"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Supprimer les paramètres personnalisés"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle peut s\'activer automatiquement</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles peuvent s\'activer automatiquement</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportement"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceptions"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Horaire"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Son et vibrations"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Lorsque le mode Ne pas déranger est activé, le son et les vibrations sont désactivés, sauf pour les éléments autorisés ci-dessus."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Tout désactiver sauf"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Désactivés"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Non désactivés"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Désactivés, mais autoriser : <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Désactivés, mais autoriser : <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> et <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Désactivés, mais autoriser : <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> et <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, événements et rappels"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez régler les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Mettre à jour"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ne pas mettre à jour"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Votre téléphone peut vous aider à rester concentré.\n\nMettez à jour les paramètres suivants pour :\n\n- Masquer toutes les notifications\n\n- Autoriser les appels des contacts marqués d\'une étoile et des appelants fréquents"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Mettre à jour les paramètres du mode Ne pas déranger?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Paramètres"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Vous pouvez personnaliser davantage ce mode dans les paramètres."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquer lorsque l\'écran est allumé"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquer lorsque l\'écran est éteint"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Le mode Ne pas déranger peut faire bien plus que bloquer les sons indésirables : il peut également bloquer les éléments visuels. Cela peut être utile si vous essayez de dormir, de vous concentrer ou de limiter le temps passé sur votre téléphone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquer les sons et les éléments visuels"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ne pas allumer l\'écran ni réactiver l\'appareil pour les notifications"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ne pas afficher les notifications, sauf pour l\'activité et l\'état de base du téléphone"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> à <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> à <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Appels"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Lorsque le mode Ne pas déranger est activé, les appels entrants sont bloqués. Vous pouvez régler les paramètres pour permettre à vos amis, à votre famille ou à d\'autres contacts de vous joindre."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tous les messages"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Messages sélectionnés"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Certains messages"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De tout le monde"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Des contacts seulement"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris seulement"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Des contacts marqués d\'une étoile et des appels répétés"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Des contacts et des appels répétés"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Seulement des appels répétés"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Média"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sons des touches"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"n\'importe qui"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contacts"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contacts marqués d\'une étoile"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appelants fréquents"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Seulement de : <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De : <xliff:g id="CALLER_TYPE">%1$s</xliff:g> et <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minutes, autoriser le deuxième appel"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personnalisé"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Toutes les règles Ne pas déranger créées par cette application seront supprimées."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne pas optimiser"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimiser"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Cela peut épuiser la pile de votre appareil plus rapidement"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recommandé pour une meilleure autonomie de la pile"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Autoriser <xliff:g id="APP">%s</xliff:g> à ignorer les optimisations de la pile?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Aucune"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Sauvegardes désactivées"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Mis à jour vers Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Mise à jour disponible"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Impossible de modif. ce param."</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Action interdite"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Impossible de modifier le volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Les appels sont désactivés"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"La messagerie texte est désactivée"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Gérer les données sur l\'écran de verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Assistance et astuces"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Astuces et assistance"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Aucune application installée n\'a demandé l\'accès aux textos payants"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Les textos de cette catégorie peuvent être payants et s\'ajouter aux factures mensuelles de votre fournisseur de services. Si vous activez l\'autorisation pour une application, vous serez en mesure d\'envoyer des textos payants à l\'aide de cette dernière."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Applis de films et d\'émissions"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Données d\'approvisionnement du fournisseur de services"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher l\'approvisionnement du fournisseur de services"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quelles sont les nouveautés toutes chaudes?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ce9ab2b..409d287 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"\"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" requiert l\'accès à votre carte SIM. Si vous l\'accordez, la connectivité des données sera désactivée sur votre appareil pour toute la durée de la connexion. Accorder l\'autorisation d\'accès à \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible avec le nom \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" pour les autres appareils"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer nouvel app."</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Autoriser la tablette à communiquer avec les appareils Bluetooth à proximité"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Impossible de réinitialiser les cartes eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Impossible de réinitialiser les cartes eSIM en raison d\'une erreur."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Effacer toutes les données (rétablir la configuration d\'usine)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Délai très long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Délai très long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Sonneries et notifications définies sur \"Désactivée\""</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Sonneries et notifications définies sur \"Faible\""</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Sonneries et notifications définies sur \"Moyenne\""</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la dernière charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilisation par les applications depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilisation par l\'appareil depuis la charge complète (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activation de l\'appareil en arrière-plan"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Position demandée fréquemment"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications ne fonctionnent pas correctement"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La batterie est en parfait état de fonctionnement"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Les applications s\'exécutent normalement"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Autonomie de la batterie faible"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"L\'autonomie de la batterie est faible"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Améliorer l\'autonomie de la batterie de votre téléphone"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablette plus utilisée que d\'habitude"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Appareil plus utilisé que d\'habitude"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Il est possible que vous soyez bientôt à court de batterie"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Votre téléphone a été plus utilisé que d\'habitude. Il est possible que vous arriviez à court de batterie plus vite que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications les plus utilisées depuis la dernière charge complète (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) :"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Votre tablette a été plus utilisée que d\'habitude. Il est possible que vous arriviez à court de batterie plus vite que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications les plus utilisées depuis la dernière charge complète (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) :"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Votre appareil a été plus utilisé que d\'habitude. Il est possible que vous arriviez à court de batterie plus vite que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications les plus utilisées depuis la dernière charge complète (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) :"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Limiter %1$d application</item>
       <item quantity="other">Limiter %1$d applications</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Cette application pourra utiliser la batterie en arrière-plan. Il se peut que vous arriviez à court de batterie plus vite que prévu."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Supprimer"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Annuler"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"En fonction de votre utilisation, la batterie dure en général environ <xliff:g id="TIME_DURATION">%1$s</xliff:g> lorsqu\'elle est complètement chargée.\n\nSi vous devez prolonger l\'autonomie de la batterie, activez l\'économiseur de batterie."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Si vous devez prolonger l\'autonomie de la batterie, activez l\'économiseur de batterie"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestionnaire de batterie"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gérer les applications automatiquement"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limiter l\'utilisation de la batterie pour les applications que vous n\'utilisez pas souvent"</string>
@@ -3075,15 +3094,14 @@
     <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">"Bloquer nuisances visuelles"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Autoriser les signaux visuels"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Limiter les notifications"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Lorsque le mode Ne pas déranger est activé"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Lorsque le mode Ne pas déranger est activé"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Couper le son des notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Afficher les notifications, mais couper le son et bloquer le vibreur"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"À la réception de notifications, votre téléphone n\'émet aucun son et ne vibre pas"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Masquer les notifications et en couper le son"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Aucune notification ne s\'affiche"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Aucune notification (nouvelle ou existante) n\'est visible lorsque le mode Ne pas déranger est activé. Cependant, les notifications nécessaires pour l\'activité de base du téléphone et son état sont toujours affichées."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Afficher les notifications en mode silencieux"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Son coupé pour les notifications"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"À la réception de notifications, votre téléphone n\'émet aucun son et ne vibre pas."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Masquer les notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Aucune notification (nouvelle ou existante) n\'est visible"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Aucune notification (nouvelle ou existante) n\'est visible. Le téléphone n\'émet aucun son et ne vibre pas. Aucune notification ne s\'affiche lorsque vous balayez l\'écran vers le bas.\n\nLes notifications nécessaires pour l\'activité du téléphone et son état sont toujours affichées."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personnalisés"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activer le paramètre personnalisé"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Supprimer le paramètre personnalisé"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> règle peut être activée automatiquement</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles peuvent être activées automatiquement</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportement"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceptions"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Planifier"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Son et vibreur"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Lorsque le mode Ne pas déranger est activé, le son et le vibreur sont désactivés, sauf pour les éléments autorisés ci-dessus."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Couper le son pour tout sauf"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Son coupé"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Son activé"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Son coupé, sauf pour les <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Son coupé, sauf pour les <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> et <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Son coupé, sauf pour les <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> et <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, événements et rappels"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez ajuster les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Mettre à jour"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ne pas mettre à jour"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Votre téléphone dispose de plus d\'options pour vous aider à rester concentré.\n\nMettez à jour vos paramètres pour :\n\n- masquer toutes les notifications ; \n\n- autoriser les appels de vos contacts favoris et les appels répétés de la même personne."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Mettre à jour le mode Ne pas déranger ?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Paramètres"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Vous pouvez personnaliser davantage cette option dans la section \"Paramètres\"."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquer lorsque l\'écran est allumé"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquer lorsque l\'écran est éteint"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Le mode Ne pas déranger ne bloque pas seulement les sons indésirables : il peut également bloquer les éléments visuels. Cela peut vous être utile si vous essayez de dormir, de vous concentrer ou de limiter la durée d\'utilisation de votre téléphone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquer les sons et les éléments visuels"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ne pas allumer l\'écran ni quitter le mode Veille pour les notifications"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"N\'afficher aucune notification, sauf concernant l\'activité de base du téléphone et son état"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Du <xliff:g id="START">%1$s</xliff:g> au <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Appels"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Lorsque le mode Ne pas déranger est activé, les appels entrants sont bloqués. Vous pouvez ajuster les paramètres pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tous les messages"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Messages sélectionnés"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Certains messages"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De n\'importe qui"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Seulement ceux de vos contacts"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris uniquement"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Appels de vos contacts favoris et appels répétés de la même personne"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Appels de vos contacts et appels répétés de la même personne"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Appels répétés de la même personne uniquement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Médias"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sons des touches"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Appelants sélectionnés"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"tout le monde"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contacts"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contacts favoris"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Appels répétés"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Appels de vos <xliff:g id="CALLER_TYPE">%1$s</xliff:g> uniquement"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Appels de vos <xliff:g id="CALLER_TYPE">%1$s</xliff:g> et vos <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Si la même personne appelle deux fois en <xliff:g id="MINUTES">%d</xliff:g> minutes"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personnalisé"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activation auto"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Toutes les règles \"Ne pas déranger\" créés par cette application seront supprimées."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne pas optimiser"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimiser"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Risque de décharger la batterie plus rapidement."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recommandé pour améliorer l\'autonomie de la batterie"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Autoriser <xliff:g id="APP">%s</xliff:g> à ignorer les optimisations de batterie ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Aucune"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Sauvegarde désactivée"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Mis à jour vers Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Mise à jour disponible"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Impossible modifier paramètre"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Action interdite"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Impossible de modifier le volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Appel non autorisé"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS non autorisés"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Contrôler les informations sur l\'écran de verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Aide et conseils"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Aide et conseils"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Aucune demande d\'accès aux SMS premium n\'a été envoyée pour les applications installées."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Les SMS premium peuvent être payants et s\'ajouter aux factures de votre opérateur. Si vous activez l\'autorisation pour une application, vous serez en mesure d\'envoyer des SMS premium à l\'aide de cette dernière."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Applications de films et séries"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nouveautés à découvrir"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 44e35d3..837a61b 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitude de acceso á SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quere acceder á túa tarxeta SIM. Ao outorgar acceso á tarxeta SIM desactivarase a conectividade de datos no teu dispositivo durante a conexión. Outorgar acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os teus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo novo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permite que a tableta se comunique cos dispositivos Bluetooth próximos"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Non se puideron restablecer as eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Non se puideron restablecer as eSIM debido a un erro."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Borrar todos os datos (restablecemento de fábrica)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Os datos e a configuracións do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Esta acción borrará todos os datos do "<b>"almacenamento interno"</b>" do teléfono, como:\n\n"<li>"A túa conta de Google"</li>\n<li>"Datos e configuración do sistema e das aplicacións"</li>\n<li>"Aplicacións descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Retardo moi longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Retardo moi longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"O son e as notificacións están desactivados"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"O son e as notificacións teñen un volume baixo"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"O son e as notificacións teñen un volume medio"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da pantalla desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Exploración de redes móbiles"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de aplicacións desde a carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso do dispositivo desde a carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activando o dispositivo en segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando a localización con frecuencia"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicacións funcionan incorrectamente"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"A batería funciona ben"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"As aplicacións execútanse con normalidade"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"A batería ten pouca capacidade"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A batería dura pouco"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Mellora a vida útil da batería do teléfono"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Utilizouse a tableta máis do normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Utilizouse o dispositivo máis do normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"A batería pode esgotarse en breve"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"O teléfono utilizouse máis do normal e probablemente se esgote a batería antes do esperado.\n\nEstas son as <xliff:g id="NUMBER">%1$d</xliff:g> aplicacións que consumiron máis batería desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"A tableta utilizouse máis do normal e probablemente se esgote a batería antes do esperado.\n\nEstas son as <xliff:g id="NUMBER">%1$d</xliff:g> aplicacións que consumiron máis batería desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"O dispositivo utilizouse máis do normal e probablemente se esgote a batería antes do esperado.\n\nEstas son as <xliff:g id="NUMBER">%1$d</xliff:g> aplicacións que consumiron máis batería desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restrinxir %1$d aplicacións</item>
       <item quantity="one">Restrinxir %1$d aplicación</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esta aplicación poderá utilizar a batería en segundo plano, de tal modo que esta última pódese esgotar antes do esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Quitar"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"En función do uso que fagas, a batería adoita durar aproximadamente <xliff:g id="TIME_DURATION">%1$s</xliff:g> cando está totalmente cargada.\n\nSe necesitas prolongar a duración da batería, activa a función Aforro de batería."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Se necesitas prolongar a duración da batería, activa a función Aforro de batería"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Xestor de batería"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Xestionar aplicacións automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limita o uso de batería das aplicacións que utilizas con pouca frecuencia"</string>
@@ -3076,15 +3095,14 @@
     <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">"Bloquear ruído visual"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restrinxir notificacións"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Cando estea activado o modo Non molestar"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificacións"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Cando está activado o modo Non molestar"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Silenciar notificacións"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostra notificacións, pero silencia os sons e as vibracións"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Cando recibas notificacións, o teléfono non emitirá ningún son nin vibración"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ocultar e silenciar notificacións"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Non verás notificacións"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Non verás notificacións novas ou existentes cando estea activado o modo Non molestar. Non obstante, seguirán aparecendo as notificacións necesarias para o estado e as actividades básicas do teléfono."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificacións de forma silenciosa"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Silenciaranse as notificacións"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"O teléfono non vibrará nin emitirá sons cando cheguen notificacións."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificacións"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Non verás notificacións novas ou existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"O teléfono non mostrará notificacións novas ou existentes e non vibrará nin emitirá sons. As notificacións non aparecerán cando pases o dedo cara abaixo desde a parte superior da pantalla.\n\nTen e conta que seguirán aparecendo notificacións esenciais para a actividade e o estado do teléfono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activar configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Quitar configuración personalizada"</string>
@@ -3136,13 +3154,27 @@
       <item quantity="other">Pódense activar <xliff:g id="ON_COUNT">%d</xliff:g> normas automaticamente</item>
       <item quantity="one">Pódese activar 1 norma automaticamente</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Aceptar"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamento"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Excepcións"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Programación"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Son e vibración"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Cando estea activado o modo Non molestar, silenciaranse o son e a vibración, agás nos casos autorizados anteriormente."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Silenciar todo agás"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Silenciados"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Sen silenciar"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Silenciados, pero permítense: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Silenciados, pero permítense: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciados, pero permítense: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensaxes, eventos e recordatorios"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Cando estea activado o modo Non molestar, silenciaranse as mensaxes, os recordatorios e os eventos, agás nos casos autorizados anteriormente. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Actualizar"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Non actualizar"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"O teu teléfono pode axudarche a non perder a concentración.\n\nActualiza a configuración para:\n\n- Ocultar completamente as notificacións\n\n- Permitir chamadas de contactos destacados ou de persoas que xa te chamaron"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Queres actualizar o modo Non molestar?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configuración"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Podes personalizar máis esta opción en Configuración."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquear cando a pantalla está acendida"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquear cando a pantalla está apagada"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"O modo Non molestar pode realizar máis funcións que bloquear os sons non desexados, por exemplo, pode bloquear o contido visual. Esta opción pode resultar útil se tentas durmir, concentrarte ou ben limitar o tempo que lle adicas ao teléfono."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquear sons e contido visual"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Non activa a pantalla nin se reactiva para mostrar as notificacións"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Non se mostran notificacións, excepto as relacionadas co estado e a actividade básica do teléfono"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de traballo"</string>
@@ -3313,21 +3345,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"Do <xliff:g id="START">%1$s</xliff:g> ao <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Do <xliff:g id="START">%1$s</xliff:g> ao <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Cando estea activado o modo Non molestar, bloquearanse as chamadas entrantes. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensaxes"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Todas as mensaxes"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Seleccionáronse as mensaxes"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensaxes"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Algunhas mensaxes"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De calquera persoa"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Só dos contactos"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Só dos contactos marcados con estrela"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De contactos marcados con estrela e persoas que xa te chamaron"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De contactos e persoas que xa te chamaron"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Só de persoas que xa te chamaron"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ningunha"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Contido multimedia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sons táctiles"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os emisores de chamadas"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores da chamada seleccionados"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"calquera"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contactos"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contactos marcados con estrela"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repetir emisores da chamada"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Só de <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De <xliff:g id="CALLER_TYPE">%1$s</xliff:g> e <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se a mesma persoa chama por segunda vez nun período de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizados"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automaticam."</string>
@@ -3597,7 +3639,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Eliminaranse todas as normas Non molestar creadas por esta aplicación."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Non optimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizar"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Pode esgotar a batería máis rápido"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para aumentar a duración da batería"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Queres permitir que <xliff:g id="APP">%s</xliff:g> ignore as optimizacións da batería?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ningún"</string>
@@ -3673,7 +3716,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Desactivouse a función de copia de seguranza"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualizouse a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Hai dispoñible unha actualización"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Non se pode cambiar a opción"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Acción non permitida"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Non se pode cambiar o volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"As chamadas saíntes non están permitidas"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"As SMS non están permitidas"</string>
@@ -3863,7 +3906,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Información de control sobre a pantalla de bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o contido das notificacións"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Asistencia e consellos"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Consellos e asistencia"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ningunha aplicación instalada solicitou acceso ás mensaxes premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"É posible que teñas que pagar polas mensaxes premium, cuxos custos se engadirán ás facturas do teu operador. Se activas o permiso para unha aplicación, poderás enviar mensaxes premium a través desa aplicación."</string>
@@ -4056,6 +4099,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de películas e TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de aprovisionamento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aprovisionamento do operador do activador"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Cales son as novidades fascinantes?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Realiza unha visita guiada polo teu novo teléfono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Realiza unha visita guiada pola túa nova tableta"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index d166785..d0241da 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"સિમ ઍક્સેસ વિનંતી"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> તમારા સિમ કાર્ડને અ‍ૅક્સેસ કરવા માગે છે. સિમ કાર્ડની અ‍ૅક્સેસને મંજૂરી આપવું કનેક્શનના સમયગાળા માટે તમારા ઉપકરણ પર ડેટા કનેક્ટિવિટીને અક્ષમ કરશે. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ને અ‍ૅક્સેસ આપો"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"તે અન્ય ઉપકરણોને \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' તરીકે દેખાય છે"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"તમારા ઉપકરણો"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"નવા ઉપકરણ જોડો"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"તમારા ટૅબ્લેટને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"ઇ-સિમ રીસેટ કરી શકાતા નથી"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"એક ભૂલને કારણે ઇ-સિમ રીસેટ કરી શકાતા નથી."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"બધો ડેટા ભૂંસી નાખો (ફેક્ટરી રીસેટ)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"આ તમારા ટેબ્લેટનાં "<b>"આંતરિક સંગ્રહ"</b>"માંથી તમામ ડેટા કાઢી નાંખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ અને ઍપ્લિકેશન ડેટા અને સેટિંગ્સ"</li>\n<li>"ડાઉનલોડ કરેલ ઍપ્લિકેશનો"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"આ તમારા ફોનનાં "<b>"આંતરિક સંગ્રહ"</b>"માંથી તમામ ડેટા કાઢી નાંખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ અને ઍપ્લિકેશન ડેટા અને સેટિંગ્સ"</li>\n<li>"ડાઉનલોડ કરેલ ઍપ્લિકેશનો"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"તમે હાલમાં નીચેના એકાઉન્ટ્સમાં સાઇન ઇન થયેલાં છો:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">ખૂબ લાંબો વિલંબ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> મિલિસેકંડ)</item>
       <item quantity="other">ખૂબ લાંબો વિલંબ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> મિલિસેકંડ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"રિંગ અને નોટિફિકેશનના વાઇબ્રેશનને બંધ પર સેટ કર્યું"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"રિંગ અને નોટિફિકેશનના વાઇબ્રેશનને ઓછા પર સેટ કર્યા"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"રિંગ અને નોટિફિકેશનના વાઇબ્રેશનને મધ્યમ પર સેટ કર્યા"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"સંપૂર્ણ ચાર્જ કર્યાં પછી સ્ક્રીન વપરાશ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"સ્ક્રીન દ્વારા વપરાશ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"સંપૂર્ણ ચાર્જ કર્યા પછી ઍપનો વપરાશ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"સંપૂર્ણ ચાર્જ કર્યા પછી ઉપકરણનો વપરાશ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ઉપકરણને પૃષ્ઠભૂમિમાં સક્રિય કરે છે"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"વારંવાર સ્થાનની વિનંતી કરે છે"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ઍપ્લિકેશનો વિચિત્ર રીતે કાર્ય કરે છે"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"બૅટરી સારી અવસ્થામાં છે"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ઍપ સામાન્ય રીતે ચાલી રહી છે"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"બેટરીની ક્ષમતા ઓછી છે"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"આ બૅટરી બહુ લાંબી ચાલશે નહીં"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"તમારા ફોનના બૅટરીની આવરદા વધારો"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયેલું ટૅબ્લેટ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયેલું ઉપકરણ"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"બૅટરી ટૂંક સમયમાં સમાપ્ત થશે"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"તમારો ફોન સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયો છે. તેની બૅટરી અપેક્ષા કરતાં વહેલા સમાપ્ત થઈ શકે છે. \n\nછેલ્લા સંપૂર્ણ ચાર્જ (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) પછી બૅટરીનો સૌથી વધુ વપરાશ કરતી ટોચની <xliff:g id="NUMBER">%1$d</xliff:g> ઍપ:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"તમારું ટૅબ્લેટ સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયું છે. તેની બૅટરી અપેક્ષા કરતાં વહેલા સમાપ્ત થઈ શકે છે. \n\nછેલ્લા સંપૂર્ણ ચાર્જ (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) પછી બૅટરીનો સૌથી વધુ વપરાશ કરતી ટોચની <xliff:g id="NUMBER">%1$d</xliff:g> ઍપ:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"તમારું ઉપકરણ સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયું છે. તેની બૅટરી અપેક્ષા કરતાં વહેલા સમાપ્ત થઈ શકે છે. \n\nછેલ્લા સંપૂર્ણ ચાર્જ (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) પછી બૅટરીનો સૌથી વધુ વપરાશ કરતી ટોચની <xliff:g id="NUMBER">%1$d</xliff:g> ઍપ:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">%1$d ઍપને પ્રતિબંધિત કરો</item>
       <item quantity="other">%1$d ઍપને પ્રતિબંધિત કરો</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"આ ઍપ બૅકગ્રાઉન્ડમાં બૅટરીનો વપરાશ કરી શકશે. તમારા ઉપકરણની બૅટરી અપેક્ષા કરતાં વહેલા સમાપ્ત થઈ શકે છે."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"કાઢી નાખો"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"રદ કરો"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"તમારા વપરાશના આધારે, સામાન્ય રીતે જ્યારે તમારી બૅટરી સંપૂર્ણપણે ચાર્જ કરેલી હોય ત્યારે લગભગ <xliff:g id="TIME_DURATION">%1$s</xliff:g> ચાલે છે.\n\nજો તમારે તમારી બૅટરીની આવરદા વધારવી જરૂરી હોય, તો બૅટરી સેવર ચાલુ કરો."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"જો તમારે તમારી બૅટરીની આવરદા વધારવી જરૂરી હોય, તો બૅટરી સેવર ચાલુ કરો"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"બૅટરી મેનેજર"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ઍપને આપમેળે મેનેજ કરો"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"જે ઍપનો તમે ઓછો ઉપયોગ કરતા હો, તેના માટે બૅટરી મર્યાદિત કરો"</string>
@@ -3075,38 +3094,28 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"વિઝ્યુઅલ સંકેતોને મંજૂરી આપો"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
+    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"નોટિફિકેશન"</string>
+    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"કસ્ટમ"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"કસ્ટમ સેટિંગ ચાલુ કરો"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"કસ્ટમ સેટિંગ કાઢી નાખો"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"દેખાશે"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"આંશિક રૂપે છુપાવેલ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"છુપાવેલ"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"કસ્ટમ પ્રતિબંધો"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"જ્યારે સ્ક્રીન ચાલુ હોઈ ત્યારે"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"જ્યારે સ્ક્રીન બંધ હોઈ ત્યારે"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"સાઉન્ડ અને વાઇબ્રેશન મ્યૂટ કરો"</string>
@@ -3151,13 +3160,40 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> નિયમો આપમેળે ચાલુ થઈ શકે છે</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> નિયમો આપમેળે ચાલુ થઈ શકે છે</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ઓકે"</string>
+    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
+    <skip />
+    <!-- no translation found for zen_sound_title (424490228488531372) -->
+    <skip />
+    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
+    <skip />
+    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
+    <skip />
+    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
+    <skip />
+    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
+    <skip />
+    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
+    <skip />
+    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
+    <skip />
+    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
+    <skip />
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"અપડેટ કરો"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"અપડેટ કરશો નહીં"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"તમારો ફોન તમને ફોકસ કરવામાં સહાય કરવા માટે ઘણું કરી શકે છે.\n\nનિમ્નલિખિત માટે સેટિંગ અપડેટ કરો:\n\n- નોટિફિકેશનો સંપૂર્ણપણે છુપાવો\n\n- સ્ટાર કરેલા સંપર્કો અને પુનરાવર્તિત કૉલરો તરફથી કૉલને મંજૂરી આપો"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"ખલેલ પાડશો નહીંને અપડેટ કરીએ?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"સેટિંગ"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"તમે આને સેટિંગમાં હજી પણ વધુ કસ્ટમાઇઝ કરી શકો છો."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"જ્યારે સ્ક્રીન સક્રિય હોય ત્યારે બ્લૉક કરો"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"જ્યારે સ્ક્રીન બંધ હોય ત્યારે બ્લૉક કરો"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"ખલેલ પાડશો નહીં, એ માત્ર સાઉન્ડ જ બ્લૉક કરતું નથી, એ સિવાય પણ ઘણું કરે છે જેમ કે વિઝ્યુઅલને બ્લૉક કરવા. આ ખરેખર સહાયરૂપ થાય છે જો તમે સુવાનો, ધ્યાન કેન્દ્રિત કરવાનો અથવા ફોન પર ઓછો સમય વ્યતિત કરવાનો પ્રયાસ કરી રહ્યાં હો."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"સાઉન્ડ અને વિઝ્યુઅલ બ્લૉક કરો"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"સ્ક્રીનને ચાલુ અથવા નોટિફિકેશનને સક્રિય કરશો નહીં"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ફોનની મૂળભૂત પ્રવૃત્તિ અને સ્ટેટસ સિવાય, કોઈપણ નોટિફિકેશન બતાવશો નહીં"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"કાર્યાલયની પ્રોફાઇલની ધ્વનિઓ"</string>
@@ -3328,21 +3364,42 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> થી <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"કૉલ્સ"</string>
+    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"સંદેશા"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"બધા સંદેશા"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"પસંદ કરેલ સંદેશા"</string>
+    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
+    <skip />
+    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
+    <skip />
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"કોઈની પણ તરફથી"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ફક્ત સંપર્કોના"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ફક્ત તારાંકિત સંપર્કોના"</string>
+    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
+    <skip />
     <string name="zen_mode_from_none" msgid="8219706639954614136">"કોઈ નહીં"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"એલાર્મ્સ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"મીડિયા"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ટચ સાઉન્ડ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"રિમાઇન્ડર"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ઇવેન્ટ્સ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"બધા કૉલર્સ"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"પસંદ કરેલ કૉલર્સ"</string>
+    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
+    <skip />
+    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
+    <skip />
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"પુનરાવર્તિત કૉલર્સ"</string>
+    <!-- no translation found for zen_mode_calls_summary_one (2867689575419791866) -->
+    <skip />
+    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
+    <skip />
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"જો <xliff:g id="MINUTES">%d</xliff:g> મીનિટના સમયગાળા દરમ્યાન તે જ વ્યક્તિ પાછી કૉલ કરે તો"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"કસ્ટમ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"આપમેળે ચાલુ"</string>
@@ -3612,7 +3669,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"આ ઍપ્લિકેશન દ્વારા બનાવાયેલ તમામ ખલેલ પહોંચાડશો નહિ નિયમો દૂર કરવામાં આવશે."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ઓપ્ટિમાઇઝ કરશો નહીં"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ઓપ્ટિમાઇઝ કરો"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"તમારી બૅટરીને વધુ ઝડપથી ખાલી કરી શકે છે"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"બહેતર બૅટરી આવરદા માટે ભલામણ કરેલ"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"બૅટરી ઓપ્ટિમાઇઝેશન્સને અવગણવા માટે <xliff:g id="APP">%s</xliff:g> ને મંજૂરી આપીએ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"કોઈ નહીં"</string>
@@ -3688,7 +3746,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"બેક અપ અક્ષમ કર્યું"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> પર અપડેટ કરેલ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"અપડેટ ઉપલબ્ધ છે"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"આ સેટિંગ બદલી શકાતી નથી"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ક્રિયાને મંજૂરી નથી"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"વૉલ્યૂમ બદલી શકાતું નથી"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"કૉલ કરવાની મંજૂરી નથી"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMSની મંજૂરી નથી"</string>
@@ -3878,7 +3936,8 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"લૉક સ્ક્રીન પરની માહિતી નિયંત્રિત કરો"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"નોટિફિકેશન કન્ટેન્ટ બતાવો અથવા છુપાવો"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"તમામ"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"સમર્થન અને ટિપ"</string>
+    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
+    <skip />
     <string name="developer_smallest_width" msgid="7516950434587313360">"સૌથી નાની પહોળાઈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"કોઈ ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનોએ પ્રીમિયમ SMS ઍક્સેસની વિનંતી કરી નથી"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"તમને પ્રીમિયમ SMS નો શુલ્ક લાગી શકે છે અને તમારા કૅરિઅર બિલ્સમાં ઉમેરવામાં આવશે. જો તમે કોઇ ઍપ્લિકેશન માટે પરવાનગી સક્ષમ કરો, તો તમે તે ઍપ્લિકેશનનો ઉપયોગ કરીને પ્રીમિયમ SMS મોકલવા માટે સમર્થ હશો."</string>
@@ -4071,6 +4130,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"મૂવી અને ટીવી ઍપ્લિકેશનો"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"કૅરિઅર જોગવાઈ માહિતી"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"કૅરિઅર જોગવાઈ ટ્રિગર કરો"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"નવું અને રોમાંચક શું છે?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"તમારા નવા ફોનની ઓળખ મેળવો"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"તમારા નવા ટેબ્લેટની ઓળખ મેળવો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1b5fb9e..4150850 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"सिम का इस्तेमाल करने के लिए अनुरोध"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके SIM कार्ड को ऐक्सेस करना चाहता है. SIM कार्ड की ऐक्सेस देने से कनेक्शन की अवधि तक आपके डिवाइस पर डेटा कनेक्टिविटी अक्षम हो जाएगी. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> को ऐक्सेस दें"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"दूसरे डिवाइस को \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' के रूप में दिखाई देता है"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"आपके डिवाइस"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नया डिवाइस जोड़ें"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"अपने टैबलेट को आस-पास के ब्लूटूथ डिवाइस से संपर्क करने की मंज़ूरी दें"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"ई-सिम रीसेट नहीं किया जा सकता."</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"किसी गड़बड़ी की वजह से ई-सिम रीसेट नहीं किया जा सकता."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"सभी डेटा मिटाएं (फ़ैक्ट्री रीसेट)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"इससे आपके टैबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"इससे आपके फ़ोन की "<b>"मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप इस समय नीचे दिए गए खातों में साइन इन किए हुए हैं:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">अत्यधिक समय का विलंब (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> मिसे)</item>
       <item quantity="other">अत्यधिक समय का विलंब (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> मिसे)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"घंटी बजने और सूचना आने के लिए वाइब्रेशन, बंद पर सेट है"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"घंटी बजने और सूचना आने के लिए वाइब्रेशन, कम पर सेट है"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"घंटी बजने और सूचना आने के लिए वाइब्रेशन, सामान्य पर सेट है"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"पूरा चार्ज होने के बाद से अब तक स्क्रीन का इस्तेमाल"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन के लिए खपत"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कैनिंग"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"(<xliff:g id="RELATIVE_TIME">^1</xliff:g>) पूरी तरह चार्ज होने के बाद से अब तक ऐप्लिकेशन का इस्तेमाल"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"(<xliff:g id="RELATIVE_TIME">^1</xliff:g>) बजे पूरी तरह चार्ज होने के बाद से अब तक डिवाइस का इस्तेमाल"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिवाइस को बैकग्राउंड में सक्रिय करना"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बार-बार जगह का अनुरोध कर रहा है"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन ठीक से काम नहीं कर रहे हैं"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"बैटरी अच्छी हालत में है"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ऐप्लिकेशन सामान्य रूप से काम कर रहे हैं"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"बहुत कम बैटरी बची है"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"बहुत कम बैटरी बची है"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"अपने फ़ोन की बैटरी लाइफ़ बेहतर बनाएं"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"टैबलेट को सामान्य से ज़्यादा इस्तेमाल किया गया"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"डिवाइस को सामान्य से ज़्यादा इस्तेमाल किया गया"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"बैटरी जल्दी ही खत्म हो जाएगी"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"आपका फ़ोन सामान्य से ज़्यादा इस्तेमाल किया गया है. आपके फ़ोन की बैटरी समय से पहले ही खत्म हो सकती है.\n\nपिछली बार पूरा चार्ज करने (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) के बाद से इस्तेमाल किए गए मुख्य <xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"आपका टैबलेट सामान्य से ज़्यादा इस्तेमाल किया गया है. आपके टैबलेट की बैटरी समय से पहले ही खत्म हो सकती है.\n\nपिछली बार पूरा चार्ज करने (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) के बाद से इस्तेमाल किए गए मुख्य <xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"आपका डिवाइस सामान्य से ज़्यादा इस्तेमाल किया गया है. आपके डिवाइस की बैटरी समय से पहले ही खत्म हो सकती है.\n\nपिछली बार पूरा चार्ज करने (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) के बाद से इस्तेमाल किए गए मुख्य <xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">%1$d ऐप्लिकेशन पर रोक लगाएं</item>
       <item quantity="other">%1$d ऐप्लिकेशन पर रोक लगाएं</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"यह ऐप्लिकेशन बैकग्राउंड में बैटरी इस्तेमाल कर पाएगा. हो सकता है कि आपके डिवाइस की बैटरी समय से पहले ही खत्म हो जाए."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"ऐप्लिकेशन से रोक हटाएं"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"अभी नहीं"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"आपके इस्तेमाल के हिसाब से, आपकी बैटरी पूरी चार्ज होने पर लगभग <xliff:g id="TIME_DURATION">%1$s</xliff:g> चलती है.\n\nअगर आप अपनी बैटरी लाइफ़ बढ़ाना चाहते हैं तो, बैटरी सेवर चालू करें."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"अगर आप अपनी बैटरी लाइफ़ बढ़ाना चाहते हैं तो, बैटरी सेवर चालू करें"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"बैटरी मैनेजर"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ऐप्लिकेशन अपने आप प्रबंधित होने की सुविधा"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"अक्सर इस्तेमाल न किए जाने वाले ऐप्लिकेशन को बैटरी इस्तेमाल करने से रोकें"</string>
@@ -3075,38 +3094,28 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"संकेत दिखाए जाने की अनुमति दें"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
+    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"सूचनाएं"</string>
+    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"पसंद के मुताबिक बनाएं"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"पसंद के मुताबिक बनाई गई सेटिंग चालू करें"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"पसंद के मुताबिक बनाई गई सेटिंग हटाएं"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"सूचनाएं दिखाई देंगी"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"कुछ सूचनाएं दिखाई नहीं देंगी"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"सूचनाएं दिखाई नहीं देंगी"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"अपनी पसंद के मुताबिक रोक लगाएं"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"स्क्रीन चालू होने पर"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"स्क्रीन बंद होने पर"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"आवाज़ और कंपन (वाइब्रेशन) म्यूट करें"</string>
@@ -3151,13 +3160,44 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> नियम अपने आप चालू हो सकते हैं</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> नियम अपने आप चालू हो सकते हैं</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ठीक है"</string>
+    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
+    <skip />
+    <!-- no translation found for zen_sound_title (424490228488531372) -->
+    <skip />
+    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
+    <skip />
+    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
+    <skip />
+    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
+    <skip />
+    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
+    <skip />
+    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
+    <skip />
+    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
+    <skip />
+    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_ok (4157146842078658361) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_no_update (3103752501952811308) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_description (4051020254348888576) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (4243599835234481809) -->
+    <skip />
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"सेटिंग"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"अाप सेटिंग में जाकर इस सुविधा में मनमुताबिक बदलाव कर सकते हैं."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"स्क्रीन चालू हाेने के दाैरान सूचनाएं दिखाने पर राेक लगाएं"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"स्क्रीन बंद हाेने के दाैरान सूचनाएं दिखाने पर राेक लगाएं"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"परेशान न करें सुविधा, सिर्फ़ अनचाही अावाज़ाें काे बंद नहीं करती बल्कि अनचाहे विज़ुअल काे भी राेकती है. यह तब भी मददगार साबित हाे सकती है, जब अाप साेने, ध्यान लगाने या अपना फ़ाेन कम इस्तेमाल करने की काेशिश कर रहे हाेते हैं."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"अनचाहे विज़ुअल अाैर अावाज़ाें पर राेक लगाएं"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"सूचनाएं पाने के लिए स्क्रीन को चालू न करें या डिवाइस को न जगाएं"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"फ़ाेन की बुनियादी गतिविधि अाैर स्थिति से जुड़ी सूचनाओं के अलावा काेई अाैर सूचना न दिखाएं"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"कार्य प्रोफ़ाइल की ध्वनियां"</string>
@@ -3328,21 +3368,42 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> से <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
+    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"मैसेज"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"सभी संदेश"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"चयनित संदेश"</string>
+    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
+    <skip />
+    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
+    <skip />
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"किसी से भी"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"सिर्फ़ संपर्कों से"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"सिर्फ़ तारांकित संपर्कों से"</string>
+    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
+    <skip />
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कोई नहीं"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"मीडिया"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"छूने पर आने वाली आवाज़ें"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इवेंट"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"सभी कॉल करने वाले (कॉलर)"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"चुनिंदा कॉल करने वाले (कॉलर)"</string>
+    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
+    <skip />
+    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
+    <skip />
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"बार-बार कॉल करने वाले (कॉलर)"</string>
+    <!-- no translation found for zen_mode_calls_summary_one (2867689575419791866) -->
+    <skip />
+    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
+    <skip />
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"अगर कोई व्यक्ति <xliff:g id="MINUTES">%d</xliff:g> मिनट के अंदर दोबारा कॉल करे"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"पसंद के मुताबिक"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूप से चालू"</string>
@@ -3612,7 +3673,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"इस ऐप के द्वारा, परेशान न करें के लिए बनाए गए सभी नियम निकाल दिए जाएंगे."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ऑप्‍टिमाइज़ ना करें"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ऑप्‍टिमाइज़ करें"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"इससे आपकी बैटरी अधिक तेज़ी से खाली हो सकती है"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"बेहतर बैटरी जीवनकाल के लिए सुझाया गया"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> को बैटरी ऑप्टिमाइज़ेशन को अनदेखा करने की अनुमति दें?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"कोई नहीं"</string>
@@ -3688,7 +3750,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"बैक अप बंद किया गया"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> में अपडेट किया गया"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"अपडेट उपलब्ध है"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"यह सेटिंग बदली नहीं जा सकती"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"कार्रवाई की अनुमति नहीं"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"कॉल की आवाज़ कम या ज़्यादा नहीं की जा सकती"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"कॉल करने की अनुमति नहीं है"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"मैसेज (एसएमएस) की अनुमति नहीं है"</string>
@@ -3878,7 +3940,8 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"लॉक स्क्रीन पर मौजूद जानकारी नियंत्रित करें"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना की सामग्री दिखाएं या छिपाएं"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"सभी"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"सहायता और सलाह"</string>
+    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
+    <skip />
     <string name="developer_smallest_width" msgid="7516950434587313360">"सबसे कम चौड़ाई की स्क्रीन सेट करें"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप ने प्रीमियम मैसेज (एसएमएस) की पहुंच का अनुरोध नहीं किया है"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम मैसेज (एसएमएस) के लिए आपको पैसे देने पड़ सकते हैं और इससे आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का बिल बढ़ जाएगा. अगर आप किसी ऐप के लिए अनुमति देते हैं, तो आप उस ऐप का इस्तेमाल करके प्रीमियम मैसेज (एसएमएस) भेज सकते हैं."</string>
@@ -4071,6 +4134,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"फ़िल्में और टीवी ऐप्लिकेशन"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की नेटवर्क से जुड़ी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नया और रोमांचक क्या है?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"अपने नए फ़ोन के बारे में अच्छी तरह जानें"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"अपने नए टैबलेट के बारे में अच्छी तरह जानें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 22126f9..9cca11e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -168,6 +168,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti SIM kartici. Dopuštanjem pristupa SIM kartici onemogućit će se podatkovna veza na uređaju za vrijeme povezanosti. Dopustite pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim uređajima vidljiv kao \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Dopustite tabletu da komunicira s Bluetooth uređajima u blizini"</string>
@@ -1466,6 +1468,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Poništavanje eSIM-ova nije uspjelo"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Poništavanje eSIM-ova nije uspjelo zbog pogreške."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
@@ -2018,6 +2022,8 @@
       <item quantity="few">Vrlo duga odgoda (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Vrlo duga odgoda (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Zvonjenje i obavijesti postavljeni na isključeno"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Zvonjenje i obavijesti postavljeni na nisko"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Zvonjenje i obavijesti postavljeni na srednje"</string>
@@ -2127,8 +2133,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Upotreba zaslona od potpunog punjenja"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za zaslon"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pretraživanje mobilnih mreža"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Upotreba aplikacija od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Upotreba uređaja od potpunog punjenja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2159,8 +2165,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Aktivira uređaj u pozadini"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Često traži lokaciju"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Aplikacije koje ne funkcioniraju dobro: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterija je u dobrom stanju"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikacije se izvode na uobičajen način"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacije se izvode na uobičajen način"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon troši bateriju u pozadini uobičajenom brzinom"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet troši bateriju u pozadini uobičajenom brzinom"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Uređaj troši bateriju u pozadini uobičajenom brzinom"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Slaba baterija"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Baterija će se uskoro isprazniti"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Poboljšajte trajanje baterije telefona"</string>
@@ -2175,9 +2183,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet se upotrebljava više nego obično"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Uređaj se upotrebljava više nego obično"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Baterija bi se uskoro mogla isprazniti"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Vaš se telefon upotrebljavao više nego obično. Baterija bi se mogla isprazniti brže nego što očekujete.\n\nNajkorištenije aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) od zadnjeg punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Vaš se tablet upotrebljavao više nego obično. Baterija bi se mogla isprazniti brže nego što očekujete.\n\nNajkorištenije aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) od zadnjeg punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Vaš se uređaj upotrebljavao više nego obično. Baterija bi se mogla isprazniti brže nego što očekujete.\n\nNajkorištenije aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) od zadnjeg punjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Ograničite %1$d aplikaciju</item>
       <item quantity="few">Ograničite %1$d aplikacije</item>
@@ -2211,8 +2222,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ta će aplikacija moći upotrebljavati bateriju u pozadini. Baterija bi se mogla isprazniti brže nego što očekujete."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ukloni"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Otkaži"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Na temelju vaše upotrebe vaša baterija obično traje otprilike <xliff:g id="TIME_DURATION">%1$s</xliff:g> kada je potpuno napunjena.\n\nAko trebate produljiti trajanje baterije, uključite Štednju baterije."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ako trebate produljiti trajanje baterije, uključite Štednju baterije"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Vaše aplikacije troše bateriju uobičajenom brzinom. Ako aplikacije budu prebrzo trošile bateriju, telefon će vam predložiti što biste mogli poduzeti.\n\nAko je razina baterije niska, možete uključiti Štednju baterije."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Vaše aplikacije troše bateriju uobičajenom brzinom. Ako aplikacije budu prebrzo trošile bateriju, tablet će vam predložiti što biste mogli poduzeti.\n\nAko je razina baterije niska, možete uključiti Štednju baterije."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Vaše aplikacije troše bateriju uobičajenom brzinom. Ako aplikacije budu prebrzo trošile bateriju, uređaj će vam predložiti što biste mogli poduzeti.\n\nAko je razina baterije niska, možete uključiti Štednju baterije."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Automatski upravljaj aplikacijama"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ograničava potrošnju baterije za aplikacije koje ne upotrebljavate često"</string>
@@ -3110,15 +3122,14 @@
     <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">"Blokiranje vizualnih ometanja"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dopusti vizualne signale"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ograničavanje obavijesti"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kada je uključen način Ne uznemiravaj"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obavijesti"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kada je uključen način Ne uznemiravaj"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Zanemari obavijesti"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Prikaži obavijesti, ali isključi zvuk i vibraciju"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Kada nove obavijesti stignu, telefon neće davati zvučne signale niti vibrirati"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Sakrij i zanemari obavijesti"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Obavijesti se uopće neće prikazivati"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Kada je značajka Ne uznemiravaj uključena, nećete vidjeti nove ni postojeće obavijesti. No obavijesti potrebne za osnovne aktivnosti i status telefona i dalje će se prikazivati."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Prikaži obavijesti tiho"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Obavijesti će se zanemariti"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Kada obavijesti stignu, telefon neće davati zvučne signale niti vibrirati."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sakrij obavijesti"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nećete vidjeti nove ni postojeće obavijesti"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Na telefonu se neće prikazivati nove ni postojeće obavijesti i neće biti zvučnih signala ni vibriranja. Obavijesti se neće prikazivati kada prijeđete prstom prema dolje od vrha zaslona.\n\nNapominjemo da će se obavijesti kritične za aktivnost i status telefona i dalje prikazivati."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Prilagođeno"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogući prilagođenu postavku"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ukloni prilagođenu postavku"</string>
@@ -3172,13 +3183,27 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> pravila mogu se uključiti automatski</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravila može se uključiti automatski</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"U redu"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Ponašanje"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Iznimke"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Raspored"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Zvuk i vibracija"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Kada je način Ne uznemiravaj uključen, zvučni signali i vibriranje bit će isključeni, osim za prethodno navedene stavke koje dopustite."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Zanemari sve osim"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Zanemareno"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Nije zanemareno"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Zanemareno, ali dopusti <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Zanemareno, ali dopusti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> i <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zanemareno, ali dopusti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Poruke, događaji i podsjetnici"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Ažuriraj"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Nemoj ažurirati"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefon vam može pomoći da se usredotočite.\n\nAžurirajte postavke:\n\n– da biste posve sakrili obavijesti\n\n– da biste dopustili pozive kontakata označenih zvjezdicom i pozivatelja koji vas nazovu više puta"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Želite li ažurirati način Ne uznemiravaj?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Postavke"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"To se može dodatno prilagoditi u postavkama."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokiraj kada je zaslon uključen"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokiraj kada je zaslon isključen"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Osim što blokira neželjene zvukove, način Ne uznemiravaj može blokirati i vizualne signale. To može biti korisno ako pokušavate spavati, usredotočiti se ili ograničiti vrijeme provedeno na telefonu."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokiraj zvukove i vizualne signale"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ne uključuj zaslon niti aktiviraj za obavijesti"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Uopće ne prikazuj obavijesti, osim osnovnih aktivnosti i statusa telefona"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvukovi radnog profila"</string>
@@ -3353,21 +3378,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Pozivi"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kada je način Ne uznemiravaj uključen, dolazni se pozivi blokiraju. Možete prilagoditi postavke da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Sve poruke"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Odabrane poruke"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Poruke"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Neke poruke"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od svakoga"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od kontakata"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata sa zvjezdicom"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Kontakti označeni zvjezdicom i ponovni pozivatelji"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kontakti i ponovni pozivatelji"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Samo ponovni pozivatelji"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Mediji"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Zvukovi dodirivanja"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivatelji"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Odabrani pozivatelji"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"svi"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakti"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakti označeni zvjezdicom"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Uzastopni pozivi"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Samo <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> i <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ako ista osoba nazove drugi put unutar <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Prilagođeno"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski uključi"</string>
@@ -3647,7 +3682,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Uklonit će se sva pravila Ne ometaj koja je postavila ova aplikacija."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne optimiziraj"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizacija"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Baterija se može brže isprazniti"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Preporučuje se za dulje trajanje baterije"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Želite li dopustiti aplikaciji <xliff:g id="APP">%s</xliff:g> da zanemari optimizacije baterije?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ništa"</string>
@@ -3724,7 +3760,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Sigurnosno kopiranje onemogućeno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ažuriran na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostupno je ažuriranje"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Ne možete promijeniti postavku"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Radnja nije dopuštena."</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Glasnoća se ne može promijeniti"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Pozivanje nije dopušteno"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS nije dopušten"</string>
@@ -3920,7 +3956,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Upravljanje informacijama na zaključanom zaslonu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikazivanje ili sakrivanje sadržaja obavijesti"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i savjeti"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Savjeti i podrška"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila pristup premium SMS-ovima"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS-ovi mogu se dodatno naplaćivati i povećat će vaš račun. Ako nekoj aplikaciji date to dopuštenje, moći ćete slati premium SMS-ove pomoću te aplikacije."</string>
@@ -4123,6 +4159,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o uslugama mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje usluga mobilnog operatera"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Što je novo i uzbudljivo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte svoj novi telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte svoj novi tablet"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8f49fd9..6f329b2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-hozzáférési kérelem"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"A következő eszköz szeretne hozzáférni az Ön SIM kártyájához: <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>. A hozzáférés megadásával letiltja eszközén az adatkapcsolatot a csatlakozás idejére. Hozzáférés megadása a következőnek: <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"A többi eszköz számára „<xliff:g id="DEVICE_NAME">^1</xliff:g>” néven jelenik meg"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Eszközei"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Új eszköz párosítása"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Táblagépe kommunikálhat a közeli Bluetooth-eszközökkel"</string>
@@ -1194,7 +1196,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Eszközazonosító"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Alapsáv verziója"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel verziója"</string>
-    <string name="build_number" msgid="3075795840572241758">"Build-szám"</string>
+    <string name="build_number" msgid="3075795840572241758">"Buildszám"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nem érhető el"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Állapot"</string>
     <string name="device_status" msgid="607405385799807324">"Állapot"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Nem lehet visszaállítani az eSIM-eket"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Hiba történt, így az eSIM-eket nem lehet visszaállítani."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókja"</li>\n<li>"a rendszer- és alkalmazásadatok és beállítások"</li>" \n"<li>"a letöltött alkalmazások"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Nagyon hosszú késleltetés (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Nagyon hosszú késleltetés (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Csengetés és értesítés kikapcsolva"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Csengetés és értesítés gyengére állítva"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Csengetés és értesítés közepesre állítva"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Képernyőhasználat teljes feltöltés óta"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"A képernyő energiafogyasztása"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Alkalmazáshasználat a teljes töltés óta (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Eszközhasználat a teljes töltés óta (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Eszköz felébresztése a háttérben"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Tartózkodási hely gyakori lekérése"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> nem megfelelően működő alkalmazás"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Az akkumulátor jó állapotban van"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Az alkalmazások megfelelően futnak"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Alacsony akkumulátorkapacitás"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Az akkumulátor üzemideje rövid"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Növelje a telefon akkumulátorának üzemidejét"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"A táblagépet többet használja a megszokottnál"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Az eszközt többet használja a megszokottnál"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Az akkumulátor hamarosan lemerül"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"A telefont többet használja a megszokottnál. A vártnál hamarabb lemerülhet az akkumulátor.\n\nA(z) <xliff:g id="NUMBER">%1$d</xliff:g> legtöbbet használt alkalmazás a legutóbbi töltés óta (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"A táblagépet többet használja a megszokottnál. A vártnál hamarabb lemerülhet az akkumulátor.\n\nA(z) <xliff:g id="NUMBER">%1$d</xliff:g> legtöbbet használt alkalmazás a legutóbbi töltés óta (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Az eszközt többet használja a megszokottnál. A vártnál hamarabb lemerülhet az akkumulátor.\n\nA(z) <xliff:g id="NUMBER">%1$d</xliff:g> legtöbbet használt alkalmazás a legutóbbi töltés óta (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d alkalmazás korlátozása</item>
       <item quantity="one">%1$d alkalmazás korlátozása</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ez az alkalmazás a háttérben is használhatja az akkumulátort. Emiatt az akkumulátor a vártnál gyorsabban lemerülhet."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Eltávolítás"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Mégse"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"A használat alapján az akkumulátorkapacitás teljes feltöltés esetén megközelítőleg <xliff:g id="TIME_DURATION">%1$s</xliff:g>.\n\nHa hosszabb üzemidőre van szüksége, kapcsolja be az Akkumulátorkímélő módot."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ha hosszabb akkumulátor-üzemidőre van szüksége, kapcsolja be az Akkumulátorkímélő módot."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Akkumulátorkezelő"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Alkalmazások automatikus kezelése"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Korlátozza a nem gyakran használt alkalmazások akkumulátorhasználatát"</string>
@@ -2318,9 +2337,7 @@
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automatikus bekapcsolás"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Soha"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> töltöttségnél"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_percentage (723291197508049369) -->
-    <skip />
+    <string name="battery_percentage" msgid="723291197508049369">"Az akkumulátor töltöttségi szintje (%%)"</string>
     <string name="battery_percentage_description" msgid="8511658577507384014">"Megjeleníti az akkumulátor százalékban kifejezett töltöttségi szintjét az állapotsoron"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Folyamatstatisztikák"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"A futó folyamatok statisztikái"</string>
@@ -3077,15 +3094,14 @@
     <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">"Megjelenő értesítések tiltása"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizuális jelek engedélyezése"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Értesítések korlátozása"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Ha a „Ne zavarjanak” mód aktív"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Értesítések"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Ha a „Ne zavarjanak” mód aktív"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Értesítések némítása"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Értesítések megjelenítése, de a hangok és a rezgés kikapcsolása"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Amikor új értesítés érkezik, a telefon nem ad ki hangot, és nem rezeg"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Értesítések elrejtése és némítása"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Egyáltalán nem jelennek meg értesítések"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Ha bekapcsolja a „Ne zavarjanak” módot, nem jelennek meg az új és a már meglévő értesítések. A telefon alapvető funkcióival és állapotával kapcsolatos értesítések azonban így is megjelennek."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Értesítések hangtalan megjelenítése"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Az értesítések némítva lesznek"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Amikor értesítés érkezik, a telefon nem ad ki hangot, és nem rezeg."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Értesítések elrejtése"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nem jelennek meg az új és a már meglévő értesítések"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"A telefonja nem jelenít meg új vagy meglévő értesítéseket, és nem csörög vagy rezeg. Az értesítések nem jelennek meg, amikor lecsúsztatja ujját a képernyő tetejétől.\n\nA telefon funkcióival és állapotával kapcsolatos fontos értesítések azonban így is megjelennek."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Egyéni"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Egyéni beállítás engedélyezése"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Egyéni beállítás törlése"</string>
@@ -3122,8 +3138,8 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Az egyik alkalmazás (<xliff:g id="APP_NAME">%s</xliff:g>) automatikusan bekapcsolta a „Ne zavarjanak” módot"</string>
     <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Csak prioritásos"</string>
     <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Be / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Ki / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Be/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Ki/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Ki"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Be"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Mindig kérdezzen rá (kivéve, ha automatikusan bekapcsol)"</string>
@@ -3137,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> szabály automatikusan bekapcsolhat</item>
       <item quantity="one">1 szabály automatikusan bekapcsolhat</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Viselkedés"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Kivételek"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Ütemezés"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Hang és rezgés"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Ha a „Ne zavarjanak” mód aktív, akkor a hang és a rezgés némítva lesznek, kivéve a fent engedélyezett elemeket."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Az összes némítása, kivéve a következőket:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Némítva"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Nincs némítva"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Némítva, de a következő engedélyezése: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Némítva, de a(z) <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> és a(z) <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> hangjainak engedélyezése"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Némítva, de a(z) <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> és <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> hangjainak engedélyezése"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Üzenetek, események és emlékeztetők"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Ha a „Ne zavarjanak” mód aktív, akkor az SMS-ek, emlékeztetők és események némítva lesznek, kivéve a fent engedélyezett elemeket. Az üzenetek beállításainak megadásával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Frissítés"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ne frissítsen"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefonja segítségével még jobban összpontosíthat feladataira.\n\nA beállítások frissítésével a következőket teheti meg:\n\n– Az értesítések teljes elrejtése\n\n– A csillagozott névjegyektől és a többször hívó személyektől érkező hívások engedélyezése"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Frissíti a Ne zavarjanak módot?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Beállítások"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Ezt még jobban személyre szabhatja a Beállításokban."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Letiltás bekapcsolt képernyőnél"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Letiltás kikapcsolt képernyőnél"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"A Ne zavarjanak mód többre is képes, mint a kéretlen hangok elnémítása – a vizuális jelzéseket is le tudja tiltani. Ez hasznos lehet, ha aludni vagy koncentrálni próbál, illetve korlátozni szeretné a telefon használatával eltöltött időt."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Hangok és vizuális jelzések letiltása"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ne kapcsoljon be a kijelző, illetve ne ébredjen fel az értesítéseknél"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Semmilyen értesítés ne jelenjen meg (az alapvető telefonos tevékenységek és az állapottal kapcsolatos értesítések kivételével)"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Munkaprofil hangebállításai"</string>
@@ -3314,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Hívások"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Ha a „Ne zavarjanak” mód aktív, akkor a bejövő hívások tiltva vannak. A beállítások módosításával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Üzenetek"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Minden üzenet"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Kijelölt üzenetek"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Üzenetek"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Bizonyos üzenetek"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Bárkitől"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Csak a névjegyek között szereplőktől"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Csak a megcsillagozott névjegyektől"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"A csillaggal megjelölt névjegyektől és az ismétlődő hívóktól"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"A névjegyektől és az ismétlődő hívóktól"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Csak az ismétlődő hívóktól"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Senkitől"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Riasztások"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Média"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Érintési hangok"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Emlékeztetők"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Események"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Minden hívó"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Kijelölt hívók"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"bárki"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"névjegyek"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"csillaggal megjelölt névjegyek"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Többször hívó személyek"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Csak a következőktől: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Csak a következőktől: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> és <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ha <xliff:g id="MINUTES">%d</xliff:g> percen belül másodjára hív ugyanaz a személy"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Egyéni"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Auto. bekapcsolás"</string>
@@ -3598,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Az alkalmazás által létrehozott összes „Ne zavarjanak” szabály eltávolításra kerül."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ne legyen optimalizálva"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimalizálás"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Előfordulhat, hogy az akkumulátor gyorsabban merül le."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Ajánlott a hosszabb akkumulátor-üzemidő érdekében."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Engedélyezi, hogy a(z) <xliff:g id="APP">%s</xliff:g> figyelmen kívül hagyja az akkumulátoroptimalizálást?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nincs"</string>
@@ -3674,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Biztonsági mentés kikapcsolva"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"A következőre frissítve: Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Rendelkezésre áll frissítés"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"A beállítás nem módosítható"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Nem engedélyezett művelet"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"A hangerő nem módosítható"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"A hívásindítás nem engedélyezett"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Az SMS-ezés nem engedélyezett"</string>
@@ -3864,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"A lezárási képernyő adatainak kezelése"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Értesítéstartalom megjelenítése vagy elrejtése"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Összes"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Súgó és tippek"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tippek és támogatás"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Legkeskenyebb szélesség"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Egy telepített alkalmazás sem kért hozzáférést a Prémium sms-ekhez"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"A Prémium sms-ek használata pénzbe kerülhet Önnek, és a szolgáltató által kiállított számlák végösszegét növeli. Ha engedélyt ad valamelyik alkalmazásnak, akkor azzal lehetősége lesz prémium sms-eket küldeni."</string>
@@ -4057,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmes és tévés alkalmazások"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Információ a szolgáltatói hozzáférésről"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Szolgáltatói ellátás aktiválása"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mi új és említésre méltó?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Az új telefon bemutatójának megtekintése"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Az új táblagép bemutatójának megtekintése"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 5a0cd75..73817f3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM քարտից օգտվելու հարցում"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> սարքը ցանկանում է օգտվել ձեր SIM քարտի տվյալներից: Եթե թույլ տաք օգտվել SIM քարտից, տվյալների կապակցելիությունը կանջատվի սարքի վրա կապակցման ընթացքում: Թույլատրել <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> սարքին"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Մյուս սարքերին տեսանելի է որպես «<xliff:g id="DEVICE_NAME">^1</xliff:g>»"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ձեր սարքերը"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Նոր սարքի զուգակցում"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Թույլատրել պլանշետին միանալ մոտակայքում գտնվող Bluetooth սարքերին"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Հնարավոր չէ վերակայել էլեկտրոնային SIM քարտերը"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Սխալի պատճառով հնարավոր չէ վերակայել էլեկտրոնային SIM քարտերը:"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Ջնջել բոլոր տվյալները (գործարանային վերակայում)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Սա կջնջի բոլոր տվյալները ձեր պլանշետի "<b>" ներքին պահոցից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Կջնջվեն բոլոր տվյալները ձեր սարքի "<b>"ներքին հիշողությունից"</b>", ներառյալ`\n\n"<li>"ձեր Google հաշիվը"</li>\n<li>"համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"ներբեռնված հավելվածները"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Հաշիվներն այս սարքում՝\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Շատ երկար հապաղում (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> մվ)</item>
       <item quantity="other">Շատ երկար հապաղում (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> մվ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Զանգի ու ծանուցումների թրթռոցն անջատած է"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Զանգի ու ծանուցումների համար ընտրված է ցածր թրթռոց"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Զանգի ու ծանուցումների համար ընտրված է միջին թրթռոց"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Էկրանի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Էկրան"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Բջջային ցանցի որոնում"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Հավելվածների կողմից մարտկոցի օգտագործումը վերջինիս լրիվ լիցքավորումից հետո (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Սարքի բաղադրիչների կողմից կողմից մարտկոցի օգտագործումը վերջինիս լրիվ լիցքավորումից հետո (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Սարքը հանում է քնի ռեժիմից ֆոնում"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Հայցում է տեղադրության տվյալները շատ հաճախ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> հավելված ցուցաբերում է արտասովոր պահվածք"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Մարտկոցը լավ վիճակում է"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Հավելվածների աշխատանքում շեղումներ չեն հայտնաբերվել"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Մարտկոցի լիցքը բավարար չէ"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Մարտկոցի լիցքը շուտով կսպառվի"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Երկարացրեք հեռախոսի մարտկոցի աշխատաժամանակը"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Պլանշետը սովորականից շատ է էներգիա օգտագործել"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Սարքը սովորականից շատ է էներգիա օգտագործել"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Մարտկոցի լիցքը շուտով կարող է սպառվել"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Ձեր հեռախոսը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nՎերջին լիցքավորումից հետո ամենից շատ օգտագործված <xliff:g id="NUMBER">%1$d</xliff:g> հավելվածները (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)՝"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Ձեր պլանշետը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nՎերջին լիցքավորումից հետո ամենից շատ օգտագործված <xliff:g id="NUMBER">%1$d</xliff:g> հավելվածները (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)՝"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Ձեր սարքը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nՎերջին լիցքավորումից հետո ամենից շատ օգտագործված <xliff:g id="NUMBER">%1$d</xliff:g> հավելվածները (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)՝"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Սահմանափակել %1$d հավելված</item>
       <item quantity="other">Սահմանափակել %1$d հավելված</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Այս հավելվածը կկարողանա օգտագործել մարտկոցը ֆոնային ռեժիմում, ինչի պատճառով դրա լիցքը կարող է ավելի շուտ սպառվել:"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ջնջել"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Չեղարկել"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Կախված օգտագործման եղանակից՝ ձեր մարտկոցի լրիվ լիցքը սովորաբար <xliff:g id="TIME_DURATION">%1$s</xliff:g> է բավականացնում:\n\nՍարքի աշխատանքը երկարացնելու համար միացրեք մարտկոցի տնտեսումը:"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Սարքի աշխատանքը երկարացնելու համար միացրեք մարտկոցի տնտեսումը:"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Մարտկոցի կառավարիչ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Հավելվածների ավտոմատ կառավարում"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Սահմանափակել հազվադեպ օգտագործվող հավելվածների աշխատանքը"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Թույլատրել տեսողական ազդանշանները"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ծանուցումների սահմանափակումներ"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Երբ «Չանհանգստացնել» ռեժիմը միացված է"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Ծանուցումներ"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Երբ «Չանհանգստացնել» ռեժիմը միացված է"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Անջատել ծանուցումների ձայնը"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Ցուցադրել ծանուցումները, բայց անջատել դրանց ձայնն ու թրթռոցը"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Նոր ծանուցումները կստացվեն առանց ձայնի և թրթռոցի"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Թաքցնել ծանուցումները և անջատել դրանց ձայնը"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Չցուցադրել ծանուցումներ"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Երբ միացված է «Չանհանգստացնել» ռեժիմը, բոլոր ծանուցումները կթաքցվեն, բացառությամբ՝ հեռախոսի հիմնական գործառույթների աշխատանքի համար անհրաժեշտ ծանուցումների։"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Ցույց տալ ծանուցումներն առանց ձայնային ազդանշանի"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ծանուցումների ձայնը կանջատվի"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Երբ դուք ծանուցումներ ստանաք, հեռախոսում չի միանա ձայնային ազդանշան կամ թրթռոց:"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Թաքցնել ծանուցումները"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Դուք չեք տեսնի նոր և առկա ծանուցումները"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ձեր հեռախոսում չեն ցուցադրվի նոր ու առկա ծանուցումները, և չի միանա ձայնային ազդանշան կամ թրթռոց: Ծանուցումները չեն հայտնվի, երբ դուք էկրանի վերևից մատը սահեցնեք ներքև:\n\nՆկատի առեք, որ հեռախոսի աշխատանքի ու կարգավիճակի մասին կարևոր ծանուցումները նախկինի պես կցուցադրվեն:"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Հատուկ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Միացնել հատուկ կարգավորումները"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Անջատել հատուկ կարգավորումները"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> կանոն կարող է ավտոմատ միանալ</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> կանոն կարող է ավտոմատ միանալ</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Եղավ"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Կարգավորում"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Բացառություններ"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Ժամանակացույց"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Ձայն և թրթռոց"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"«Չանհանգստացնել» ռեժիմում ձայնն ու թրթռոցը անջատվում են: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը:"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Անջատել ձայնը բոլորի համար, բացի հետևյալ կետերից՝"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Անձայն"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ձայնը միացված է"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Ձայնն անջատած է: Միայն թույլատրել <xliff:g id="SOUND_TYPE">%1$s</xliff:g>ը"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Ձայնն անջատած է: Միայն թույլատրել <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ը և <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ը"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ձայնն անջատած է: Միայն թույլատրել <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ը, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ը և <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ը"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Հաղորդագրություններ, իրադարձություններ և հիշեցումներ"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"«Չանհանգստացնել» ռեժիմում հաղորդագրությունների, հիշեցումների և իրադարձությունների համար ձայնն անջատվում է: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը: Դուք կարող եք փոփոխել հաղորդագրությունների կարգավորումները, որպեսզի ձեր ընկերները, ընտանիքի անդամները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Թարմացնել"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Չթարմացնել"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Ձեր հեռախոսը կարող է օգնել ձեզ կենտրոնանալ:\n\nԹարմացրեք կարգավորումները, որպեսզի՝\n\n– Թաքցնեք բոլոր ծանուցումները\n\n– Թույլատրեք զանգերը աստղանշված կոնտակտներից և կրկնակի զանգողներից"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Թարմացնե՞լ «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Կարգավորումներ"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Այս պարամետրի մյուս գործառույթները կարող եք փոխել կարգավորումներում:"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Արգելափակել, երբ էկրանը միացված է"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Արգելափակել, երբ էկրանն անջատված է"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"«Չանհանգստացնել» ռեժիմում անջատվում են ոչ միայն անցանկալի ձայները, այլ նաև տեքստային ծանուցումները: Այս գործառույթը հարմար է օգտագործել, երբ ուզում եք քնել, կենտրոնանալ կամ սահմանափակել հեռախոսի օգտագործումը:"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Անջատել ձայնային և տեքստային ծանուցումները"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Չմիացնել էկրանը և ցույց չտալ ծանուցումները"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ցուցադրել ծանուցումներ միայն հեռախոսի հիմնական գործառույթների համար"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Աշխատանքային պրոֆիլի ձայները"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>-ից <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Զանգեր"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"«Չանհանգստացնել» ռեժիմում մուտքային զանգերն արգելափակված են: Փոփոխեք կարգավորումները, որպեսզի ձեր մտերիմները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Հաղորդագրություններ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Բոլոր հաղորդագրությունները"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Ընտրված հաղորդագրություններ"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Հաղորդագրություններ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Որոշ հաղորդագրություններ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Ցանկացած զանգողից"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Միայն կոնտակտներից"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Միայն աստղանշված կոնտակտներից"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Աստղանշված կոնտակտներից և մշտական զանգողներից"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Կոնտակտներից և մշտական զանգողներից"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Միայն մշտական զանգողներից"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ոչ ոքից"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Զարթուցիչ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Մեդիա"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Հպման ձայներ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Հիշեցումներ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Միջոցառումներ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Բոլոր զանգողները"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Ընտրված զանգողներ"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"բոլորը"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"կոնտակտներ"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"աստղանշված կոնտակտներ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Կրկնվող զանգեր"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Միայն <xliff:g id="CALLER_TYPE">%1$s</xliff:g>ից"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Միայն <xliff:g id="CALLER_TYPE">%1$s</xliff:g>ից և <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>ից"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Եթե նույն անձը <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում նորից է զանգում"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Այլ ձայներ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ավտոմատ միացնել"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Այս հավելվածի կողմից ստեղծված բոլոր «Չանհանգստացնել» կանոնները կհեռացվեն:"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Չօպտիմալացնել"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Օպտիմալացնել"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Մարտկոցի լիցքը կարող է ավելի արագ սպառվել"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Խորհուրդ է տրվում մարտկոցի աշխատանքի ժամանակը երկարացնելու համար"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Թույլ տա՞լ <xliff:g id="APP">%s</xliff:g> հավելվածին արագ սպառել մարտկոցի լիցքը:"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ոչ մեկը"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Պահուստավորումն անջատված է"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Տեղադրվել է Android <xliff:g id="VERSION">%1$s</xliff:g> տարբերակը"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Հասանելի է նոր տարբերակը"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Հնարավոր չէ փոխել կարգավորումը"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Գործողությունը չի թույլատրվում"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Հնարավոր չէ փոխել ձայնի ուժգնությունը"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Զանգելն արգելված է"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ների ուղարկումն արգելված է"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Կառավարեք կողպէկրանին հայտնվող տեղեկությունները"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ցույց տալ կամ թաքցնել ծանուցման բովանդակությունը"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Բոլորը"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Օգնություն և խորհուրդներ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Խորհուրդներ և օգնություն"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ամենափոքր լայնությունը"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Տեղադրված հավելվածներից ոչ մեկը վճարովի SMS-ների օգտագործման հարցում չի կատարել"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Վճարովի SMS-ները կարող են լրացուցիչ ծախսեր առաջացնել: Հավելվածին թույտվություն տալու դեպքում կկարողանաք դրա միջոցով վճարովի SMS-ներ ուղարկել։"</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Ֆիլմեր և սերիալներ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Օպերատորի նախապատրաստման տվյալներ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Գործարկել օպերատորի նախապատրաստումը"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ի՞նչ նորույթներ կան:"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ծանոթացեք ձեր նոր հեռախոսին"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ծանոթացեք ձեր նոր պլանշետին"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index aa2ae9a..4edec4f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ingin mengakses kartu SIM. Memberi akses ke kartu SIM akan menonaktifkan konektivitas data di perangkat selama tersambung. Berikan akses ke <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Terlihat sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>” oleh perangkat lain"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Perangkat Anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sambungkan perangkat baru"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Memungkinkan tablet Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Tidak dapat menyetel ulang eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM tidak dapat disetel ulang karena terjadi error."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Reset ke setelan pabrik"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl yang didownload"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Penundaan sangat lama (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> md)</item>
       <item quantity="one">Penundaan sangat lama (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> md)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Dering &amp; notifikasi disetel ke nonaktif"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Dering &amp; notifikasi disetel ke rendah"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Dering &amp; notifikasi disetel ke sedang"</string>
@@ -2050,7 +2056,7 @@
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Mengamati tindakan Anda"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Menerima notifikasi saat Anda berinteraksi dengan aplikasi."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Mengetuk Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="2247101878627941561">"Menge-tap Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Layanan tidak dipilih"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan layar sejak pengisian baterai penuh terakhir"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumsi layar"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Penggunaan aplikasi sejak baterai diisi penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Penggunaan perangkat sejak baterai diisi penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Mengaktifkan perangkat di latar belakang"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Meminta informasi lokasi terlalu sering"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikasi mengalami gangguan"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterai dalam keadaan baik"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikasi berjalan normal"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Kapasitas baterai rendah"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Masa pakai baterai kurang lama"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Tingkatkan masa pakai baterai ponsel"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet digunakan lebih lama dari biasanya"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Perangkat digunakan lebih lama dari biasanya"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Baterai mungkin akan segera habis"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Ponsel sudah terlalu lama digunakan. Baterai mungkin lebih cepat habis dari biasanya.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> aplikasi yang paling banyak menggunakan baterai sejak pengisian daya penuh terakhir(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablet sudah terlalu lama digunakan. Baterai mungkin lebih cepat habis dari biasanya.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> aplikasi yang paling banyak menggunakan baterai sejak pengisian daya penuh terakhir(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Perangkat sudah terlalu lama digunakan. Baterai mungkin lebih cepat habis dari biasanya.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> aplikasi yang paling banyak menggunakan baterai sejak pengisian daya penuh terakhir(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Batasi %1$d aplikasi</item>
       <item quantity="one">Batasi %1$d aplikasi</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Aplikasi ini dapat menggunakan baterai di background. Baterai mungkin lebih cepat habis dari biasanya."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Hapus"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Batal"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Berdasarkan penggunaan, baterai biasanya bertahan kira-kira <xliff:g id="TIME_DURATION">%1$s</xliff:g> jika diisi penuh.\n\nJika Anda perlu memperpanjang masa pakai baterai, aktifkan Penghemat Baterai."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Jika Anda perlu memperpanjang masa pakai baterai, aktifkan Penghemat Baterai"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Pengelola Baterai"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Kelola aplikasi secara otomatis"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Batasi baterai untuk aplikasi yang tidak sering digunakan"</string>
@@ -3075,15 +3094,14 @@
     <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">"Blokir gangguan visual"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Izinkan sinyal visual"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Batasi notifikasi"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Saat mode Jangan Ganggu diaktifkan"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifikasi"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Saat mode Jangan Ganggu diaktifkan"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Matikan suara notifikasi"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Tampilkan notifikasi, namun matikan suara &amp; getaran"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Jika ada notifikasi baru, ponsel tidak akan mengeluarkan suara atau getaran"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Sembunyikan &amp; matikan suara notifikasi"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Notifikasi tidak akan muncul sama sekali"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Anda tidak akan melihat notifikasi baru atau yang sudah ada jika mode Jangan Ganggu aktif. Namun, notifikasi yang diperlukan untuk aktivitas dasar ponsel dan status akan tetap muncul."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tampilkan notifikasi tanpa suara"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifikasi akan dimatikan suaranya"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Jika ada notifikasi, ponsel tidak akan mengeluarkan suara atau bergetar."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sembunyikan notifikasi"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Anda tidak akan melihat notifikasi baru atau yang sudah ada"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ponsel tidak akan menampilkan notifikasi baru atau yang sudah ada, dan tidak akan mengeluarkan suara atau bergetar. Notifikasi tidak akan muncul jika Anda menggeser layar dari atas ke bawah.\n\nPerlu diingat, notifikasi penting untuk aktivitas dan status ponsel tetap akan muncul."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Kustom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktifkan setelan kustom"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Hapus setelan kustom"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> aturan dapat aktif secara otomatis</item>
       <item quantity="one">1 aturan dapat aktif secara otomatis</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Oke"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Perilaku"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Pengecualian"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Jadwal"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Suara &amp; getaran"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Jika mode Jangan Ganggu diaktifkan, suara dan getaran akan dimatikan, kecuali untuk item yang Anda izinkan di atas."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Matikan semua kecuali"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Dimatikan"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Tidak dimatikan"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Dimatikan, namun mengizinkan <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Dimatikan, namun mengizinkan <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> dan <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Dimatikan, namun mengizinkan <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, dan <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Pesan, acara &amp; pengingat"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Jika mode Jangan Ganggu diaktifkan, pesan, pengingat, dan acara akan dimatikan suara dan getarannya, kecuali item yang Anda izinkan di atas. Anda dapat menyesuaikan setelan pesan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Perbarui"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Jangan diperbarui"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Ponsel dapat melakukan berbagai hal untuk membantu agar Anda fokus.\n\nPerbarui setelan ke:\n\n- Sembunyikan notifikasi sepenuhnya\n\n- Izinkan panggilan dari kontak berbintang dan penelepon berulang"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Perbarui mode Jangan Ganggu?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Setelan"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Anda dapat menyesuaikannya lebih lanjut di Setelan."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokir saat layar menyala"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokir saat layar mati"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Mode Jangan Ganggu tidak hanya dapat memblokir suara yang tidak diinginkan, tetapi juga memblokir visual. Hal ini mungkin berguna jika Anda mencoba untuk tidur, fokus, atau membatasi waktu penggunaan ponsel."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blok suara dan visual"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Jangan nyalakan layar ataupun aktifkan jika ada notifikasi"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Jangan tampilkan notifikasi sama sekali, kecuali untuk aktivitas dan status ponsel dasar"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Suara profil kerja"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> sampai <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Panggilan telepon"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Jika mode Jangan Ganggu diaktifkan, panggilan masuk diblokir. Anda dapat menyesuaikan setelan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pesan"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Semua pesan"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Pesan yang dipilih"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Pesan"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Beberapa pesan"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Dari siapa saja"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Hanya dari kontak"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Hanya dari kontak berbintang"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Dari kontak berbintang dan penelepon berulang"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Dari kontak dan penelepon berulang"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Hanya dari penelepon berulang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tidak ada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Suara sentuhan"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pengingat"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua penelepon"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Penelepon yang dipilih"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"semua orang"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontak"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontak yang berbintang"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Penelepon berulang"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Hanya dari <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Dari <xliff:g id="CALLER_TYPE">%1$s</xliff:g> dan <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jika orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Khusus"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatis aktif"</string>
@@ -3393,7 +3435,7 @@
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Membuka link"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Buka link yang didukung"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Buka tanpa perlu bertanya"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Tautan yang didukung"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Link yang didukung"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Default lainnya"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan di <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Penyimpanan internal"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Semua aturan Jangan Ganggu yang dibuat oleh aplikasi ini akan dihapus."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Jangan optimalkan"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimalkan"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Dapat menghabiskan baterai lebih cepat"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Disarankan agar baterai lebih tahan lama"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Izinkan <xliff:g id="APP">%s</xliff:g> untuk mengabaikan pengoptimalan baterai?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Tidak ada"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup dinonaktifkan"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Diupdate ke Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ada update"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Setelan ini tidak dapat diubah"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Tindakan tidak diizinkan"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Volume tidak dapat diubah"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Menelepon tidak diizinkan"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS tidak diizinkan"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrol info di layar kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Menampilkan atau menyembunyikan konten notifikasi"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Dukungan &amp; tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tips &amp; dukungan"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Tidak ada aplikasi yang terpasang yang meminta akses SMS Premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium mungkin memerlukan biaya dan akan menambah tagihan operator. Jika izin aplikasi diaktifkan, Anda dapat mengirim SMS premium menggunakan aplikasi tersebut."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikasi film &amp; TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Info Provisioning Operator"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Memicu Provisioning Operator"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apa yang baru dan menarik?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ikuti tur tentang ponsel baru Anda"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ikuti tur tentang tablet baru Anda"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 57e87f8..98d235d 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Beiðni um aðgang að SIM-korti"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill fá aðgang að SIM-kortinu þínu. Ef þú veitir aðgang að SIM-kortinu er slökkt á gagnatengingu tækisins á meðan tengingin varir. Veita <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> aðgang"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Sýnilegt öðrum tækjum sem „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tækin þín"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Para nýtt tæki"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Leyfa spjaldtölvunni þinni að eiga í samskiptum við nálæg Bluetooth-tæki"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Ekki er hægt að endurstilla eSIM-kort"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Villa kom í veg fyrir endurstillingu eSIM-kortanna."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Eyða öllum gögnum (núllstilla)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Mjög löng töf (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> msek.)</item>
       <item quantity="other">Mjög löng töf (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> msek.)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Slökkt á titringi símtala og tilkynninga"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Stillt á lítinn titring símtala og tilkynninga"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Stillt á miðlungsmikinn titring símtala og tilkynninga"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjánotkun frá síðustu fullu hleðslu"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Orkunotkun skjásins"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Notkun forrita frá fullri hleðslu (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Notkun tækis frá fullri hleðslu (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Vekur tækið í bakgrunni"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Biður oft um staðsetningu"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> forrit vinna ekki rétt"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Rafhlaða er í góðu ástandi"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Forrit keyra eðlilega"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Lítil hleðsla á rafhlöðu"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Rafhlaða er ekki með góða endingu"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Auktu rafhlöðuendingu símans"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Spjaldtölva notuð meira en venjulega"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Tæki notað meira en venjulega"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Rafhlaðan gæti tæmst bráðlega"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Síminn hefur verið notaður meira en venjulega. Rafhlaðan gæti tæmst fyrr en ella.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> forrit með mestu rafhlöðunotkunina frá síðustu hleðslu (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Spjaldtölvan hefur verið notuð meira en venjulega. Rafhlaðan gæti tæmst fyrr en ella.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> forrit með mestu rafhlöðunotkunina frá síðustu hleðslu (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Tækið hefur verið notað meira en venjulega. Rafhlaðan gæti tæmst fyrr en ella.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> forrit með mestu rafhlöðunotkunina frá síðustu hleðslu (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Takmarka %1$d forrit</item>
       <item quantity="other">Takmarka %1$d forrit</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Þetta forrit getur notað rafhlöðuna í bakgrunni. Rafhlaðan gæti tæmst hraðar en venjulega."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Fjarlægja"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Hætta við"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Miðað við notkun þína endist rafhlaðan þín yfirleitt í <xliff:g id="TIME_DURATION">%1$s</xliff:g> þegar hún er hlaðin að fullu.\n\nKveiktu á rafhlöðusparnaði ef þú þarft að auka endingu rafhlöðunnar."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Kveiktu á rafhlöðusparnaði ef þú þarft að auka endingu rafhlöðunnar"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Rafhlöðustjórnun"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Stjórna forritum sjálfkrafa"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Takmarka rafhlöðunotkun forrita sem þú notar sjaldan"</string>
@@ -3075,15 +3094,14 @@
     <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">"Útiloka sjónrænt áreiti"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Leyfa sjónræn merki"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Takmarka tilkynningar"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Þegar kveikt er á „Ónáðið ekki“"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Tilkynningar"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Þegar kveikt er á „Ónáðið ekki“"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Slökkva á tilkynningum"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Sýna tilkynningar en þagga hljóð og titring"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Þegar nýjar tilkynningar berast mun síminn hvorki gefa frá sér hljóð né titra"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Fela og þagga tilkynningar"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Engar tilkynningar munu birtast"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Þú munt ekki sjá nýjar eða fyrirliggjandi tilkynningar þegar kveikt er á „Ónáðið ekki“. Tilkynningar um grunnvirkni og stöðu símans verða áfram sýnilegar."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Sýna tilkynningar án hljóðs"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ekkert mun heyrast þegar tilkynningar berast"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Þegar tilkynningar berast mun síminn hvorki gefa frá sér hljóð né titra."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Fela tilkynningar"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Þú munt ekki sjá nýjar eða fyrirliggjandi tilkynningar"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Síminn mun ekki birta nýjar eða fyrirliggjandi tilkynningar og mun hvorki hringja né titra. Tilkynningar munu ekki birtast þegar strokið er niður frá toppi skjásins .\n\nHafðu í huga að mikilvægar tilkynningar um virkni og stöðu símans munu áfram birtast."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Sérsniðið"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Kveikja á sérstillingu"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fjarlægja sérstillingu"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> regla getur verið notuð sjálfkrafa</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reglur geta verið notaðar sjálfkrafa</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Í lagi"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Hegðun"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Undantekningar"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Áætlun"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Hljóð og titringur"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Þegar kveikt er á „Ónáðið ekki“ gefur síminn hvorki frá sér hljóð né titrar, nema vegna þeirra atriða sem þú leyfir hér fyrir ofan."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Þagga allt nema"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Þaggað"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ekki þaggað"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Þaggað, en leyfa <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Þaggað, en leyfa <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> og <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Þaggað, en leyfa <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Skilaboð, viðburðir og áminningar"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Þegar kveikt er á „Ónáðið ekki“ munu engin hljóð heyrast vegna skilaboða, áminninga eða viðburða, nema fyrir þá sem þú heimilar að ofan. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Uppfæra"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ekki uppfæra"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Síminn þinn getur gert fleira til að hjálpa þér að halda einbeitingu.\n\nUppfærðu stillingarnar þínar í:\n\n- Fela tilkynningar alveg\n\n- Leyfa símtöl frá stjörnumerktum tengiliðum og þeim sem hringja endurtekið"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Viltu uppfæra „Ónáðið ekki“?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Stillingar"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Þú getur breytt þessu enn frekar í stillingum."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Loka fyrir þegar kveikt er á skjánum"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Loka fyrir þegar slökkt er á skjánum"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"„Ónáðið ekki“ getur gert meira en að loka fyrir óæskileg hljóð – það getur einnig lokað fyrir myndefni. Þetta getur komið að góðum notum þegar þú ert að reyna að sofna, einbeita þér eða takmarka þann tíma sem þú notar í símanum þínum."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Loka fyrir hljóð og myndefni"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ekki kveikja á skjánum eða vekja fyrir tilkynningar"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ekki sýna neinar tilkynningar, fyrir utan grunnvirkni símans og stöðu hans"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Hljóð vinnuprófils"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Símtöl"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Lokað er á símtöl þegar kveikt er á „Ónáðið ekki“. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Skilaboð"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Öll skilaboð"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Valin skilaboð"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Skilaboð"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Sum skilaboð"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Frá öllum"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Aðeins frá tengiliðum"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Aðeins frá stjörnumerktum tengiliðum"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Frá stjörnumerktum tengiliðum og þeim sem hringja endurtekið"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Frá tengiliðum og þeim sem hringja endurtekið"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Aðeins frá þeim sem hringja endurtekið"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ekkert"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Vekjarar"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Efni"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Snertihljóð"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Áminningar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Viðburðir"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Allir hringjendur"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valdir hringjendur"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"allir"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"tengiliðir"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"stjörnumerktir tengiliðir"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Hringt endurtekið"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Aðeins frá <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Frá <xliff:g id="CALLER_TYPE">%1$s</xliff:g> og <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ef sami aðili hringir aftur innan <xliff:g id="MINUTES">%d</xliff:g> mínútna"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Sérstillt"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Kveikja sjálfkrafa"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Allar „Ónáðið ekki“-reglur sem búnar voru til af þessu forriti verða fjarlægðar."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ekki spara"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Spara"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Getur gengið hraðar á hleðslu rafhlöðunnar"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Ráðlagt til að rafhlaðan endist lengur"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Leyfa <xliff:g id="APP">%s</xliff:g> að hunsa rafhlöðusparnað?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ekkert"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Slökkt á afritun"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Uppfært í Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Uppfærsla í boði"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Ekki hægt að breyta stillingu"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Aðgerð ekki leyfileg"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Ekki er hægt að breyta hljóðstyrk"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Símtöl ekki leyfð"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-skilaboð ekki leyfð"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Stjórna upplýsingum á lásskjá"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Sýna eða fela efni tilkynninga"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Allar"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Aðstoð og ábendingar"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Ábendingar og aðstoð"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minnsta breidd"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Engin uppsett forrit hafa óskað eftir sérstökum SMS-aðgangi"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Sérstök SMS-skilaboð geta kostað þig peninga og munu bætast við símreikninginn þinn. Ef þú virkjar leyfi fyrir forrit geturðu sent sérstök SMS með því forriti."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Kvikmynda- og sjónvarpsforrit"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Úthlutunarupplýsingar símafyrirtækis"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kveikja á úthlutun símafyrirtækis"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvað er nýtt og spennandi?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Skoðaðu kynningu á nýja símanum þínum"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Skoðaðu kynningu á nýju spjaldtölvunni þinni"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 803b5b7..eb789a1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Richiesta di accesso alla SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> desidera accedere alla tua scheda SIM. Se consenti l\'accesso, la connettività dati sul dispositivo sarà disattivata per tutta la durata della connessione. Consentire l\'accesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visibile come <xliff:g id="DEVICE_NAME">^1</xliff:g> agli altri dispositivi"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"I tuoi dispositivi"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Accoppia nuovo dispositivo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Consenti la comunicazione del tablet con dispositivi Bluetooth nelle vicinanze"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Impossibile reimpostare le eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Impossibile reimpostare le eSIM a causa di un errore."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Cancella tutti i dati (ripristino dati fabbrica)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Questa operazione cancellerà tutti i dati dalla "<b>"memoria interna"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle app"</li>\n<li>"App scaricate"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Ritardo molto lungo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Ritardo molto lungo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Impostazione di suoneria e notifiche: off"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Impostazione di suoneria e notifiche: bassa"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Impostazione di suoneria e notifiche: media"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilizzo dello schermo dall\'ultima ricarica completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo dello schermo"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scansione rete mobile"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilizzo delle app dall\'ultima ricarica completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilizzo del dispositivo dall\'ultima ricarica completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Attivazione del dispositivo in background"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Richiesta della posizione frequentemente"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> app con comportamenti anomali"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La batteria è in buone condizioni"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Le app funzionano normalmente"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Le app funzionano normalmente"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Il telefono ha un consumo tipico della batteria in background"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Il tablet ha un consumo tipico della batteria in background"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Il dispositivo ha un consumo tipico della batteria in background"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacità della batteria in esaurimento"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La batteria non può fornire una buona durata"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Aumenta la durata della batteria del telefono"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet utilizzato più del solito"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Dispositivo usato più del solito"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"La batteria potrebbe esaurirsi a breve"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Hai utilizzato il telefono più del solito. La batteria potrebbe esaurirsi prima del previsto.\n\nEcco le <xliff:g id="NUMBER">%1$d</xliff:g> app più utilizzate dall\'ultima ricarica completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Hai utilizzato il tablet più del solito. La batteria potrebbe esaurirsi prima del previsto.\n\nEcco le <xliff:g id="NUMBER">%1$d</xliff:g> app più utilizzate dall\'ultima ricarica completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Hai utilizzato il dispositivo più del solito. La batteria potrebbe esaurirsi prima del previsto.\n\nEcco le <xliff:g id="NUMBER">%1$d</xliff:g> app più utilizzate dall\'ultima ricarica completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Limita %1$d app</item>
       <item quantity="one">Limita %1$d app</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Questa app potrà usare la batteria in background. La batteria potrebbe esaurirsi prima del previsto."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Rimuovi"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Annulla"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"In base al tuo utilizzo, solitamente la ricarica completa della batteria dura <xliff:g id="TIME_DURATION">%1$s</xliff:g> circa.\n\nSe vuoi aumentare la durata della batteria, attiva la funzione Risparmio energetico."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Se vuoi aumentare la durata della batteria, attiva la funzione Risparmio energetico"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il tuo telefono suggerirà le azioni che puoi svolgere.\n\nSe la carica della batteria è scarsa, puoi sempre attivare Risparmio energetico."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il tuo tablet suggerirà le azioni che puoi svolgere.\n\nSe la carica della batteria è scarsa, puoi sempre attivare Risparmio energetico."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Le tue app stanno utilizzando un livello di batteria normale. Se le app consumano troppa batteria, il tuo dispositivo suggerirà le azioni che puoi svolgere.\n\nSe la carica della batteria è scarsa, puoi sempre attivare Risparmio energetico."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gestione batteria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gestisci le app automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limita l\'utilizzo della batteria per le app che usi di rado"</string>
@@ -3075,15 +3087,14 @@
     <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">"Blocca interruzioni visive"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Consenti segnali visivi"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Limita notifiche"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando è attiva la modalità Non disturbare"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifiche"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Quando è attiva la modalità Non disturbare"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Disattiva notifiche"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostra notifiche ma disattiva suoni e vibrazioni"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Quando arrivano nuove notifiche, il telefono non emetterà suoni né vibrazioni"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Nascondi e disattiva l\'audio delle notifiche"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Le notifiche non appariranno mai"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Quando è attiva la modalità Non disturbare, le notifiche nuove o esistenti non saranno visibili. Tuttavia, le notifiche necessarie per lo stato e le attività di base del telefono continueranno ad apparire."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostra le notifiche silenziosamente"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"L\'audio delle notifiche verrà disattivato"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"All\'arrivo delle notifiche, il telefono non emetterà suoni o vibrazioni."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Nascondi notifiche"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Non vedrai le notifiche nuove o esistenti"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Il tuo telefono non mostrerà notifiche nuove o esistenti e non emetterà suoni o vibrazioni. Le notifiche non verranno visualizzate quando scorri verso il basso sullo schermo.\n\nRicorda che le notifiche fondamentali per lo stato e le attività del telefono continueranno a essere visualizzate."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizzata"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Attiva modalità personalizzata"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Rimuovi impostazione personalizzata"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="other">Possono essere attivate automaticamente <xliff:g id="ON_COUNT">%d</xliff:g> regole</item>
       <item quantity="one">Può essere attivata automaticamente 1 regola</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamento"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Eccezioni"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Programmazione"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Suoni e vibrazione"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Quando la modalità Non disturbare è attiva, l\'audio e la vibrazione verranno disattivati, ad eccezione degli elementi da te sopra consentiti."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Disattiva l\'audio per tutti tranne"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Audio disattivato"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Audio non disattivato"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Audio disattivato, ma consenti <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Audio disattivato, ma consenti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Audio disattivato, ma consenti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messaggi, eventi e promemoria"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando la modalità Non disturbare è attiva, l\'audio di messaggi, promemoria ed eventi verrà disattivato, ad eccezione degli elementi da te sopra consentiti. Puoi regolare le impostazioni dei messaggi affinché amici, familiari o altri contatti possano raggiungerti."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Aggiorna"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Non aggiornare"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Il tuo telefono può fare ancora di più per aiutarti a concentrarti.\n\nAggiorna le impostazioni a:\n\n- Nascondi completamente le notifiche\n\n- Consenti chiamate da contatti speciali e chiamate ripetute"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Aggiornare Non disturbare?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Impostazioni"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Puoi personalizzare ulteriormente questa preferenza nelle Impostazioni."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blocca quando lo schermo è acceso"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blocca quando lo schermo è spento"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"La modalità Non disturbare non ti consente soltanto di bloccare i suoni indesiderati, ma anche di bloccare le immagini. Potrebbe essere utile quando cerchi di dormire, concentrarti o limitare l\'utilizzo del telefono."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blocca suoni e immagini"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Non accendere lo schermo e non riattivare per le notifiche"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Non mostrare le notifiche, tranne quelle relative allo stato e all\'attività di base del telefono"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Suoni profilo di lavoro"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Dalle <xliff:g id="START">%1$s</xliff:g> alle <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chiamate"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando la modalità Non disturbare è attiva, le chiamate in arrivo sono bloccate. Puoi regolare le impostazioni affinché amici, familiari e altri contatti possano raggiungerti."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messaggi"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tutti i messaggi"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Messaggi selezionati"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messaggi"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Alcuni messaggi"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Da chiunque"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Solo dai contatti"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo da contatti Speciali"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Da contatti speciali e chiamate ripetute"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Da contatti e chiamate ripetute"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Solo da chiamate ripetute"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nessuno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Sveglie"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Contenuti multimediali"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Suoni alla pressione"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Promemoria"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventi"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Tutti i chiamanti"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Chiamate da utenti selezionati"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"chiunque"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contatti"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contatti speciali"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Chiamate ripetute"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Solo da <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Da <xliff:g id="CALLER_TYPE">%1$s</xliff:g> e <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se la stessa persona chiama una seconda volta entro <xliff:g id="MINUTES">%d</xliff:g> minuti"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizzato"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Attiva automaticam."</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Tutte le regole Non disturbare create da questa app saranno rimosse."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Non ottimizzare"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Ottimizza"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"La batteria potrebbe scaricarsi più rapidamente."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Opzione consigliata per una durata maggiore della batteria"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Autorizzare <xliff:g id="APP">%s</xliff:g> a ignorare le ottimizzazioni della batteria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nessuna"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup disattivato"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aggiornato ad Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Aggiornamento disponibile"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Impostazione non modificabile"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Azione non consentita"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Impossibile modificare il volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Chiamate non consentite"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS non consentiti"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Gestisci le informazioni nella schermata di blocco"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o nascondi i contenuti delle notifiche"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tutte"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Assistenza e suggerimenti"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Suggerimenti e assistenza"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Larghezza minima"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nessuna app installata ha richiesto l\'accesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Gli SMS premium potrebbero comportare costi, che verranno aggiunti alle fatture del tuo operatore. Se attivi l\'autorizzazione per un\'app, potrai utilizzarla per inviare SMS premium."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"App per film e programmi televisivi"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informazioni sul provisioning operatore"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Attiva provisioning operatore"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quali entusiasmanti novità ti attendono?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Scopri il tuo nuovo telefono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Scopri il tuo nuovo tablet"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1a9002d..cda8746 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏בקשת גישה אל כרטיס SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> רוצה לגשת אל כרטיס ה-SIM. הענקת גישה אל כרטיס ה-SIM תשבית את קישוריות הנתונים במכשיר לכל משך החיבור. הענק גישה ל-<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"משתמשים אחרים יכולים לראות את המכשיר שלך בתור \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"המכשירים שלך"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"התאמה של מכשיר חדש"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"‏הטאבלט שלך יוכל לתקשר עם מכשירי Bluetooth שנמצאים בקרבת מקום"</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"‏לא ניתן לאפס את כרטיס ה-eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"‏לא ניתן לאפס את כרטיס ה-eSIM עקב שגיאה."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"מחיקת כל הנתונים (איפוס להגדרות היצרן)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="other">השהיה ארוכה מאוד (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> מילישניות)</item>
       <item quantity="one">השהיה ארוכה מאוד (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> מילישנייה)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"רטט כבוי לצלצול ולהודעות"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"צלצול והודעות בעוצמה נמוכה"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"צלצול והודעות בעוצמה בינונית"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"שימוש במסך מאז הטעינה המלאה"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"צריכת החשמל של המסך"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"סריקה של רשתות סלולריות"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"משך השימוש באפליקציה מאז הטעינה המלאה האחרונה (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"משך השימוש במכשיר מאז הטעינה המלאה האחרונה (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"המכשיר יוצא ממצב שינה ברקע"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"בקשות מיקום בתדירות גבוהה"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> אפליקציות פועלות בצורה חריגה"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"הסוללה במצב טוב"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"האפליקציות פועלות כרגיל"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"קיבולת הסוללה נמוכה"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"הסוללה לא יכולה לספק חיי סוללה טובים"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"שיפור חיי הסוללה של הטלפון"</string>
@@ -2197,9 +2209,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"הטאבלט נמצא בשימוש יותר מהרגיל"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"המכשיר נמצא בשימוש יותר מהרגיל"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ייתכן שהסוללה תתרוקן בקרוב"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"נעשה שימוש בטלפון שלך יותר מהרגיל. ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> האפליקציות המובילות שהופעלו מאז הטעינה המלאה האחרונה(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"נעשה שימוש בטאבלט שלך יותר מהרגיל. ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> האפליקציות המובילות שהופעלו מאז הטעינה המלאה האחרונה(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"נעשה שימוש במכשיר שלך יותר מהרגיל. ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> האפליקציות המובילות שהופעלו מאז הטעינה המלאה האחרונה(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="two">‏הגבלת %1$d אפליקציות</item>
       <item quantity="many">‏הגבלת %1$d אפליקציות</item>
@@ -2238,8 +2253,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"האפליקציה הזו תוכל להשתמש בסוללה ברקע. ייתכן שהסוללה תתרוקן מוקדם מהצפוי."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"הסרה"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"ביטול"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"על סמך נתוני השימוש שלך, הסוללה מספיקה בדרך כלל ל-<xliff:g id="TIME_DURATION">%1$s</xliff:g> כשהיא טעונה במלואה.\n\nאם יש צורך להאריך את חיי הסוללה, עליך להפעיל את מצב החיסכון בסוללה."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"אם יש צורך להאריך את חיי הסוללה, עליך להפעיל את מצב החיסכון בסוללה"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"מנהל הסוללה"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ניהול אפליקציות באופן אוטומטי"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"הגבלת שימוש בסוללה לאפליקציות שבהן לא נעשה שימוש לעתים קרובות"</string>
@@ -3147,15 +3166,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"הפעלת אותות חזותיים"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"הגבלת ההודעות"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"כשמצב \'נא לא להפריע\' פועל"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"הודעות"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"כשמצב \'נא לא להפריע\' פועל"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"השתקת ההודעות"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"הצגת הודעות אבל השתקת צלילים ורטט"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"כשנכנסות הודעות חדשות, הטלפון לא ישמיע צליל או רטט"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"הסתרה והשתקה של הודעות"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"הודעות לא יופיעו בכלל"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"הודעות חדשות או קיימות לא יופיעו כשמצב \'נא לא להפריע\' פועל, אבל הודעות הדרושות לפעולת הטלפון הבסיסית ולסטטוס עדיין יופיעו."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"הצגת הודעות בלי להשמיע צליל"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ההודעות יושתקו"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"כשיגיעו הודעות, הטלפון לא ישמיע צליל ולא יפעיל רטט."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"הסתרת הודעות"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"לא יוצגו הודעות חדשות או הודעות קיימות"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"הטלפון שלך לא יציג הודעות חדשות או קיימות, ולא ישמיע צליל או רטט. הודעות לא יופיעו בעת החלקה כלפי מטה מהחלק העליון של המסך.\n\nחשוב לזכור, הודעות החיוניות לפעולת הטלפון ולסטטוס עדיין יופיעו."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"התאמה אישית"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"הפעלת הגדרה מותאמת אישית"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"הסרת הגדרה מותאמת אישית"</string>
@@ -3211,13 +3229,27 @@
       <item quantity="other">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> כללים אוטומטית</item>
       <item quantity="one">ניתן להפעיל כלל אחד אוטומטית</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"אישור"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"התנהגות"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"חריגים"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"לוח זמנים"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"צליל ורטט"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"כשמצב \'נא לא להפריע\' פועל, צלילים ורטט מושתקים, חוץ מהפריטים שאפשרת למעלה."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"אני רוצה להשתיק את הכל, חוץ מ-"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"הושתקו"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"לא מושתקים"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"מושתקים, אבל אני רוצה לאפשר <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"מושתקים, אבל אני רוצה לאפשר <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> וכן <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"מושתקים, אבל אני רוצה לאפשר <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> וכן <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"הודעות, אירועים ותזכורות"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"כשמצב \'נא לא להפריע\' פועל, הודעות, תזכורות ואירועים מושתקים, חוץ מהפריטים שאפשרת למעלה. ניתן לשנות את הגדרות ההודעות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"עדכון"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"לא לעדכן"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"ניתן להיעזר בטלפון כדי להתרכז.\n\nיש לעדכן את ההגדרות הבאות:\n\n- הסתרה מוחלטת של הודעות\n\n- מתן אישור לשיחות מאנשי קשר שמסומנים בכוכב וממתקשרים חוזרים"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"לעדכן את מצב \'נא לא להפריע\'?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"הגדרות"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"יש עוד אפשרויות להתאמה אישית של הפריט הזה ב\'הגדרות\'."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"יש לחסום כשהמסך פועל"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"יש לחסום כשהמסך כבוי"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"מצב \'נא לא להפריע\' יכול לחסום צלילים לא רצויים ואפילו יותר מזה - לחסום רכיבים חזותיים. זה יכול לעזור כשמנסים לישון, להתמקד או להגביל את זמן השימוש בטלפון."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"חסימה של צלילים ורכיבים חזותיים"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"אין להפעיל את המסך או להציג הודעות"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"אין להציג הודעות בכלל, למעט פעילות בסיסית בטלפון וסטטוס"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"צלילי פרופיל עבודה"</string>
@@ -3396,21 +3428,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> עד <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"שיחות"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"כשמצב \'נא לא להפריע\' פועל, השיחות הנכנסות חסומות. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"הודעות"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"כל ההודעות"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"הודעות נבחרות"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"הודעות"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"הודעות מסוימות"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"מכל אחד"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"רק מאנשי הקשר"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"רק מאלו שמסומנים בכוכב"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"מאנשי קשר שמסומנים בכוכב וממתקשרים חוזרים"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"מאנשי הקשר וממתקשרים חוזרים"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ממתקשרים חוזרים בלבד"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ללא"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"התראות"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"מדיה"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"צלילי מגע"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"תזכורות"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"אירועים"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"כל המתקשרים"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"מתקשרים נבחרים"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"כולם"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"אנשי קשר"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"אנשי קשר המסומנים בכוכב"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"מתקשרים חוזרים"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"מ<xliff:g id="CALLER_TYPE">%1$s</xliff:g> בלבד"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"מ<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ומ<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"אם מגיעה שיחה ממישהו בפעם השנייה תוך <xliff:g id="MINUTES">%d</xliff:g> דקות"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"מותאם אישית"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"הפעלה אוטומטית"</string>
@@ -3700,7 +3742,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"כל כללי \'נא לא להפריע\' שנוצרו על ידי האפליקציה הזו יוסרו."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"אל תבצע אופטימיזציה"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"בצע אופטימיזציה"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"הסוללה עשויה להתרוקן מהר יותר"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"מומלץ להארכת חיי הסוללה"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"האם להתיר ל-<xliff:g id="APP">%s</xliff:g> להתעלם מאופטימיזציה של הסוללה?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ללא"</string>
@@ -3778,7 +3821,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"הגיבוי מושבת"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏עודכן ל-Android גרסה ‏<xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"יש עדכון זמין"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"לא ניתן לשנות הגדרה זו"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"הפעולה אינה מותרת"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"לא ניתן לשנות את הנפח"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"לא ניתן לבצע שיחות יוצאות"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"‏לא ניתן לשלוח הודעות SMS"</string>
@@ -3980,7 +4023,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"בחירת הפרטים שמופיעים במסך הנעילה"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"הצג או הסתר תוכן הודעה"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"הכול"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"תמיכה וטיפים"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"טיפים ותמיכה"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"הרוחב הקטן ביותר"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏אף אפליקציה מותקנת לא ביקשה גישה לפרימיום SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"‏פרימיום SMS עשוי לעלות כסף ויצורף לחשבונות הספק שלך. אם אתה מפעיל הרשאה לאפליקציה, תוכל לשלוח פרימיום SMS באמצעות אפליקציה זו."</string>
@@ -4193,6 +4236,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"אפליקציות סרטים וטלוויזיה"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"פרטי ניהול תצורה של ספק סלולרי"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"הפעל ניהול תצורה של ספק סלולרי"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"מה חדש ומעניין?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"סיור היכרות עם הטלפון החדש"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"סיור היכרות עם הטאבלט החדש"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ea34bbb..3021ff4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIMアクセスリクエスト"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>がSIMカードにアクセスしようとしています。SIMカードへのアクセスを許可すると、接続を処理している間、端末上のデータ接続は無効になります。<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>にアクセスを許可します"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"他の端末には「<xliff:g id="DEVICE_NAME">^1</xliff:g>」として表示されます"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"端末"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"新しいデバイスとペア設定"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"タブレットが付近の Bluetooth デバイスと通信することを許可する"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM のリセットエラー"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"エラーのため、eSIM をリセットできません。"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"すべてのデータを消去（出荷時リセット）"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"この操作を行うと、モバイル端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">非常に長い遅延（<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>ミリ秒）</item>
       <item quantity="one">非常に長い遅延（<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>ミリ秒）</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"着信と通知は [OFF] に設定されています"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"着信と通知は [低] に設定されています"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"着信と通知は [中] に設定されています"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"フル充電以降の画面の電池使用状況"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"画面消費"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"フル充電以降のアプリの電池使用状況（<xliff:g id="RELATIVE_TIME">^1</xliff:g>）"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"フル充電以降の端末の電池使用状況（<xliff:g id="RELATIVE_TIME">^1</xliff:g>）"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"バックグラウンドで端末をスリープ状態から復帰させています"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"位置情報を頻繁にリクエストしています"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個のアプリの動作に問題があります"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"電池は正常です"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"アプリは正常に実行されています"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"電池残量の低下"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"電池の残量が減っています"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"スマートフォンの電池寿命の改善"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"タブレットの電池使用量が通常より多くなっています"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"端末の電池使用量が通常より多くなっています"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"もうすぐ電池がなくなります"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"スマートフォンの電池使用量が通常より多いため、予想より早く電池がなくなる可能性があります。\n\n前回の充電（<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>）以降の上位 <xliff:g id="NUMBER">%1$d</xliff:g> 個のアプリ:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"タブレットの電池使用量が通常より多いため、予想より早く電池がなくなる可能性があります。\n\n前回の充電（<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>）以降の上位 <xliff:g id="NUMBER">%1$d</xliff:g> 個のアプリ:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"端末の電池使用量が通常より多いため、予想より早く電池がなくなる可能性があります。\n\n前回の充電（<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>）以降の上位 <xliff:g id="NUMBER">%1$d</xliff:g> 個のアプリ:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d 個のアプリの制限</item>
       <item quantity="one">%1$d 個のアプリの制限</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"このアプリはバックグラウンドで電池を使用するため、電池が予想より早くなくなる可能性があります。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"削除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"キャンセル"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"使用状況から、フル充電後の通常の電池駆動時間は約 <xliff:g id="TIME_DURATION">%1$s</xliff:g>です。\n\nバッテリー セーバーをオンにすると、電池を長持ちさせることができます。"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"バッテリー セーバーをオンにすると、電池を長持ちさせることができます"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"アプリを自動的に管理"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"使用頻度の低いアプリの電池使用を制限します"</string>
@@ -3079,15 +3098,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"視覚的な割り込みを許可"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"通知の制限"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"マナーモードが ON のとき"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"マナーモードが ON のとき"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"通知のミュート"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"通知は表示されますが、通知音やバイブレーションはミュートされます"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"スマートフォンに新しい通知が届いても、通知音やバイブレーションは作動しません"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"通知の非表示とミュート"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"通知はまったく表示されません"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"マナーモードが ON のときに新しい通知や既存の通知は表示されません。基本的なスマートフォンの操作やステータスに必要な通知は表示されます。"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"通知をマナーモードで表示する"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"通知はミュートされます"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"スマートフォンに通知が届いても、通知音やバイブレーションは作動しません。"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"通知を非表示"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"新しい通知や既存の通知は表示されません"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"スマートフォンに新しい通知や既存の通知は表示されず、通知音やバイブレーションも作動しません。また、画面の上から下にスワイプしても通知は表示されません。\n\nスマートフォンの操作やステータスに必要な通知は引き続き表示されます。"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"カスタム"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"カスタム設定の有効化"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"カスタム設定の削除"</string>
@@ -3139,13 +3157,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 件のルールを自動的に ON にできます</item>
       <item quantity="one">1 件のルールを自動的に ON にできます</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"動作"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"例外"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"スケジュール"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"着信音とバイブレーション"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"マナーモードが ON の場合、上記の許可した項目を除き、着信音とバイブレーションはミュートされます。"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"指定した項目を除きすべてミュート"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ミュート中"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ミュート対象外"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ミュート中（<xliff:g id="SOUND_TYPE">%1$s</xliff:g>を除く）"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ミュート中（<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>を除く）"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ミュート中（<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>、<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>を除く）"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"メッセージ、予定、リマインダー"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"マナーモードが ON の場合、上記の許可した項目を除き、メッセージ、リマインダー、予定はミュートされます。メッセージの設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"更新する"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"更新しない"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"マナーモードには他にもいろいろな機能があります。\n\n次のように設定を更新できます。\n\n- 通知を完全に非表示にする\n\n- スター付きの連絡先や繰り返し着信のあった相手からの通話を許可する"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"マナーモードを更新しますか？"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"設定"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"これは [設定] でさらにカスタマイズできます。"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"画面が ON のときでもブロックする"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"画面が OFF のときはブロックする"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"マナーモードでは不要な通知音だけでなく、視覚的な通知もブロックできます。就寝時や集中したいとき、スマートフォンの使用時間を減らしたいときなどに便利です。"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"通知音や視覚的な通知をブロック"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"画面を ON にしない、通知で復帰しない"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"スマートフォンの基本的な操作やステータスに関するものを除き、通知を一切表示しません"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"仕事用プロファイルの音"</string>
@@ -3316,21 +3348,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>～<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>～<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"通話"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"マナーモードが ON の場合、着信がブロックされます。設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"メッセージ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"すべてのメッセージ"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"選択したメッセージ"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"メッセージ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"一部のメッセージ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"全員"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"連絡先のみ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"スター付きの連絡先のみ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"スター付きの連絡先、同一発信者による再発信"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"連絡先、同一発信者による再発信"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"同一発信者による再発信のみ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"なし"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"アラーム"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"メディア"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"タッチ操作音"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"リマインダー"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"予定"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"すべての発信者"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"選択した発信者"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"全員"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"連絡先"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"スター付きの連絡先"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"同一発信者による再発信"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>のみ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>、<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"同じ人から <xliff:g id="MINUTES">%d</xliff:g> 分以内に再度発信があった場合"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"カスタム"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動的にON"</string>
@@ -3600,7 +3642,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"このアプリで作成したすべてのマナーモード ルールは削除されます。"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"最適化しない"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"最適化する"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"電池の消耗が速くなる可能性があります"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"電池を長持ちさせるためのおすすめの方法です"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g>が電池の最適化を無視することを許可しますか？"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"なし"</string>
@@ -3676,7 +3719,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"バックアップは無効です"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> に更新済み"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"アップデートを利用できます"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"この設定は変更できません"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"操作が許可されていません"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"音量を変更することはできません"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"発信は許可されていません"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS は許可されていません"</string>
@@ -3866,7 +3909,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"ロック画面に表示される情報の管理"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"通知内容の表示と非表示を切り替える"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"すべて"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"サポートとヒント"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ヒントとサポート"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小幅"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"プレミアム SMS へのアクセスをリクエストしたインストール済みアプリはありません"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"プレミアム SMS で料金が発生した場合は、携帯通信会社の請求に加算されます。アプリで権限を有効にすると、そのアプリを使用してプレミアム SMS を送信できるようになります。"</string>
@@ -4059,6 +4102,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"ムービー＆ TV アプリ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"携帯通信会社のプロビジョニング情報"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"携帯通信会社のプロビジョニングをトリガー"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"注目の新機能"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新しいスマートフォンの使い方をご紹介します"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新しいタブレットの使い方をご紹介します"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 5e6817c..60c4b2d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-ზე წვდომის მოთხოვნა"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>-ს სურს თქვენს SIM ბარათზე წვდომა. SIM ბარათზე წვდომის დაშვება კავშირის განმავლობაში გათიშავს მონაცემთა გადაცემას მოწყობილობაზე. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-ისთვის წვდომის მიცემა"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"სხვა მოწყობილობებისთვის ჩანს, როგორც „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"თქვენი მოწყობილობები"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ახალი მოწყობილობის დაწყვილება"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"თქვენი ტაბლეტის მიერ ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაციის დაშვება"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-ების გადაყენება ვერ ხერხდება"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM-ების გადაყენება ვერ ხერხდება წარმოქმნილი შეცდომის გამო."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ეს მოქმედება წაშლის ყველა მონაცემებს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google-ის ანგარიშს"</li>\n<li>"სისტემისა და აპების მონაცემებს და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">ძალიან ხანგრძლივი დაყოვნება (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> მწმ)</item>
       <item quantity="one">ძალიან ხანგრძლივი დაყოვნება (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> მწმ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ზარისა და შეტყობინებათა ხმა გამორთულია"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ზარისა და შეტყობინებათა ხმა დაბალია"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ზარისა და შეტყობინებათა ხმა საშუალოა"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ეკრანის მოხმარება ბოლო სრული დატენვიდან"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ეკრანის მოხმარება"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"მობილური ქსელის სკანირება"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"აპების მიერ მოხმარება ბოლო სრული დატენიდან (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"მოწყობილობის მიერ მოხმარება ბოლო სრული დატენიდან (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"მოწყობილობის გამოღვიძება ფონურ რეჟიმში"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ხშირად ითხოვს მდებარეობას"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> აპი არასათანადოდ მუშაობს"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ბატარეა კარგ მდგომარეობაშია"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"აპები გაშვებულია ჩვეულებრივად"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ბატარეა დაბალი ტევადობისაა"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ბატარეა ვერ უზრუნველყოფს ხანგრძლივად მუშაობას"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"გააუმჯობესეთ ტელეფონის ბატარეის მუშაობის ხანგრძლივობა"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ტაბლეტი ჩვეულებრივზე მეტად მოიხმარება"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"მოწყობილობა ჩვეულებრივზე მეტად მოიხმარება"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ბატარეა შესაძლოა მალე ამოიწუროს"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"თქვენი ტელეფონი ჩვეულებრივზე მეტად მოიხმარებოდა. შესაბამისად, ბატარეა შესაძლოა მოსალოდნელზე ადრე ამოიწუროს.\n\nყველაზე გამოყენებადი <xliff:g id="NUMBER">%1$d</xliff:g> აპი ბოლო სრული დატენვიდან(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"თქვენი ტაბლეტი ჩვეულებრივზე მეტად მოიხმარებოდა. შესაბამისად, ბატარეა შესაძლოა მოსალოდნელზე ადრე ამოიწუროს.\n\nყველაზე გამოყენებადი <xliff:g id="NUMBER">%1$d</xliff:g> აპი ბოლო სრული დატენვიდან(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"თქვენი მოწყობილობა ჩვეულებრივზე მეტად მოიხმარებოდა. შესაბამისად, ბატარეა შესაძლოა მოსალოდნელზე ადრე ამოიწუროს.\n\nყველაზე გამოყენებადი <xliff:g id="NUMBER">%1$d</xliff:g> აპი ბოლო სრული დატენვიდან(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">შეიზღუდოს %1$d აპი</item>
       <item quantity="one">შეიზღუდოს %1$d აპი</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ეს აპი შეძლებს თქვენი ბატარეის ფონურ რეჟიმში მოხმარებას. ამან შესაძლოა ბატარეა სწრაფად ამოწუროს."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"წაშლა"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"გაუქმება"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"თქვენი მოხმარების გათვალისწინებით, ბატარეა, როგორც წესი, მუშაობს <xliff:g id="TIME_DURATION">%1$s</xliff:g>, როცა ბოლომდე დატენილია.\n\nთუ ბატარეის მუშაობის გახანგრძლივება გსურთ, ჩართეთ ბატარეის დამზოგი."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"თუ ბატარეის მუშაობის გახანგრძლივება გსურთ, ჩართეთ ბატარეის დამზოგი"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"აპების ავტომატურად მართვა"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ბატარეის მოხმარების შეზღუდვა აპებისთვის, რომლებსაც იშვიათად იყენებთ"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ვიზუალური სიგნალების დაშვება"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"შეტყობინებების შეზღუდვა"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"როცა ჩართულია „არ შემაწუხოთ“"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"შეტყობინებები"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"როცა ჩართულია „არ შემაწუხოთ“"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"შეტყობინებების დადუმება"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"შეტყობინებების ჩვენება ხმისა და ვიბრაციის გარეშე"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"ახალი შეტყობინებების მიღებისას თქვენს ტელეფონზე არ ამოქმედდება ხმოვანი ან ვიბროსიგნალი"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"შეტყობინებების დამალვა და დადუმება"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"შეტყობინებები საერთოდ არ გამოჩნდება"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"თქვენ არ დაინახავთ ახალ ან არსებულ შეტყობინებებს, როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, თუმცა ტელეფონის ძირითადი აქტივობისა და სტატუსისთვის საჭირო შეტყობინებები მაინც გამოჩნდება."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"შეტყობინებების უხმოდ ჩვენება"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"შეტყობინებები დადუმდება"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"შეტყობინებების მიღებისას თქვენს ტელეფონზე არ ამოქმედდება ხმოვანი ან ვიბროსიგნალი."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"შეტყობინებების დამალვა"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"თქვენ არ დაინახავთ ახალ ან არსებულ შეტყობინებებს"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"თქვენს ტელეფონზე არ გამოჩნდება ახალი ან არსებული შეტყობინებები და არც ხმოვანი თუ ვიბროსიგნალი ამოქმედდება. შეტყობინებები არ გამოჩნდება ეკრანზე ქვემოდან ზემოთ გადაფურცვლისას.\n\nგაითვალისწინეთ, რომ ტელეფონის აქტივობასთან და სტატუსთან დაკავშირებული კრიტიკულად მნიშვნელოვანი შეტყობინებები მაინც გამოჩნდება."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"მორგებული"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"მორგებული პარამეტრის ჩართვა"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"მორგებული პარამეტრის გაუქმება"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> წესი შეიძლება ავტომატურად ჩაირთოს</item>
       <item quantity="one">1 წესი შეიძლება ავტომატურად ჩაირთოს</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"კარგი"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ქცევა"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"გამონაკლისები"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"განრიგი"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ხმა და ვიბრაცია"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა ხმოვანი და ვიბროსიგნალი იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"დადუმდეს ყველაფერი შემდეგის გარდა"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"დადუმებული"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"არ არის დადუმებული"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"დადუმებული, თუმცა დაიშვას <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"დადუმებული, თუმცა დაიშვას <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> და <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"დადუმებული, თუმცა დაიშვას <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> და <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"შეტყობინებები, მოვლენები და შეხსენებები"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა შეტყობინება, შეხსენება და მოვლენა იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"განახლება"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"არ განახლდეს"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"თქვენი ტელეფონი დაგეხმარებათ კონცენტრირებაში.\n\nპარამეტრების განახლებით შეგიძლიათ:\n\n— მთლიანად დამალოთ შეტყობინებები\n\n— დაუშვათ მხოლოდ მათი ზარები, ვინც მონიშნული გყავთ ვარსკვლავით ან ხშირად გირეკავთ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"გსურთ „არ შემაწუხოთ“ რეჟიმის განახლება?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"პარამეტრები"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"ამის დამატებითი პერსონალიზაცია შესაძლებელია პარამეტრებში."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"დაიბლოკოს როცა ეკრანი ჩართულია"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"დაიბლოკოს, როცა ეკრანი გამორთულია"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"„არ შემაწუხოთ“ რეჟიმს შეუძლია არასასურველი ხმების დაბლოკვაზე მეტი — ის ვიზუალურ კონტენტსაც ბლოკავს. ეს შესაძლოა გამოგადგეთ მაშინ, როცა დაძინებას, კონცენტრირებას ან ტელეფონის მოხმარებაში გატარებული დროის შემცირებას ცდილობთ."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ხმებისა და ვიზუალური კონტენტის დაბლოკვა"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"არ ჩაირთოს ეკრანი და არ მოხდეს გამოღვიძება შეტყობინებების გამო"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"არ მაჩვენო არანაირი შეტყობინება; ტელეფონის ძირითადი აქტივობისა და სტატუსის გარდა"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"სამსახურის პროფილის ხმები"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>-დან <xliff:g id="END">%2$s</xliff:g>-მდე"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ზარები"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, შემომავალი ზარები იბლოკება. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"შეტყობინებები"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"ყველა შეტყობინება"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"არჩეული შეტყობინებები"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"შეტყობინებები"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ზოგიერთი შეტყობინება"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ნებისმიერი პირისგან"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"მხოლოდ კონტაქტებისგან"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"მხოლოდ ვარსკვლავიანი კონტაქტებისგან"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ვარსკვლავით მონიშნული კონტაქტები და განმეორებითი ზარები"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"კონტაქტები და განმეორებითი ზარები"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"მხოლოდ განმეორებითი ზარები"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"არავისგან"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"მაღვიძარები"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"მედია"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"შეხების ხმები"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"შეხსენებები"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ღონისძიებები"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"ყველა აბონენტი"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"არჩეული აბონენტები"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ნებისმიერი"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"კონტაქტები"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ვარსკვლავით მონიშნული კონტაქტები"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"აბონენტების გამეორება"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"მხოლოდ <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> და <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"თუ პიროვნება <xliff:g id="MINUTES">%d</xliff:g> წუთის განმავლობაში მეორედ დარეკავს"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"მორგებული"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ავტომატურად ჩაირთოს"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ამ აპის მიერ შექმნილი „არ შემაწუხოთ“ ტიპის ყველა წესი ამოიშლება."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"არ გააკეთო ოპტიმიზაცია"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ოპტიმიზაცია"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"თქვენი ბატარეა შეიძლება უფრო სწრაფად დაიცალოს"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"რეკომენდებულია ბატარეის მუშაობის დროის გასახანგრძლივებლად"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g>-ს მიეცეს ბატარეის ოპტიმიზაციების იგნორირების უფლება?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"არაფერი"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"სარეზერვო ასლების შექმნა გათიშულია"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"განახლდა Android <xliff:g id="VERSION">%1$s</xliff:g>-ზე"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"განახლება ხელმისაწვდომია"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ამ პარამეტრის შეცვლა ვერ ხერხდება"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"მოქმედება დაუშვებელია"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ხმის შეცვლა ვერ მოხერხდა"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"დარეკვა არ არის დაშვებული"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS შეტყობინებები არ არის დაშვებული"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"გააკონტროლეთ ჩაკეტილ ეკრანზე ნაჩვენები ინფორმაცია"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"შეტყობინების კონტენტის ჩვენება ან დამალვა"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ყველა"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"მხარდაჭერა და მინიშნებები"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"მინიშნებები და მხარდაჭერა"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"უმცირესი სიგანე"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"პრემიუმ SMS შეტყობინებების გაგზავნაზე წვდომა არცერთ ინსტალირებულ აპს არ მოუთხოვია"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"პრემიუმ SMS შეტყობინებებისთვის შეიძლება დამატებითი საფასურის გადახდა მოგიწიოთ. აპისთვის ამ ნებართვის მიცემის შემთხვევაში, თქვენ მისი მეშვეობით პრემიუმ SMS შეტყობინებების გაგზავნას შეძლებთ."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"ფილმების და TV აპები"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ოპერატორის უზრუნველყოფის ინფორმაცია"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ოპერატორის უზრუნველყოფის გაშვება"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"რა არის ახალი და გამორჩეული?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ისარგებლეთ თქვენი ახალი ტელეფონის გაცნობითი ტურით"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ისარგებლეთ თქვენი ახალი ტაბლეტის გაცნობითი ტურით"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 7175e91..f92bac7 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM картасына кіру сұрауы"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> сіздің SIM картаңызға кіруге рұқсат сұрайды. Ондай рұқсатты берсеңіз, байланыс барысында дерек тасымалы өшіріледі. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> құрылғысына рұқсат беру"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Басқа құрылғыларға «<xliff:g id="DEVICE_NAME">^1</xliff:g>» ретінде көрінеді"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Құрылғыларыңыз"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңа құрылғымен жұптастыру"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Планшетіңізге маңайдағы Bluetooth құрылғыларымен байланыс орнатуға рұқсат етіңіз"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM карталарының деректері қайтарылмайды"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Қате пайда болғандықтан, eSIM карталарының деректері қайтарылмайды."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Телефонның "<b>"ішкі жадында"</b>" бар бүкіл дерек өшеді, соның ішінде:\n\n"<li>" Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба деректері мен параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Өте ұзақ іркіліс (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
       <item quantity="one">Өте ұзақ іркіліс (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> мс)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Қоңыраулар мен хабарландырулар өшірілді"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Қоңыраулар мен хабарландырулар төмен деңгейге орнатылды"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Қоңыраулар мен хабарландырулар орташа деңгейге орнатылды"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Толық зарядталғаннан кейін экранның зарядты тұтынуы"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Экран жарығына жұмсалатын заряд шығыны"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобильдік желіні сканерлеу"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Толық зарядталғаннан бері қолданбаның пайдаланылуы (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Толық зарядталғаннан бері құрылғының пайдаланылуы (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Құрылғыны фондық режимде ояту"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Орналасу орны ақпаратын жиі сұрауда"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> қолданба оғаш әрекет етуде"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарея жақсы күйде"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Қолданбалар қалыпты жұмыс істеп тұр"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Батарея заряды аз қалды"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батарея заряды ұзаққа жетпейді"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Телефон батареясының қызметтік мерзімін ұзартыңыз"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Планшет әдеттегіден көп қолданылды"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Құрылғы әдеттегіден көп қолданылды"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Батерея жақын арада отыруы мүмкін"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Телефоныңыз әдеттегіден көп қолданылды. Батареяның заряды тез азаюы мүмкін.\n\nСоңғы толық зарядталғаннан кейін (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>), ең жиі қолданылған <xliff:g id="NUMBER">%1$d</xliff:g> қолданба:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Планшетіңіз әдеттегіден көп қолданылды. Батареяның заряды тез азаюы мүмкін.\n\nСоңғы толық зарядталғаннан кейін (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>), ең жиі қолданылған <xliff:g id="NUMBER">%1$d</xliff:g> қолданба:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Құрылғыңыз әдеттегіден көп қолданылды. Батареяның заряды тез азаюы мүмкін.\n\nСоңғы толық зарядталғаннан кейін (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>), ең жиі қолданылған <xliff:g id="NUMBER">%1$d</xliff:g> қолданба:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d қолданбаны шектеу</item>
       <item quantity="one">%1$d қолданбаны шектеу</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Бұл қолданба батареяны фондық режимде пайдаланады. Батареяның заряды тез азаюы мүмкін."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Алу"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Бас тарту"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Пайдалануға байланысты батарея толық зарядталған күйінде әдетте <xliff:g id="TIME_DURATION">%1$s</xliff:g> дейін жетеді.\n\nБатареяның қолданылу мерзімін ұзартқыңыз келсе, \"Battery Saver\" функциясын қосыңыз."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Батареяның қолданылу мерзімін ұзартқыңыз келсе, \"Battery Saver\" функциясын қосыңыз"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Қолданбаларды автоматты түрде реттеу"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Сирек пайдаланылатын қолданбалар үшін батареяның пайдаланылуын шектеу"</string>
@@ -3075,20 +3094,19 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуалды сигналдарды қосу"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Хабарландыруларды шектеу"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Мазаламау\" режимі қосулы кезде"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Хабарландырулар"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"\"Мазаламау\" режимі қосулы кезде"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Хабарландырулардың дыбысын өшіру"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Хабарландыруларды көрсету, бірақ дыбысын шығармау және дірілдемеу"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Жаңа хабарландырулар келіп түскенде, телефон дыбыс шығармайды не дірілдемейді"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Хабарландыруларды жасыру және дыбысын өшіру"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Хабарландырулар мүлдем көрсетілмейді"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"\"Мазаламау\" режимі қосулы кезде, жаңа не бұрыннан бар хабарландырулар көрсетілмейді. Алайда телефондағы негізгі іс-әрекеттерге қажет хабарландырулар мен күй мәліметі шыға береді."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Хабарландыруларды үнсіз көрсету"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Хабарландырулардың дыбысы өшеді"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Хабарландырулар келіп түскенде, телефон дыбыс шығармайды не дірілдемейді."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Хабарландыруларды жасыру"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Жаңа не бұрыннан бар хабарландырулар көрсетілмейді"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефоныңыз жаңа не бұрыннан бар хабарландыруларды көрсетпейді, сондай-ақ дыбыс шығармайды не дірілдемейді. Экранның жоғары жағынан төмен қарай саусақпен сырғытқанда, хабарландырулар шықпайды.\n\nТелефон әрекеттері мен оның күйі туралы маңызды хабарландырулар өшірілмейтінін ұмытпаңыз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Арнаулы"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Арнаулы параметрді қосу"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Арнаулы параметрді өшіру"</string>
     <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Шығады"</string>
-    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Жартылай жасырулы"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Бір бөлігі жасырулы"</string>
     <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Жасырын"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Арнаулы шектеулер"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Экран қосулы кезде"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ереже автоматты түрде қосыла алады</item>
       <item quantity="one">1 ереже автоматты түрде қосыла алады</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Жарайды"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Іс-әрекет"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Ерекшеліктер"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Кесте"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Дыбыс және діріл"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"\"Мазаламау\" режимі қосулы кезде, дыбыс және діріл өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда)."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Келесілерді қоспағанда, барлығының дыбысын өшіру:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Дыбысы өшірулі"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Дыбысы өшірілмеген"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Дыбысы өшірілген, бірақ <xliff:g id="SOUND_TYPE">%1$s</xliff:g> үшін рұқсат берілген"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Дыбысы өшірілген, бірақ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> және <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> үшін рұқсат берілген"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Дыбысы өшірілген, бірақ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> және <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> үшін рұқсат берілген"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Хабарлар, іс-шаралар және еске салғыштар"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Жаңарту"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Жаңартпау"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Телефон ерекшелеудің қосымша мүмкіндіктерін ұсынады.\n\nКелесі мақсаттарда параметрлерді жаңарту:\n\n- хабарландыруларды толығымен жасыру\n\n- жұлдызшалы контактілерден және тұрақты қоңырау шалушылардан келетін қоңырауларға рұқсат беру"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\"Мазаламау\" режимі жаңартылсын ба?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Параметрлер"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Мұны Параметрлерде реттеуіңізге болады"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Экран қосулы болғанда тыйым салу"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Экран өшірулі болғанда тыйым салу"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\"Мазаламау\" режимі дыбыстық хабарландыруларға ғана емес, мәтіндік хабарландыруларға да тыйым салады. Бұл функцияны ұйықтайтын, бір нәрсеге көңіл бөлу немесе телефон пайдалануды шектеген кезде қолданған ыңғайлы."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Дыбыстық және мәтіндік хабарландыруларға тыйым салу"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Хабарландырулар үшін экранды қоспау не оятпау"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Хабарландыруларды телефонның негізгі функцияларына ғана қатысты көрсету"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Жұмыс профилінің дыбыстары"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Қоңыраулар"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Мазаламау\" режимі қосулы кезде, кіріс қоңыраулар бөгеледі. Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алатын етіп параметрлерді реттей аласыз."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Хабарлар"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Барлық хабарлар"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Таңдалған хабарлар"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Хабарлар"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Кейбір хабарлар"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Бәрінен"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Тек контактілерден ғана"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Тек жұлдызша қойылған контактілерден"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Жұлдызшалы контактілерден және тұрақты қоңырау шалушылардан"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Контактілерден және тұрақты қоңырау шалушылардан"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Тек тұрақты қоңырау шалушылардан"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ешқандай"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Дабылдар"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Мультимедиа"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Түрту дыбысы"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Еске салғыштар"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Іс-шаралар"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Барлық қоңырау шалушылар"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Таңдалған қоңырау шалушылар"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"кез келген адам"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"контактілер"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"жұлдызшалы контактілер"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Қайта қоңырау шалушылар"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Тек <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> және <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Бір адам <xliff:g id="MINUTES">%d</xliff:g> минут ішінде қайта шалса"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Арнаулы"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматты түрде қосу"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Осы қолданба жасаған барлық \"Мазаламау\" ережелері жойылады."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Оңтайландырмау"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Оңтайландыру"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Батарея тезірек отыруы мүмкін."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Батареяның жақсырақ қызмет етуі үшін ұсынылады"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> қолданбасына батарея оңтайландыруларын елемеу рұқсатын бересіз бе?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ешқандай"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Сақтық көшірме жасау өшірілген"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> нұсқасына жаңартылды"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Жаңартылған нұсқа қолжетімді"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Бұл параметр өзгертілмейді"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Әрекетке рұқсат етілмеген"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Дыбыс деңгейі өзгертілмейді"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Қоңырау шалуға рұқсат берілмеген"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS жіберуге рұқсат берілмеген"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Құлып экранында ақпаратты басқарыңыз"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Хабарландыру мазмұнын көрсету немесе жасыру"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Барлығы"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Қолдау және кеңестер"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Кеңестер және қолдау"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ең кішкентай ен"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнатылған қолданбалардың ешбірі Premium SMS мүмкіндігін пайдалануға рұқсат сұрамады."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS мүмкіндігі үшін оператор тарифтеріне сәйкес ақы алынуы мүмкін. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз.Premium SMS мүмкіндігі үшін ақша алынуы мүмкін және операторыңыз арқылы жасалған төлем бойынша қосылады. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Фильм және телебағдарлама қолданбалары"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Операторды инициализациялау туралы ақпарат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Операторды инциализациялауды іске қосу"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Қандай қызық жаңа мүмкіндік бар?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңа телефонның ішін аралаңыз"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңа планшеттің ішін аралаңыз"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index de49432..9b09ca3 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"សំណើចូលដំណើរការស៊ីម"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ចង់ចូលដំណើរការស៊ីមកាតរបស់អ្នក។ ការផ្តល់ការអនុញ្ញាតចូលដំណើរការស៊ីមកាតនឹងបិទដំណើរការតភ្ជាប់ទិន្នន័យនៅលើឧបករណ៍របស់អ្នកក្នុងអំឡុងពេលធ្វើការតភ្ជាប់។ អនុញ្ញាតឲ្យចូលដំណើរការ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"អាច​មើលឃើញជា <xliff:g id="DEVICE_NAME">^1</xliff:g> ចំពោះ​ឧបករណ៍ផ្សេងទៀត"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ឧបករណ៍របស់អ្នក"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"អនុញ្ញាត​ឱ្យ​ថេប្លេត​របស់អ្នក​ភ្ជាប់​​ជាមួយ​ឧបករណ៍​ប៊្លូធូស​ដែល​នៅ​ជិត"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"មិន​អាច​កំណត់ eSIM ​ឡើងវិញ​បានទេ"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"មិនអាច​កំណត់​ eSIM ឡើងវិញ​បានទេ ដោយសារ​មានបញ្ហា។"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូចថ្មីវិញ)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"វា​នឹង​លុប​ទិន្នន័យ​ពី​ "<b>"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</b>"នៃ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក រួម​មាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការកំណត់ និង​ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"វា​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី​ "<b>"ទំហំផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរសព្ទ​របស់​អ្នក​ រួមមាន៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ការ​កំណត់​ និង​ទិន្នន័យ​ប្រព័ន្ធ ព្រម​ទាំង​កម្មវិធី"</li>\n<li>"កម្មវិធី​បាន​ទាញ​យក"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"បច្ចុប្បន្ន​ អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖ \n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">ពន្យារពេលយូរណាស់ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">ពន្យារពេលយូរណាស់ (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"បានបិទញ័រ​សម្រាប់​ការ​រោទ៍ និង​ការជូន​ដំណឹង"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"បាន​កំណត់​កម្រិត​ញ័រ​ខ្សោយ​សម្រាប់​ការ​រោទ៍ និង​ការជូន​ដំណឹង"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"បានកំណត់​កម្រិត​ញ័រ​មធ្យម​សម្រាប់​ការ​រោទ៍ និង​ការជូន​ដំណឹង"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ការប្រើប្រាស់អេក្រង់​ចាប់តាំងពី​សាកថ្មពេញ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ការប្រើប្រាស់​អេក្រង់"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេន​បណ្ដាញ​ទូរសព្ទ​ចល័ត"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"ការប្រើប្រាស់​កម្មវិធីចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ការប្រើប្រាស់​ឧបករណ៍​ចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"កំពុងដាស់ឧបករណ៍​នៅ​ផ្ទៃខាងក្រោយ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"កំពុង​ស្នើ​ទីកន្លែង​ច្រើនដងហើយ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"កម្មវិធី <xliff:g id="NUMBER">%1$d</xliff:g> កំពុងដំណើរការខុសធម្មតា"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ថ្ម​នៅ​ដំណើរការ​ល្អ"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"កម្មវិធី​កំពុង​ដំណើរការ​ជា​ធម្មតា"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"កម្លាំងថ្មខ្សោយ"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ថ្ម​មិន​អាច​ផ្តល់​កម្រិត​ថាមពល​ថ្ម​ខ្លាំងទេ"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"កែ​លម្អ​កម្រិត​ថាមពល​ថ្ម​ទូរសព្ទរបស់អ្នក"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ថេប្លេត​ត្រូវបានប្រើប្រាស់ច្រើន​ជាង​ធម្មតា"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ឧបករណ៍​ត្រូវបានប្រើប្រាស់​ច្រើន​ជាង​ធម្មតា"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"អាចនឹងអស់ថ្មក្នុងពេលបន្តិចទៀត"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"ទូរសព្ទ​របស់អ្នក​មាន​ការ​​ប្រើ​ប្រាស់ច្រើន​ជាង​ធម្មតា ដូច្នេះថាមពលថ្ម​​អាច​នឹង​ឆាប់អស់ជាង​ការរំពឹងទុក។\n\nកម្មវិធី <xliff:g id="NUMBER">%1$d</xliff:g> ប្រើថ្មច្រើន​ជាងគេ ចាប់តាំងពី​សាក​ថ្មពេញលើក​ចុងក្រោយ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)៖"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"ថេប្លេត​របស់អ្នក​មាន​ការ​​ប្រើ​ប្រាស់ច្រើន​ជាង​ធម្មតា ដូច្នេះថាមពលថ្ម​​អាច​នឹង​ឆាប់អស់ជាង​ការរំពឹងទុក។\n\nកម្មវិធី <xliff:g id="NUMBER">%1$d</xliff:g> ប្រើថ្មច្រើន​ជាងគេ ចាប់តាំងពី​សាកថ្មពេញលើក​ចុងក្រោយ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)៖"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"ឧបករណ៍​របស់អ្នក​មាន​ការប្រើ​ប្រាស់ច្រើន​ជាង​ធម្មតា ដូច្នេះថាមពលថ្ម​​អាច​នឹង​ឆាប់អស់ជាង​ការរំពឹងទុក។\n\nកម្មវិធី <xliff:g id="NUMBER">%1$d</xliff:g> ប្រើថ្មច្រើន​ជាងគេ ចាប់តាំងពី​សាកថ្មពេញលើក​ចុងក្រោយ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)៖"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">ដាក់​កំហិត​កម្មវិធី %1$d</item>
       <item quantity="one">ដាក់​កំហិត​កម្មវិធី %1$d</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"កម្មវិធី​នេះ​​​នឹងអាចប្រើថ្ម​នៅ​ផ្ទៃ​ខាង​ក្រោយបាន។ ថ្ម​របស់អ្នក​អាចនឹង​​ឆាប់អស់​ជាង​ការរំពឹងទុក។"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"លុប"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"បោះបង់"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ជាធម្មតា ថ្ម​របស់អ្នក​​អាច​ប្រើ​បាន​ប្រហែល <xliff:g id="TIME_DURATION">%1$s</xliff:g> នៅ​ពេល​​សាក​ពេញ ផ្អែកតាម​ការប្រើប្រាស់​របស់អ្នក។\n\nប្រសិនបើ​អ្នក​ត្រូវការ​បង្កើន​រយៈពេល​ប្រើប្រាស់ថាមពល​ថ្ម សូម​បើក​កម្មវិធី​សន្សំ​ថ្ម។"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ប្រសិនបើ​អ្នក​ត្រូវការ​បង្កើន​រយៈពេល​ប្រើប្រាស់ថាមពល​ថ្ម​ សូម​បើក​កម្មវិធី​សន្សំ​ថ្ម"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"កម្មវិធី​គ្រប់គ្រង​ថ្ម"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"គ្រប់គ្រង​កម្មវិធី​ដោយ​ស្វ័យប្រវត្តិ"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ដាក់កម្រិត​ថ្ម​សម្រាប់​កម្មវិធី​ដែល​អ្នក​មិន​ប្រើ​ញឹកញាប់"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"អនុញ្ញាត​សញ្ញា​ដែលមើល​ឃើញ"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"ដាក់​កំហិត​ការ​ជូនដំណឹង"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"នៅ​ពេល​មុខងារ​កុំ​រំខាន​បើក"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ការ​ជូនដំណឹង"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"នៅ​ពេល​មុខងារ​កុំ​រំខាន​បើក"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"បិទសំឡេង​ការជូនដំណឹង"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"បង្ហាញ​ការ​ជូនដំណឹង ប៉ុន្តែ​បិទ​សំឡេង និង​ការញ័រ"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"នៅ​ពេលមាន​ការ​ជូនដំណឹង​ថ្មី ទូរសព្ទ​របស់អ្នក​នឹង​មិន​បន្លឺ​សំឡេង ឬ​ញ័រ​​ទេ"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"លាក់ និងបិទសំឡេងការ​ជូនដំណឹង​"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"ការ​ជូនដំណឹង​នឹង​មិន​បង្ហាញ​ឡើយ"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"អ្នក​នឹង​មិន​ឃើញ​ការ​ជូនដំណឹង​ថ្មី ឬ​មានស្រាប់​ទេ នៅពេល​ដែល​មុខងារ​កុំ​រំខាន​បើក។ ប៉ុន្តែ ការជូន​ដំណឹងចាំបាច់សម្រាប់សកម្មភាព និង​ស្ថានភាព​ទូរសព្ទ​មូលដ្ឋាន​នឹងនៅ​តែ​បង្ហាញ​ដដែល។"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"បង្ហាញការជូនដំណឹងស្ងាត់ៗ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ការជូន​ដំណឹង​នឹង​ត្រូវ​បានបិទ​សំឡេង"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"នៅ​ពេល​មាន​ការ​ជូនដំណឹង ទូរសព្ទ​របស់អ្នក​នឹង​មិន​បន្លឺ​សំឡេង ឬ​ញ័រ​ទេ។"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"លាក់​ការជូន​ដំណឹង"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"អ្នក​នឹង​មិន​ឃើញ​ការ​ជូនដំណឹង​ថ្មីៗ ឬ​ដែល​មាន​ស្រាប់​ទេ"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ទូរសព្ទ​របស់អ្នក​នឹងមិន​បង្ហាញ​ការ​ជូនដំណឹង​ថ្មីៗ ឬ​ដែលមាន​ស្រាប់​ ហើយ​នឹងមិន​បន្លឺសំឡេង ឬញ័រ​ទេ។ ការជូនដំណឹង​នឹងមិន​បង្ហាញទេ នៅពេលអ្នកអូស​អេក្រង់​របស់អ្នក​ពី​លើ​ចុះ​ក្រោម។\n\nសូមចាំថា ការជូនដំណឹង​សំខាន់ៗ​សម្រាប់​ស្ថានភាព និង​សកម្មភាព​ទូរសព្ទនឹង​នៅតែ​បង្ហាញ។"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"តាម​បំណង"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"បើក​ការ​កំណត់​តាមបំណង"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"លុប​ការ​កំណត់​តាម​បំណង"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other">ច្បាប់ <xliff:g id="ON_COUNT">%d</xliff:g> អាច​បើក​បាន​ដោយ​ស្វ័យ​ប្រវត្តិ</item>
       <item quantity="one">ច្បាប់ 1 អាច​បើក​បាន​ដោយ​ស្វ័យ​ប្រវត្តិ</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"យល់ព្រម"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"សកម្មភាព"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ការលើក​លែង"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"កាលវិភាគ"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"សំឡេង និងការញ័រ"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"នៅ​ពេល​មុខងារ​កុំ​រំខាន​បើក សំឡេង និង​ការញ័រ​នឹង​ត្រូវ​បាន​បិទសំឡេង ​លើក​លែង​តែ​ធាតុ​ដែល​អ្នក​អនុញ្ញាត​ខាងលើ​តែ​ប៉ុណ្ណោះ។"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"បិទសំឡេង​ទាំងអស់​លើកលែងតែ"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"បានបិទសំឡេង"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"មិនបាន​បិទ​សំឡេង​ទេ"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"បានបិទ​សំឡេង​ ប៉ុន្តែ​អនុញ្ញាត <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"បានបិទ​សំឡេង ប៉ុន្តែ​អនុញ្ញាត​ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> និង <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"បានបិទ​សំឡេង​ ប៉ុន្តែ​អនុញ្ញាត​ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> និង <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"សារ ព្រឹត្តិការណ៍ និងការរំលឹក"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"នៅ​ពេល​មុខងារ​កុំរំខាន​បើក សារ ការរំលឹក និង​ព្រឹត្តិការណ៍​នឹង​​ត្រូវបានបិទ​សំឡេង លើក​លែង​តែធាតុ​ដែល​អ្នកអនុញ្ញាត​ខាង​លើតែប៉ុណ្ណោះ។ អ្នក​អាច​កែតម្រូវ​ការកំណត់​សារ ដើម្បី​អនុញ្ញាត​​ឱ្យ​មិត្តភ័ក្តិ ក្រុមគ្រួសារ ឬ​ទំនាក់ទំនង​ផ្សេង​ទៀត​របស់អ្នកអាច​ទាក់ទង​អ្នកបាន។"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"ធ្វើ​បច្ចុប្បន្នភាព"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"កុំ​ធ្វើ​បច្ចុប្បន្នភាព"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"ទូរសព្ទ​របស់អ្នក​អាច​ធ្វើ​អ្វីៗ​បាន​ច្រើន ដើម្បី​ជួយ​ឱ្យ​​អ្នក​ផ្ដោត​អារម្មណ៍។\n\nធ្វើ​បច្ចុប្បន្នភាព​​​ការកំណត់ ដើម្បី៖\n\n- លាក់​ការជូនដំណឹង​ទាំងស្រុង\n\n- អនុញ្ញាត​ឱ្យ​ហៅទូរសព្ទ​ពី​ទំនាក់ទំនង​ដែល​មាន​ផ្កាយ និង​អ្នក​ហៅ​ទូរសព្ទ​ដដែលៗ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"ធ្វើ​បច្ចុប្បន្នភាព​មុខងារ​កុំរំខាន?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ការកំណត់"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"អ្នកអាច​ប្ដូរវាបន្ថែម​តាមបំណង​នៅក្នុងការកំណត់។"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"ទប់ស្កាត់នៅពេល​អេក្រង់បើក"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"ទប់ស្កាត់នៅពេលអេក្រង់បិទ"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"មុខងារកុំរំខានអាចធ្វើសកម្មភាពលើសពីការទប់ស្កាត់សំឡេងមិនចង់ឮ។ វាក៏អាច​ទប់ស្កាត់រូបភាព​ផងដែរ។ ចំណុចនេះអាចមានប្រយោជន៍ ប្រសិនបើអ្នកកំពុងព្យាយាមគេង ផ្តោតអារម្មណ៍ ឬកម្រិតរយៈពេលប្រើប្រាស់ទូរសព្ទរបស់អ្នក។"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ទប់ស្កាត់សំឡេង និងរូបភាព"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"កុំបើក​អេក្រង់ ឬដាស់សម្រាប់​ការជូនដំណឹង"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"កុំបង្ហាញការជូនដំណឹងឱ្យសោះ លើកលែងតែស្ថានភាព និងសកម្មភាពមូលដ្ឋានរបស់ទូរសព្ទ"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"សំឡេងប្រវត្តិរូបការងារ"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ទៅ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ហៅ"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"នៅពេល​មុខងារ​កុំរំខាន​បើក ការហៅចូល​ត្រូវបាន​ទប់ស្កាត់។ អ្នកអាច​កែតម្រូវ​ការកំណត់ ដើម្បី​អនុញ្ញាតឱ្យ​មិត្តភ័ក្តិ គ្រួសារ ឬទំនាក់ទំនង​ផ្សេងទៀត​របស់អ្នក​អាចទាក់ទង​អ្នកបាន។​"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"សារ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"សារទាំងអស់"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"សារបានជ្រើសរើស"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"សារ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"សារ​មួយចំនួន"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ពីអ្នករាល់គ្នា"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ពីទំនាក់ទំនងតែប៉ុណ្ណោះ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ពីទំនាក់ទំនងមានផ្កាយតែប៉ុណ្ណោះ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ពីទំនាក់​ទំនងមានផ្កាយ និង​អ្នកហៅ​ទូរសព្ទ​ដដែលៗ"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"ពីទំនាក់​ទំនង និង​អ្នកហៅ​ទូរសព្ទ​ដដែលៗ"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ពីអ្នកហៅ​ទូរសព្ទ​ដដែលៗតែ​ប៉ុណ្ណោះ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"គ្មាន"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ម៉ោងរោទ៍"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"មេឌៀ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"សំឡេង​ចុច"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"កម្មវិធីរំលឹក"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ព្រឹត្តិការណ៍"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"អ្នកហៅទូរស័ព្ទទាំងអស់"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"អ្នកហៅចូលបានជ្រើស"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"អ្នក​ណា​ក៏​បាន"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ទំនាក់​ទំនង"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ទំនាក់​ទំនង​​​​​មាន​ផ្កាយ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"អ្នកហៅចូលសាជាថ្មី"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"ពី <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ​តែប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"ពី <xliff:g id="CALLER_TYPE">%1$s</xliff:g> និង <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ប្រសិនបើមនុស្សតែមួយហៅទូរសព្ទជាលើកទីពីរក្នុងរយៈពេល <xliff:g id="MINUTES">%d</xliff:g> នាទី"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ផ្ទាល់ខ្លួន"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"បើកដោយស្វ័យ​ប្រវត្តិ"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ច្បាប់នៃរបៀបកុំរំខានទាំងអស់ដែលបានបង្កើតដោយកម្មវិធីនេះនឹងត្រូវយកចេញ។"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"កុំបង្កើនប្រសិទ្ធភាព"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"បង្កើនប្រសិទ្ធភាព"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"អាចនឹងស៊ីថ្មរបស់អ្នកលឿនជាងមុន"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"បានណែនាំដើម្បីធ្វើឲ្យថ្មប្រើបានយូរជាងមុន"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"អនុញ្ញាតឲ្យ <xliff:g id="APP">%s</xliff:g> មិនអើពើលើការបង្កើនប្រសិទ្ធិភាពថ្ម?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"គ្មាន"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"បានបិទដំណើរការការបម្រុងទុក"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"បានដំឡើង​ជំនាន់ទៅ Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"មាន​កំណែថ្មី"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"មិន​អាចផ្លាស់ប្ដូរការ​កំណត់​នេះ​បាន​ទេ"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"សកម្មភាពមិនអនុញ្ញាត"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"មិនអាចផ្លាស់ប្ដូរកម្រិតសំឡេងបានទេ"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"មិន​អនុញ្ញាតឲ្យហៅទូរសព្ទទេ"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"មិនអនុញ្ញាតសារ SMS ទេ"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"គ្រប់គ្រង​ព័ត៌មាន​លើអេក្រង់ចាក់សោ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"បង្ហាញ ឬលាក់មាតិកាជូនដំណឹង"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ទាំងអស់"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"ជំនួយ និងគន្លឹះ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"គន្លឹះ និង​ជំនួយ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ទទឹងតូចបំផុត"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"មិនមានកម្មវិធីដែលដំឡើងហើយបានស្នើសុំការចូលដំណើរការសេវាកម្ម SMS ពិសេសទេ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"សេវាកម្ម SMS ពិសេសអាចនឹងគិតថ្លៃ ហើយបន្ថែមតម្លៃនោះទៅក្នុងវិក្កយបត្រក្រុមហ៊ុនផ្តល់សេវាទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើដំណើរការសិទ្ធិអនុញ្ញាតសម្រាប់កម្មវិធីណាមួយ នោះអ្នកនឹងអាចផ្ញើសេវាកម្ម SMS ពិសេសដោយប្រើកម្មវិធីនោះ។"</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"កម្មវិធីភាពយន្ត និងទូរទស្សន៍"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ព័ត៌មាន​អំពី​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ជំរុញ​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"តើមានអ្វីដែលថ្មី និងគួរឲ្យចាប់អារម្មណ៍ដែរទេ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"មើលការណែនាំ​ទូរសព្ទថ្មី​របស់អ្នក"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"មើលការណែនាំ​ថេប្លេតថ្មីរបស់អ្នក"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 5041af5..4bbb711 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ಸಿಮ್ ಪ್ರವೇಶ ವಿನಂತಿ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ನಿಮ್ಮ ಸಿಮ್ ಕಾರ್ಡ್ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ಸಿಮ್ ಕಾರ್ಡ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿದರೆ, ಸಂಪರ್ಕಪಡಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಡೇಟಾ ಸಂಪರ್ಕಪಡಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ಇತರ ಸಾಧನಗಳಿಗೆ “<xliff:g id="DEVICE_NAME">^1</xliff:g>” ಎಂದು ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ನಿಮ್ಮ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ಸಮೀಪದ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಅನುಮತಿಸಿ"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM ಗಳನ್ನು ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"ದೋಷದ ಕಾರಣದಿಂದಾಗಿ eSIM ಅನ್ನು ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ ಹಾಕುತ್ತದೆ. ಡೇಟಾ ಇವುಗಳನ್ನೂ ಒಳಗೊಂಡಿರಬಹುದು:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">ಬಹಳ ಹೆಚ್ಚು ವಿಳಂಬ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ಮಿ.ಸೆ)</item>
       <item quantity="other">ಬಹಳ ಹೆಚ್ಚು ವಿಳಂಬ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ಮಿ.ಸೆ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ರಿಂಗ್ ಮತ್ತು ಅಧಿಸೂಚನೆಯನ್ನು ಆಫ್‌ಗೆ ಹೊಂದಿಸಿ"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ರಿಂಗ್‌ ಮತ್ತು ಅಧಿಸೂಚನೆಯನ್ನು ಕಡಿಮೆ ಧ್ವನಿಗೆ ಹೊಂದಿಸಿ"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ರಿಂಗ್‌ ಮತ್ತು ಅಧಿಸೂಚನೆಯನ್ನು ಮಧ್ಯಮ ಧ್ವನಿಗೆ ಹೊಂದಿಸಿ"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್ ಬಳಿಕ ಪರದೆಯ ಬಳಕೆ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ಪರದೆ ಬಳಕೆ ಮಾಡಿದ್ದು"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಸಾಧನದ ಬಳಕೆ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ಸಾಧನವನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿದೆ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ಆಗಾಗ್ಗೆ ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"ಅನುಚಿತವಾಗಿ ವರ್ತಿಸುತ್ತಿರುವ <xliff:g id="NUMBER">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ಬ್ಯಾಟರಿ ಉತ್ತಮ ಆಕಾರದಲ್ಲಿದೆ"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತವೆ"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ಕಡಿಮೆ ಬ್ಯಾಟರಿ ಸಾಮರ್ಥ್ಯ"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ಬ್ಯಾಟರಿ ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ಒದಗಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"ನಿಮ್ಮ ಫೋನ್‌ನ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ಸುಧಾರಿಸಿ"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ಟ್ಯಾಬ್ಲೆಟ್ ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ಸಾಧನವು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ಬ್ಯಾಟರಿ ಸದ್ಯದಲ್ಲೇ ಮುಕ್ತಾಯವಾಗಬಹುದು"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ.ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಮುಕ್ತಾಯವಾಗಬಹುದು.\n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ <xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g> ಉನ್ನತ <xliff:g id="NUMBER">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ.ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಮುಕ್ತಾಯವಾಗಬಹುದು.\n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ <xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g> ಉನ್ನತ <xliff:g id="NUMBER">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಮುಕ್ತಾಯವಾಗಬಹುದು.\n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ <xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g> ಉನ್ನತ <xliff:g id="NUMBER">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one"> %1$d ರಷ್ಟು ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ</item>
       <item quantity="other"> %1$d ರಷ್ಟು ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ಬಳಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಸಾಧ್ಯವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿ ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಮುಕ್ತಾಯವಾಗಬಹುದು."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"ತೆಗೆದುಹಾಕಿ"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"ರದ್ದು ಮಾಡಿ"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ನಿಮ್ಮ ಬಳಕೆಯನ್ನು ಆಧರಿಸಿ, ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಪೂರ್ತಿಯಾಗಿ ಚಾರ್ಜ್‌ಮಾಡಿದಾಗ ಸುಮಾರು <xliff:g id="TIME_DURATION">%1$s</xliff:g> ಸಮಯದವರೆಗೆ ಇರುತ್ತದೆ.\n\nನಿಮ್ಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ಹೆಚ್ಚಿಸಲು ನೀವು ಬಯಸಿದರೆ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಅನ್ನು ಆನ್‌ ಮಾಡಿ."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ಹೆಚ್ಚಿಸಲು ನೀವು ಬಯಸಿದರೆ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಅನ್ನು ಆನ್‌ ಮಾಡಿ."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ಬ್ಯಾಟರಿ ನಿರ್ವಾಹಕ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ನೀವು ಪದೇ ಪದೇ ಉಪಯೋಗಿಸದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಬ್ಯಾಟರಿಯನ್ನು ಸೀಮಿತಗೊಳಿಸಿ"</string>
@@ -3075,38 +3094,21 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ದೃಶ್ಯ ಸಂಕೇತಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಶ್ಯಬ್ಧವಾಗಿ ತೋರಿಸಿ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ ನಿಮ್ಮ ಫೋನ್ ಧ್ವನಿ ಮಾಡುವುದಿಲ್ಲ ಅಥವಾ ವೈಬ್ರೇಟ್‌ ಆಗುವುದಿಲ್ಲ."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ನೀವು ಹೊಸ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡುವುದಿಲ್ಲ"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ನಿಮ್ಮ ಫೋನ್ ಹೊಸ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸುವುದಿಲ್ಲ, ಮತ್ತು ಧ್ವನಿ ಅಥವಾ ವೈಬ್ರೇಟ್ ಮಾಡುವುದಿಲ್ಲ. ನೀವು ಸ್ಕ್ರೀನ್‍ನ ಮೇಲಿನಿಂದ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದಾಗ ಅಧಿಸೂಚನೆಗಳು ಗೋಚರಿಸುವುದಿಲ್ಲ.\n\nನೆನಪಿನಲ್ಲಿಡಿ, ಫೋನ್ ನ ಚಟುವಟಿಕೆಯ ಮತ್ತು ಸ್ಥಿತಿಯ ಗಂಭೀರ ಅಧಿಸೂಚನೆಗಳು ಇನ್ನೂ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ."</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ಕಸ್ಟಮ್"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ಕಸ್ಟಮ್ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ಕಸ್ಟಮ್ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ಭಾಗಶಃ ಮರೆಮಾಡಲಾಗಿದೆ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ಮರೆಮಾಡಿರುವುದು"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ಕಸ್ಟಮ್ ನಿರ್ಬಂಧಗಳು"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"ಪರದೆಯು ಆನ್ ಆಗಿರುವಾಗ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"ಪರದೆಯು ಆಫ್ ಆಗಿರುವಾಗ"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌ ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಿ"</string>
@@ -3151,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ನಿಯಮಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ನಿಯಮಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ಸರಿ"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ವರ್ತನೆ"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ವಿನಾಯಿತಿಗಳು"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"ವೇಳಾಪಟ್ಟಿ"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ಧ್ವನಿ &amp; ವೈಬ್ರೇಷನ್‌"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ಹೊರತುಪಡಿಸಿ ಎಲ್ಲವನ್ನೂ ಮ್ಯೂಟ್ ಮಾಡಿ"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ಮ್ಯೂಟ್‌ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ <xliff:g id="SOUND_TYPE">%1$s</xliff:g> ರನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ಮತ್ತು <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ರನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, ಮತ್ತು <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> ರನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ಸಂದೇಶಗಳು, ಈವೆಂಟ್‌ಗಳು &amp; ಜ್ಞಾಪನೆಗಳು"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಸಂದೇಶಗಳು, ಜ್ಞಾಪನೆಗಳು ಮತ್ತು ಈವೆಂಟ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ಸಂದೇಶಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೀವು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"ಅಪ್‍ಡೇಟ್ ಮಾಡಿ"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"ಅಪ್‌ಡೇಟ್ ಮಾಡಬೇಡಿ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"ನಿಮ್ಮ ಗಮನವನ್ನು ಕೇಂದ್ರೀಕರಿಸಲು ನಿಮ್ಮ ಫೋನ್ ನಿಮಗೆ ಸಹಾಯ ಮಾಡಲು ಇನ್ನಷ್ಟು ಮಾಡಬಹುದು.\n\nಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ:\n\n- ಅಧಿಸೂಚನೆಗಳನ್ನು ಸಂಪೂರ್ಣವಾಗಿ ಮರೆಮಾಡಿ\n\n- ನಕ್ಷತ್ರ ಹಾಕಿರುವ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು ಕರೆ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡುವುದೇ?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಇದನ್ನು ಇನ್ನಷ್ಟು ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"ಸ್ಕ್ರೀನ್ ಆನ್‌ ಆಗಿರುವಾಗ ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ ಆಫ್‌ ಮಾಡಿ"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಬ್ಲಾಕ್ ಅನಗತ್ಯ ಶಬ್ದಗಳಿಗಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಬಹುದು - ಇದು ದೃಶ್ಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಬಹುದು. ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಖರ್ಚು ಮಾಡುವ ಸಮಯವನ್ನು ನಿದ್ರೆ, ಗಮನ, ಅಥವಾ ಮಿತಿಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿದ್ದರೆ ಇದು ಸಹಾಯಕವಾಗಬಹುದು."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ಧ್ವನಿಗಳು ಮತ್ತು ದೃಶ್ಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"ಅಧಿಸೂಚನೆಘಳಿಗೆ ಎಚ್ಚರಿಸಬೇಡಿ ಅಥವಾ ಪರದೆಯನ್ನು ಆನ್‌ ಮಾಡಬೇಡಿ"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ಮೂಲಭೂತ ಫೋನ್ ಚಟುವಟಿಕೆ ಮತ್ತು ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ, ಬೇರೆಯಲ್ಲಿ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಲೇ ಬೇಡ."</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳು"</string>
@@ -3328,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ರಿಂದ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ಕರೆಗಳು"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಆದಾಗ ಒಳಬರುವ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ಸಂದೇಶಗಳು"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"ಎಲ್ಲಾ ಸಂದೇಶಗಳು"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ಆಯ್ಕೆ ಮಾಡಿದ ಸಂದೇಶಗಳು"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"ಸಂದೇಶಗಳು"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ಕೆಲವು ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ಯಾರಿಂದಲಾದರೂ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ಸಂಪರ್ಕಗಳಿಂದ ಮಾತ್ರ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ನಕ್ಷತ್ರ ಹಾಕಲಾದ ಸಂಪರ್ಕಗಳಿಂದ ಮಾತ್ರ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ನಕ್ಷತ್ರ ಹಾಕಿದ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಪುನರಾವರ್ತಿತ ಕರೆ ಮಾಡುವವರು"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"ಇಂದ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಪುನರಾವರ್ತಿತ ಕರೆ ಮಾಡುವವರು"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ಪುನರಾವರ್ತಿತ ಕರೆ ಮಾಡುವವರಿಂದ ಮಾತ್ರ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ಅಲಾರಮ್‌ಗಳು"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"ಮಾಧ್ಯಮ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ಸ್ಪರ್ಶ ಧ್ವನಿಗಳು"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ಜ್ಞಾಪನೆಗಳು"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ಈವೆಂಟ್‌ಗಳು"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"ಎಲ್ಲ ಕರೆದಾರರು"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ಆಯ್ಕೆಮಾಡಲಾದ ಕರೆದಾರರು"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ಯಾರಾದರೂ"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ಸಂಪರ್ಕಗಳು"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ನಕ್ಷತ್ರ ಹಾಕಿದ ಸಂಪರ್ಕಗಳು"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ರಿಂದ ಮಾತ್ರ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ಮತ್ತು <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> ರಿಂದ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ಒಂದು ವೇಳೆ ಒಬ್ಬನೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷಗಳೊಳಗೆ ಎರಡನೇ ಬಾರಿ ಕರೆ ಮಾಡಿದರೆ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ಕಸ್ಟಮ್"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್‌ ಆಗುವಿಕೆ"</string>
@@ -3612,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ಈ ಅಪ್ಲಿಕೇಶನ್ ರಚಿಸಿರುವಂತಹ ಎಲ್ಲ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಬೇಡಿ"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡು"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಹೆಚ್ಚು ತ್ವರಿತವಾಗಿ ಬರಿದಾಗಬಹುದು"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಗೆ ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳನ್ನು ಕಡೆಗಣಿಸಲು <xliff:g id="APP">%s</xliff:g> ಗೆ ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ಯಾವುದೂ ಇಲ್ಲ"</string>
@@ -3688,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ಬ್ಯಾಕ್‌ಅಪ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> ಗೆ ಅಪ್‌ಡೇಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ಅಪ್‌ಡೇಟ್‌‌ ಲಭ್ಯವಿದೆ"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ಈ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ಚಟುವಟಿಕೆಯನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ವಾಲ್ಯೂಮ್ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ಕರೆ ಮಾಡುವುದಕ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ಎಸ್ಎಂಎಸ್‌ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
@@ -3878,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"ಲಾಕ್ ಪರದೆಯ ಮೇಲೆ ನಿಯಂತ್ರಣದ ಮಾಹಿತಿ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ಅಧಿಸೂಚನೆಯ ವಿಷಯವನ್ನು ತೋರಿಸು ಅಥವಾ ಮರೆಮಾಡು"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ಎಲ್ಲಾ"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"ಬೆಂಬಲ ಮತ್ತು ಸಲಹೆಗಳು"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ಸಲಹೆಗಳು &amp; ಬೆಂಬಲ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ಚಿಕ್ಕದಾದ ಅಗಲ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಪ್ರೀಮಿಯಂ SMS ಪ್ರವೇಶವನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ಪ್ರೀಮಿಯಂ SMS ನಿಮ್ಮ ವೆಚ್ಚಗಳಿಗೆ ಕಾರಣವಾಗಬಹುದು ಮತ್ತು ಇದನ್ನು ನಿಮ್ಮ ವಾಹಕ ಬಿಲ್‌ಗಳಿಗೆ ಸೇರಿಸಲಾಗುತ್ತದೆ. ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯನ್ನು ಸಕ್ರೀಯಗೊಳಿಸಿದರೆ, ನೀವು ಆ ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸಿಕೊಂಡು ಪ್ರೀಮಿಯಂ SMS ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
@@ -4071,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"ಚಲನಚಿತ್ರ ಮತ್ತು ಟಿವಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ವಾಹಕ ಪೂರೈಕೆಯ ಮಾಹಿತಿ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ಟ್ರಿಗ್ಗರ್ ವಾಹಕ ಪೂರೈಕೆ"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ಆಕರ್ಷಕವಾಗಿ ಮತ್ತು ಹೊಸದಾಗಿ ಏನಿದೆ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ನಿಮ್ಮ ಹೊಸ ಫೋನ್‌ನ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ನಿಮ್ಮ ಹೊಸ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಬಳಕೆ ಪ್ರಾರಂಭಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 23f0171..6c18b0e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 액세스 요청"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>이(가) SIM 카드에 액세스하려고 합니다. SIM 카드에 대한 액세스를 허용하면 연결되어 있는 동안 기기의 데이터 연결이 비활성화됩니다. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>에 액세스 권한을 부여하세요."</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"다른 기기에 \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'(으)로 표시됩니다."</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"내 기기"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"새 기기와 페어링"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"태블릿이 주변 블루투스 기기와 통신하도록 허용"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM을 재설정할 수 없음"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"오류로 인해 eSIM을 재설정할 수 없습니다."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"모든 데이터 삭제(초기화)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"초기화하면 다음을 포함한 휴대전화 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">매우 긴 지연(<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>밀리초)</item>
       <item quantity="one">매우 긴 지연(<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>밀리초)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"벨소리 및 알림이 꺼짐으로 설정되었습니다."</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"벨소리 및 알림이 낮음으로 설정되었습니다."</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"벨소리 및 알림이 중간으로 설정되었습니다."</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"충전 완료 후 화면 사용"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"화면 소비 전력"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"충전 완료(<xliff:g id="RELATIVE_TIME">^1</xliff:g>) 후 앱 사용량"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"충전 완료(<xliff:g id="RELATIVE_TIME">^1</xliff:g>) 후 기기 사용량"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"백그라운드에서 기기를 작동시킴"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"너무 잦은 위치정보 요청"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"앱 <xliff:g id="NUMBER">%1$d</xliff:g>개에서 오류 발생"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"배터리 상태가 좋음"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"앱이 정상적으로 작동 중입니다."</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"배터리 용량 낮음"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"배터리 수명이 짧은 상태입니다"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"휴대전화 배터리 수명 향상"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"태블릿을 평소보다 더 많이 사용함"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"기기를 평소보다 더 많이 사용함"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"배터리가 얼마 남지 않았습니다."</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"휴대전화를 평소보다 더 많이 사용했습니다. 배터리가 예상보다 빨리 소진될 수 있습니다.\n\n마지막으로 완전히 충전(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)한 이후 배터리를 가장 많이 사용한 앱 <xliff:g id="NUMBER">%1$d</xliff:g>개는 다음과 같습니다."</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"태블릿을 평소보다 더 많이 사용했습니다. 배터리가 예상보다 빨리 소진될 수 있습니다.\n\n마지막으로 완전히 충전(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)한 이후 배터리를 가장 많이 사용한 앱 <xliff:g id="NUMBER">%1$d</xliff:g>개는 다음과 같습니다."</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"기기를 평소보다 더 많이 사용했습니다. 배터리가 예상보다 빨리 소진될 수 있습니다.\n\n마지막으로 완전히 충전(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)한 이후 배터리를 가장 많이 사용한 앱 <xliff:g id="NUMBER">%1$d</xliff:g>개는 다음과 같습니다."</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d개 앱 제한</item>
       <item quantity="one">%1$d개 앱 제한</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"이 앱은 백그라운드에서 배터리를 사용할 수 있으므로 배터리가 예상보다 빨리 소진될 수 있습니다."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"삭제"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"취소"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"사용량에 따라 배터리를 완전히 충전했을 때 약 <xliff:g id="TIME_DURATION">%1$s</xliff:g>동안 사용할 수 있습니다.\n\n배터리 수명을 늘리려면 배터리 세이버를 사용 설정하세요."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"배터리 수명을 늘리려면 배터리 세이버를 사용 설정하세요."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"배터리 관리자"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"자동으로 앱 관리"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"자주 사용하지 않는 앱의 배터리 사용량 제한"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"시각적 신호 허용"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"알림 제한"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"알림 일시중지 사용 시"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"알림"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"알림 일시중지 사용 시"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"알림 음소거"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"알림이 표시되지만 소리 및 진동이 음소거됩니다."</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"새로운 알림이 도착해도 휴대전화에서 소리가 나거나 진동이 울리지 않습니다."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"알림 숨기기 및 음소거"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"알림이 전혀 표시되지 않습니다."</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"알림 일시중지가 켜져 있으면 새로운 알림이나 기존 알림이 표시되지 않습니다. 하지만 기본적인 휴대전화 활동 및 상태를 표시하는 데 필요한 알림은 계속 표시됩니다."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"무음으로 알림 표시"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"알림이 음소거됨"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"알림이 도착해도 휴대전화에서 소리가 나거나 진동이 울리지 않습니다."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"알림 숨기기"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"새로운 알림이나 기존 알림이 표시되지 않음"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"휴대전화에 새로운 알림이나 기존 알림이 표시되지 않으며, 소리나 진동이 울리지 않습니다. 또한 화면 상단에서 아래로 스와이프해도 알림이 표시되지 않습니다.\n\n하지만 휴대전화 활동 및 상태에 관한 중요한 알림은 계속해서 표시됩니다."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"맞춤"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"맞춤 설정 사용"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"맞춤 설정 삭제"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>개의 규칙이 자동으로 켜질 수 있습니다.</item>
       <item quantity="one">1개의 규칙이 자동으로 사용 설정될 수 있습니다.</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"확인"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"동작"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"예외"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"일정"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"소리 및 진동"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 소리 및 진동이 음소거됩니다."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"다음을 제외하고 모두 음소거"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"음소거됨"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"음소거되지 않음"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"<xliff:g id="SOUND_TYPE">%1$s</xliff:g>을(를) 제외하고 음소거됨"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> 및 <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>을(를) 제외하고 음소거됨"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>을(를) 제외하고 음소거됨"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"메시지, 일정, 알림"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"업데이트"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"업데이트 안함"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"중요한 일에 집중할 수 있도록 휴대전화를 설정하세요.\n\n설정을 업데이트하면 다음과 같이 할 수 있습니다.\n\n- 알림 완전히 숨기기\n\n- 별표표시된 연락처와 반복해서 전화하는 발신자의 통화 수신"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"알림 일시중지를 업데이트하시겠습니까?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"설정"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"설정에서 더욱 상세하게 맞춤설정할 수 있습니다."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"화면이 켜져 있을 때 차단"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"화면이 꺼져 있을 때 차단"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"알림 일시중지는 원하지 않는 소리뿐만 아니라 화면에 표시되는 내용까지 차단할 수 있습니다. 이 기능은 잠을 자거나 집중할 때 또는 휴대전화 사용 시간을 제한하고 싶을 때 유용하게 활용할 수 있습니다."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"소리 및 화면 표시 내용 차단"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"화면을 켜거나 알림을 사용하지 않음"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"기본적인 휴대전화 활동 및 상태를 제외한 모든 알림을 표시하지 않음"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"직장 프로필 사운드"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>~<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>부터 <xliff:g id="END">%2$s</xliff:g>까지"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"통화"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"알림 일시중지가 사용 설정되어 있으면 수신 전화가 차단됩니다. 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"메시지"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"전체 메시지"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"선택한 메시지"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"메시지"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"일부 메시지"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"누구나"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"주소록의 연락처만"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"별표 표시한 연락처만"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"별표표시된 연락처 및 반복 발신자의 전화"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"연락처 및 반복 발신자의 전화"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"반복 발신자의 전화만"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"없음"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"알람"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"미디어"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"터치음"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"알림"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"이벤트"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"모든 발신자"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"선택한 발신자"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"모든 발신자"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"연락처"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"별표표시된 연락처"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"반복 발신자"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>의 전화만"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> 및 <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>의 전화"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g>분 이내에 같은 사람이 다시 전화를 거는 경우"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"사용자설정"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"자동 사용 설정"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"이 앱에서 생성된 모든 알림 일시중지 규칙이 삭제됩니다."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"최적화하지 않음"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"최적화"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"배터리가 더 빨리 방전될 수 있습니다."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"배터리 수명을 늘리려면 선택하세요."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g>에서 배터리 최적화를 무시하도록 허용할까요?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"없음"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"백업 사용 안함"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> 버전으로 업데이트됨"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"업데이트 가능"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"변경할 수 없는 설정"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"허용되지 않는 작업"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"볼륨을 변경할 수 없음"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"전화를 사용할 수 없음"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"문자 메시지를 사용할 수 없음"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"잠금 화면에서 정보 제어"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"알림 내용 표시 또는 숨기기"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"전체"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"지원 및 도움말"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"도움말 및 지원"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"최소 폭"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"설치된 앱 중에서 프리미엄 SMS 액세스를 요청한 앱이 없습니다."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"프리미엄 SMS는 요금이 부과될 수 있으며 이는 이동통신사 요금에 추가됩니다. 앱에 권한을 부여하면 해당 앱을 사용하여 프리미엄 SMS를 사용할 수 있게 됩니다."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"영화 및 TV 앱"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"흥미로운 새 기능 살펴보기"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"새 휴대전화 둘러보기"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"새 태블릿 둘러보기"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 9b46432..f7597d1 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -166,6 +166,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM карта пайдалануу мүмкүнчүлүгүн суроо"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM картаңызды пайдалануу мүмкүнчүлүгүнө ээ болгусу келет. SIM картаны пайдалануу укугу берилсе, түзмөк SIM картага туташып жатканда дайындарды мобилдик тармак аркылуу өткөрүү кызматтары убактылуу иштебей калат. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> түзмөгүнө SIM картаны пайдалануу мүмкүнчүлүгүн берүү"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Башка түзмөктөргө \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" деп көрүнөт"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Түзмөктөрүңүз"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңы түзмөктү жупташтыруу"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Планшетиңизге жакын жердеги Bluetooth түзмөктөрү менен байланышууга уруксат бериңиз"</string>
@@ -1452,6 +1454,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-карталар кайра коюлган жок"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Катадан улам eSIM-карталар кайра коюлган жок."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Бардык дайындарды тазалоо (баштапкы абалга келтирүү)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Ушул түзмөктөгү аккаунттар:\n"</string>
@@ -1997,6 +2001,8 @@
       <item quantity="other">Өтө узакка кечиктирүү (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
       <item quantity="one">Өтө узакка кечиктирүү (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> мс)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Кимдир-бирөө чалганда жана билдирмелер келгенде дирилдебейт"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Кимдир-бирөө чалганда жана билдирмелер келгенде билинер-билинбес дирилдейт"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Кимдир-бирөө чалганда жана билдирмелер келгенде орточо дирилдейт"</string>
@@ -2104,8 +2110,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Толук кубатталгандан бери экран канча убакыт колдонулду"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Экран керектеген кубат"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобилдик тармак скандалууда"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Толук кубатталгандан бери иштетилген колдонмолор (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Толук кубатталгандан бери түзмөктүн колдонулушу (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2136,8 +2142,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Түзмөк фондо ойготулууда"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Жайгашкан жер көп суралууда"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> колдонмо кызыктай иштеп жатат"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарея толук"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Колдонмолор туура иштеп жатат"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Батарея азыр отуруп калат"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батарея бир аздан кийин отуруп калат"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Телефонуңуздун батарея кубатынын мөөнөтүн узартыңыз"</string>
@@ -2152,9 +2164,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Планшет адаттагыдан көбүрөөк колдонулду"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Түзмөк адаттагыдан көбүрөөк колдонулду"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Батарея жакында отуруп калышы мүмкүн"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Телефонуңуз адаттагыдан көбүрөөк колдонулду. Батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн.\n\nАкыркы толук кубаттоодон бери (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) эң көп батарея сарптаган <xliff:g id="NUMBER">%1$d</xliff:g> колдонмо:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Планшетиңиз адаттагыдан көбүрөөк колдонулду. Батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн.\n\nАкыркы толук кубаттоодон бери (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) эң көп батарея сарптаган <xliff:g id="NUMBER">%1$d</xliff:g> колдонмо:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Түзмөгүңүз адаттагыдан көбүрөөк колдонулду. Батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн.\n\nАкыркы толук кубаттоодон бери (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) эң көп батарея сарптаган <xliff:g id="NUMBER">%1$d</xliff:g> колдонмо:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d колдонмо чектелиши керек</item>
       <item quantity="one">%1$d колдонмо чектелиши керек</item>
@@ -2183,8 +2198,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Бул колдонмо батареяны фондо колдоно берет. Батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Алып салуу"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Жокко чыгаруу"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Колдонгонуңузга караганда, адатта батареяңыз толук кубатталганда болжол менен <xliff:g id="TIME_DURATION">%1$s</xliff:g> иштейт.\n\nБатареянын кубатынын мөөнөтүн узартуу үчүн \"Батареяны үнөмдөгүч\" режимин күйгүзүңүз."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Батареянын кубатынын мөөнөтүн узартуу үчүн \"Батареяны үнөмдөгүч\" режимин күйгүзүңүз"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Колдонмолорду автоматтык түрдө башкаруу"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Сейрек колдонулган колдонмолор чектелген режимде иштешет"</string>
@@ -2318,9 +2337,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Эч качан"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> батарея менен"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Батареянын кубатынын деңгээли"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_percentage_description (8511658577507384014) -->
-    <skip />
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Батареянын кубатынын деңгээли (%%) абал тилкесинде көрүнүп турат"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Процесстин статистикасы"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Иштеп жаткан процесстердин өзгөчө статистикасы"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Эс тутумдун пайдаланылышы"</string>
@@ -3076,15 +3093,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуалдык сигнал иштетилсин"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Билдирмелерди чектөө"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Тынчымды алба\" режими күйүп турганда"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Билдирмелер"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"\"Тынчымды алба\" режими күйүп турганда"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Билдирмелердин үнүн басуу"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Билдирмелер көрүнөт, бирок үндөрү чыкпайт жана дирилдебейт"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Жаңы билдирмелер келгенде телефонуңуздун үнү чыкпайт жана дирилдебейт"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Билдирмелерди жашыруу жана үнүн басуу"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Билдирмелер такыр көрүнбөйт"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"\"Тынчымды алба\" режими күйүп турганда жаңы жана эски билдирмелерди көрбөйсүз. Бирок билдирмелер телефондун негизги аракеттери үчүн зарыл болгондуктан, абалы дагы деле көрүнүп турат."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Үнсүз көрүнөт"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Билдирмелердин үнү басылат"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Билдирмелер келгенде телефонуңуздун үнү чыкпайт же дирилдебейт."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Эскертмелерди жашыруу"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Жаңы же учурдагы билдирмелерди көрбөйсүз"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефонуңуз жаңы же учурдагы билдирмелерди көрсөтпөйт жана үн чыгарып же дирилдебейт. Экранды ылдый сүрсөңүз, билдирмелер көрсөтүлбөйт.\n\nБирок телефондун негизги аракеттери жана абалы үчүн зарыл болгон маанилүү билдирмелер көрсөтүлө берээрин эске алыңыз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Ыңгайлаштырылган"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ыңгайлаштырылган жөндөөнү иштетүү"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ыңгайлаштырылган жөндөөнү алып салуу"</string>
@@ -3136,13 +3152,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> эреже автоматтык түрдө иштетилет</item>
       <item quantity="one">1 эреже автоматтык түрдө иштетилет</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Жарайт"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Аракеттер"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Өзгөчө учурлар"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Графиги"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Үн жана дирилдөө"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары нерселердин үнү чыкпайт жана дирилдебейт."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Төмөнкүлөрдөн тышкары баарынын үнүн басуу:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Үнүн басуу"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Үнсүз эмес"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Үнсүз, бирок төмөнкүгө уруксат берилсин: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Үнсүз, бирок төмөнкүлөргө урусат берилсин: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> жана <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Үнсүз, бирок төмөнкүлөргө уруксат берилсин: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> жана <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Билдирүүлөр, иш-чаралар жана эстеткичтер"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары билдирүүлөр, эстеткичтер жана иш-чаралардын үнү басылат. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Жаңыртылсын"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Жаңыртылбасын"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Телефонуңуз сизди алаксытпай, көңүл топтогонго жардам бере алат.\n\nТөмөнкү жөндөөлөрдү иштетиңиз:\n\n- Билдирмелер толугу менен жашырылсын\n\n- Жылдызча коюлган байланыштар менен кайталап чалгандардын чалууларына уруксат берилсин"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\"Тынчымды алба\" режими жаңыртылсынбы?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Жөндөөлөр"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Муну эми Жөндөөлөрдөн ыңгайлаштырыңыз."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Экран күйүп турганда бөгөттөлсүн"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Экран өчүп турганда бөгөттөлсүн"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\"Тынчымды алба\" режими керексиз добуштарды бөгөттөгөндөн башка дагы көп нерселерди жасай алат – ал визуалдык графиканы да бөгөттөй алат. Бул, эгер сиз уктап, көңүлүңүздү топтоп же телефондо өткөргөн убактыңызды чектегиңиз келсе жардам берет."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Үндөр жана визуалдык графика бөгөттөлсүн"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Экран күйбөсүн жана билдирмелер көрүнбөсүн"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Телефондун негизги аракеттери жана абалынан тышкары билдирмелер такыр көрүнбөсүн"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Жумуш профилиндеги үндөр"</string>
@@ -3186,15 +3216,15 @@
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Билдирмелер эч качан көрүнбөсүн"</string>
     <string name="notification_importance_min" msgid="9054819132085066824">"Үнсүз жана кичирейтип көрсөтүү"</string>
     <string name="notification_importance_low" msgid="2445139943005315690">"Үнсүз көрсөтүлсүн"</string>
-    <string name="notification_importance_default" msgid="5958338024601957516">"Добуш чыгарсын"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"Добуш менен экранга калкып чыксын"</string>
+    <string name="notification_importance_default" msgid="5958338024601957516">"Үн чыгат"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"Үнү менен экранга калкып чыгат"</string>
     <string name="notification_importance_high_silent" msgid="2667033773703765252">"Экранга калкып чыксын"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Төмөн"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Орто"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Жогору"</string>
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Шашылыш"</string>
     <string name="allow_interruption" msgid="7136150018111848721">"Эскертмелерге уруксат берүү"</string>
-    <string name="allow_interruption_summary" msgid="7870159391333957050">"Үндүү сигналдарды, дирилдөөнү иштетип, эскертмелерди башка колдонмолордун үстүнөн көрсөтүү"</string>
+    <string name="allow_interruption_summary" msgid="7870159391333957050">"Үнү чыгат, дирилдейт жана билдирмелер башка колдонмолордун үстүнөн көрүнөт"</string>
     <string name="notification_channel_summary_min" msgid="5401718014765921892">"Маанилүүлү эмес"</string>
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Орточо"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Маанилүү"</string>
@@ -3313,21 +3343,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> баштап <xliff:g id="END">%2$s</xliff:g> чейин"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Чалуулар"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Тынчымды алба\" режими күйүп турганда кириш чалуулар бөгөттөлөт. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Билдирүүлөр"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Бардык билдирүүлөр"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Тандалган билдирүүлөр"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Билдирүүлөр"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Айрым билдирүүлөр"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Баарынан"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Байланыштардан гана"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Жылдызчаланган байланыштардан гана"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Белгиленген байланыштардан жана кайталанма чалуучулардан"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Байланыштардан жана кайталанма чалуучулардан"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Кайталанма чалуучулардан гана"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Эч бир"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ойготкучтар"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Медиа"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Экранга тийгенде үн чыксын"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Эстеткичтер"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Иш-чаралар"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Бардык чалуучулар"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Тандалган чалуучулар"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"баары"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"байланыштар"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"белгиленген байланыштар"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Кайра чалуучулар"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Төмөнкүлөрдөн гана: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Төмөнкүлөрдөн: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> жана <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Эгер бир эле адам <xliff:g id="MINUTES">%d</xliff:g> мүнөттүн ичинде кайра чалса"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Ыңгайлаштырылган"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматтык түрдө күйүү"</string>
@@ -3597,7 +3637,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Бул колдонмо тарабынан түзүлгөн \"Тынчымды алба\" эрежелеринин баары жок кылынат."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Үнөмдөлбөсүн"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Үнөмдөө"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Батареяңыз тез эле отуруп калышы мүмкүн"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Батареянын кубатын үнөмдөө үчүн сунушталат."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> колдонмосу батареянын кубатын көп керектей берсинби?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Жок"</string>
@@ -3673,7 +3714,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Камдык көчүрмө өчүрүлгөн"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> версиясына жаңыртылды"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Жаңы версия бар"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Бул жөндөө өзгөртүлбөйт"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Аракетке уруксат жок"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Үнү өзгөртүлбөйт"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Чалууга тыюу салынган"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS жөнөтүүгө тыюу салынган"</string>
@@ -3863,7 +3904,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Кулпуланган экрандагы маалыматты көзөмөлдөө"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Эскертме мазмунун көрсөтүү же жашыруу"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Бардыгы"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Колдоо жана кеңештер"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Кеңештер жана колдоо"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Эң кууш"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнотулган колдонмолор акы төлөнүүчү SMS пайдаланууга уруксат сураган жок"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Артыкчылыктуу SMS үчүн сизден акы алынып, ал операторуңуздун эсептерине кошулушу мүмкүн. Эгер кайсы бир колдонмого уруксат берсеңиз, ошол колдонмо аркылуу артыкчылыктуу SMS жөнөтө аласыз."</string>
@@ -4056,6 +4097,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Тасма жана сыналгы колдонмолору"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Байланыш оператору жөнүндө маалымат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Байланыш операторун өзгөртүү"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Эмне жаңылык бар?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңы телефонуңузду карап чыгыңыз"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңы планшетиңизди карап чыгыңыз"</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 749a4e9..9569ae4 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -35,7 +35,4 @@
     <!-- Display, Screen zoom -->
     <dimen name="screen_zoom_preview_height">160dp</dimen>
 
-    <!-- Gestures -->
-    <dimen name="gesture_animation_padding">35dp</dimen>
-
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index f3e5ea5..a73de3f 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ການ​ຂໍ​ເຂົ້າ​ຫາ SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ຕ້ອງ​ການ​ເຂົ້າ​ຫາ​ແຜ່ນ SIM ຂອງ​ທ່ານ. ການ​ໃຫ້​ການ​ເຂົ້າ​ເຖິງ​ແຜ່ນ SIM ຈະ​ປິດ​ໃຊ້​ງານ​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ສຳ​ລັບ​ໄລ​ຍະ​ເວ​ລາ​ຂອງ​ການ​ເຊື່ອມ​ຕໍ່. ໃຫ້​ການ​ເຂົ້າ​ຫາ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ສະແດງເປັນ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ໃຫ້ອຸປະກອນອື່ນເຫັນ"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ອຸປະກອນຂອງທ່ານ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ເຮັດໃຫ້ແທັບເລັດຂອງທ່ານເຊື່ອມຕໍ່ກັບອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ຄຽງໄດ້"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"ບໍ່ສາມາດຣີເຊັດ eSIM ໄດ້"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"ບໍ່ສາມາດຣີເຊັດ eSIM ໄດ້ເນື່ອງຈາກເກີດຄວາມຜິດພາດ."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດທ່ານ, ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ແລະການຕັ້ງຄ່າ"</li>\n<li>"ແອັບຯທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ ຮວມເຖິງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນລະບົບ ແລະແອັບພລິເຄຊັນ ຮວມທັງການຕັ້ງຄ່າຕ່າງໆ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫລດມາ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ປັດຈຸບັນທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">ຄວາມ​ຊັກຊ້າ​ດົນ​ຫຼາຍ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ມິ​ລ​ລິ​ວິ​ນາ​ທີ)</item>
       <item quantity="one">ຄວາມ​ຊັກຊ້າ​ດົນ​ຫຼາຍ (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ມິ​ລ​ລິ​ວິ​ນາ​ທີ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ປິດສຽງ ແລະ ການແຈ້ງເຕືອນແລ້ວ"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ຕັ້ງສຽງ ແລະ ການແຈ້ງເຕືອນເປັນຕ່ຳແລ້ວ"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ຕັ້ງສຽງ ແລະ ການແຈ້ງເຕືອນເປັນປານກາງແລ້ວ"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ການນຳໃຊ້ໜ້າຈໍຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ການໃຊ້ພະລັງງານໄປກັບໜ້າຈໍ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"ການນຳໃຊ້ແອັບນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ການນຳໃຊ້ອຸປະກອນນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ປຸກໂທລະສັບຂຶ້ນໃນພື້ນຫຼັງ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ກຳລັງຮ້ອງຂໍສະຖານທີ່ເລື້ອຍໆ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ແອັບເຮັດວຽກຜິດປົກກະຕິ"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ແບັດເຕີຣີເຮັດວຽກປົກກະຕິ"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ແອັບຕ່າງໆກຳລັງເຮັດວຽກຕາມປົກກະຕິ"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ຄວາມຈຸແບັດເຕີຣີເຫຼືອໜ້ອຍ"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ແບັດເຕີຣີບໍ່ສາມາດໃຫ້ອາຍຸການນຳໃຊ້ທີ່ດີໄດ້"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"ປັບປຸງອາຍຸແບັດເຕີຣີຂອງໂທລະສັບທ່ານ"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ໃຊ້ແທັບເລັດຫຼາຍກວ່າປົກກະຕິ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ໃຊ້ອຸປະກອນຫຼາຍກວ່າປົກກະຕິ"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ແບັດເຕີຣີໃກ້ຈະໝົດແລ້ວ"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"ໂທລະສັບຂອງທ່ານຖືກໃຊ້ຫຼາຍກວ່າປົກກະຕິ. ແບັດເຕີຣີຂອງທ່ານອາດໝົດໄວກວ່າທີ່ຄາດໄວ້.\n\nແອັບທີ່ໃຊ້ຫຼາຍສຸດ <xliff:g id="NUMBER">%1$d</xliff:g> ແອັບນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດແມ່ນ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"ແທັບເລັດຂອງທ່ານຖືກໃຊ້ຫຼາຍກວ່າປົກກະຕິ. ແບັດເຕີຣີຂອງທ່ານອາດໝົດໄວກວ່າທີ່ຄາດໄວ້.\n\nແອັບທີ່ໃຊ້ຫຼາຍສຸດ <xliff:g id="NUMBER">%1$d</xliff:g> ແອັບນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດແມ່ນ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"ອຸປະກອນຂອງທ່ານຖືກໃຊ້ຫຼາຍກວ່າປົກກະຕິ. ແບັດເຕີຣີຂອງທ່ານອາດໝົດໄວກວ່າທີ່ຄາດໄວ້.\n\nແອັບທີ່ໃຊ້ຫຼາຍສຸດ <xliff:g id="NUMBER">%1$d</xliff:g> ແອັບນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດແມ່ນ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">ຈຳກັດ %1$d ແອັບ</item>
       <item quantity="one">ຈຳກັດ %1$d ແອັບ</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ແອັບນີ້ຈະສາມາດໃຊ້ແບັດເຕີຣີໃນພື້ນຫຼັງ. ແບັດເຕີຣີຂອງທ່ານອາດໝົດໄວກວ່າທີ່ຄາດໄວ້."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"ລຶບ"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"ຍົກເລີກ"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ອ້າງອີງຈາກການນຳໃຊ້ຂອງທ່ານ, ແບັດເຕີຣີຂອງທ່ານມັກຈະຢູ່ໄດ້ປະມານ <xliff:g id="TIME_DURATION">%1$s</xliff:g> ເມື່ອສາກເຕັມແລ້ວ.\n\nຫາກທ່ານຕ້ອງການຂະຫຍາຍອາຍຸແບັດເຕີຣີຂອງທ່ານ, ກະລຸນາເປີດໃຊ້ຕົວປະຢັດແບັດເຕີຣີ."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ຫາກທ່ານຕ້ອງການຂະຫຍາຍອາຍຸແບັດເຕີຣີຂອງທ່ານ, ກະລຸນາເປີດໃຊ້ຕົວປະຢັດແບັດເຕີຣີ."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ຕົວຈັດການແບັດເຕີຣີ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ຈັດການແອັບໂດຍອັດຕະໂນມັດ"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ຈຳກັດແອັບເຕີຣີສຳລັບແອັບທີ່ທ່ານບໍ່ໄດ້ໃຊ້ເລື້ອຍໆ"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ອະນຸຍາດສັນຍານພາບ"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"ຈຳກັດການແຈ້ງເຕືອນ"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ການແຈ້ງເຕືອນ"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"ປິດສຽງການແຈ້ງເຕືອນ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"ສະແດງການແຈ້ງເຕືອນ, ແຕ່ໃຫ້ປິດສຽງ ແລະ ປິດການສັ່ນເຕືອນໄວ້"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"ເມື່ອມີການແຈ້ງເຕືອນໃໝ່ມາຮອດ, ໂທລະສັບຂອງທ່ານຈະບໍ່ສົ່ງສຽງ ຫຼື ບໍ່ສັ່ນເຕືອນ"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"ເຊື່ອງ ແລະ ປິດການແຈ້ງເຕືອນ"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"ການແຈ້ງເຕືອນຈະບໍ່ປາກົດໃຫ້ເຫັນເລີຍ"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"ທ່ານຈະບໍ່ເຫັນການແຈ້ງເຕືອນໃໝ່ ຫຼື ການແຈ້ງເຕືອນທີ່ມີຢູ່ແລ້ວເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ. ຢ່າງໃດກໍຕາມ, ການແຈ້ງເຕືອນຕ່າງໆແມ່ນຈຳເປັນສຳລັບການເຮັດວຽກໂທລະສັບພື້ນຖານ ແລະ ສະຖານະຈະຍັງຄົງປາກົດຢູ່."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ສະແດງການແຈ້ງເຕືອນແບບບໍ່ມີສຽງ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ການແຈ້ງເຕືອນຈະຖືກປິດສຽງໄວ້"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ເມື່ອມີການແຈ້ງເຕືອນຂຶ້ນມາ, ໂທລະສັບຂອງທ່ານຈະບໍ່ສົ່ງສຽງ ຫຼື ສັ່ນເຕືອນ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ເຊື່ອງການແຈ້ງເຕືອນ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ທ່ານຈະບໍ່ເຫັນການແຈ້ງເຕືອນໃໝ່ ຫຼື ການແຈ້ງເຕືອນທີ່ມີຢູ່ກ່ອນແລ້ວ"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ໂທລະສັບຂອງທ່ານຈະບໍ່ສະແດງການແຈ້ງເຕືອນໃໝ່ ຫຼື ການແຈ້ງເຕືອນທີ່ມີຢູ່ກ່ອນແລ້ວ ແລະ ຈະບໍ່ສົ່ງສຽງ ຫຼື ສັ່ນເຕືອນ. ການແຈ້ງເຕືອນຂອງທ່ານຈະບໍ່ປາກົດເມື່ອທ່ານປັດນິ້ວຈາກເທິງສຸດຂອງຈໍລົງມາ.\n\nກະລຸນາຮັບຊາບວ່າການແຈ້ງເຕືອນວິກິດສຳລັບການເຮັດວຽກ ແລະ ສະຖານະຂອງໂທລະສັບຈະຍັງຄົງປາກົດຢູ່."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ກຳນົດເອງ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ເປີດການຕັ້ງຄ່າແບບກຳນົດເອງ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ລຶບການຕັ້ງຄ່າແບບກຳນົດເອງອອກ"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other">ສາມາດເປີດ <xliff:g id="ON_COUNT">%d</xliff:g> ກົດໂດຍອັດຕະໂນມັດ</item>
       <item quantity="one">ສາມາດເປີດ 1 ກົດໂດຍອັດຕະໂນມັດ</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ຕົກລົງ"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ພຶດຕິກຳ"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ຂໍ້ຍົກເວັ້ນ"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"ຕັ້ງເວລາ"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ສຽງ ແລະ ການສັ່ນເຕືອນ"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ, ສຽງ ແລະ ການສັ່ນເຕືອນຈະຖືກປິດໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ປິດສຽງທັງໝົດຍົກເວັ້ນ"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ປິດແລ້ວ"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ບໍ່ໄດ້ປິດສຽງໄວ້"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ປີດສຽງ, ແຕ່ອະນຸຍາດ <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ປິດສຽງ, ແຕ່ອະນຸຍາດ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ແລະ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ປິດສຽງ, ແຕ່ອະນຸຍາດ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ແລະ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ຂໍ້ຄວາມ, ນັດໝາຍ ແລະ ການເຕືອນ"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ເມື່ອເປີດໂໝດຫ້າມລົບກວນແລ້ວ, ຂໍ້ຄວາມ, ການເຕືອນ ແລະ ນັດໝາຍຕ່າງໆຈະຖືກປິດສຽງໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າຂໍ້ຄວາມເພື່ອໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"ອັບເດດ"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"ບໍ່ອັບເດດ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"ໂທລະສັບຂອງທ່ານສາມາດເຮັດຫຍັງໄດ້ເພີ່ມເຕີມເພື່ອຊ່ວຍໃຫ້ທ່ານມີສະມາທິໄດ້.\n\nທ່ານສາມາດອັບເດດການຕັ້ງຄ່າເພື່ອ:\n\n- ເຊື່ອງການແຈ້ງເຕືອນທັງໝົດ\n\n- ອະນຸຍາດສາຍຈາກລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ມີດາວ ແລະ ຜູ້ທີ່ໂທຊ້ຳໆ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"ອັບເດດໂໝດຫ້າມລົບກວນບໍ?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ການຕັ້ງຄ່າ"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"ທ່ານສາມາດປັບແຕ່ງໄດ້ຫຼາຍຂຶ້ນໃນການຕັ້ງຄ່າ."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"ບລັອກເມື່ອເປີດໜ້າຈໍ"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"ບລັອກເມື່ອປິດໜ້າຈໍ"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"ໂໝດຫ້າມລົບກວນສາມາດເຮັດໄດ້ຫຼາຍກວ່າການບລັອກສຽງທີ່ບໍ່ຕ້ອງການ, ມັນສາມາດບລັອກພາບໄດ້ນຳ. ນີ້ອາດເປັນປະໂຫຍດຫາກທ່ານຢາກນອນ, ຕັ້ງໃຈເຮັດວຽກ ຫຼື ຈຳກັດເວລາທີ່ໃຊ້ໂທລະສັບຂອງທ່ານ."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ບລັອກພາບ ແລະ ສຽງ"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"ຢ່າເປີດໜ້າຈໍ ຫຼື ຕື່ນຂຶ້ນມາເມື່ອມີການແຈ້ງເຕືອນ"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ຢ່າສະແດງການແຈ້ງເຕືອນເລີຍ, ຍົກເວັ້ນການເຮັດວຽກ ແລະ ສະຖານະພື້ນຖານຂອງໂທລະສັບ"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ສຽງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ຫາ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"​ການ​ໂທ"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ສາຍໂທເຂົ້າຈະຖືກບລັອກໄວ້ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າເພື່ອອະນຸຍາດໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ຂໍ້​ຄວາມ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"ຂໍ້​ຄວາມທັງໝົດ"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ຂໍ້​ຄວາມ​ເລືອກ​ໄວ້"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"ຂໍ້ຄວາມ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ບາງຂໍ້ຄວາມ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ຈາກທຸກຄົນ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ຈາກ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ເທົ່າ​ນັ້ນ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ຈາກ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ໃສ່​ດາວ​ໄວ້​ເທົ່າ​ນັ້ນ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ຈາກລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວໄວ້ ແລະ ຜູ້ໂທຊ້ຳ"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"ຈາກລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ຜູ້ໂທຊ້ຳ"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ຈາກຜູ້ໂທຊ້ຳເທົ່ານັ້ນ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ບໍ່ມີ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ໂມງປຸກ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"ມີເດຍ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"​ສຽງ​ສຳ​ຜັດ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ກິດຈະກຳ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"ຜູ້​ໂທທັງ​ໝົດ"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ຜູ້​ໂທ​ທີ່​ເລືອກ​ໄວ້"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ທຸກຄົນ"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວໄວ້"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ຜູ້ໂທຊ້ຳໆ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"ຈາກ <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ເທົ່ານັ້ນ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"ຈາກ <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ແລະ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> ເທົ່ານັ້ນ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ຫາກຄົນດຽວກັນໂທເທື່ອທີສອງພາຍໃນໄລຍະເວລາ <xliff:g id="MINUTES">%d</xliff:g> ນາທີ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ກຳນົດເອງ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ທຸກກົດ​ລະບຽບຫ້າມ​ລົບ​ກວນທີ່​ສ້າງ​ຂຶ້ນ​ໂດຍ​ແອັບຯ​ນີ້​ຈະ​ຖືກລຶບ​ອອກ."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ບໍ່ປັບໃຫ້ເໝາະສົມ"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ປັບໃຫ້ເໝາະສົມ"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ອາດຈະເຮັດໃຫ້ແບັດເຕີຣີຂອງທ່ານໝົດໄຟໄວຂຶ້ນ"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ແນະ​ນໍາ​ສຳລັບອາຍຸໃຊ້ງານແບັດເຕີຣີທີ່ດີກວ່າ"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ອະນຸຍາດໃຫ້ <xliff:g id="APP">%s</xliff:g> ລະເລີຍການປັບປະສິດທິພາບໃຊ້ງານແບັດເຕີຣີບໍ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ບໍ່ມີ"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ການສຳຮອງຂໍ້ມູນຖືກປິດໃຊ້ແລ້ວ"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"ອັບເດດເປັນ Android <xliff:g id="VERSION">%1$s</xliff:g> ແລ້ວ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ມີອັບເດດໃໝ່"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ບໍ່ສາມາດປ່ຽນການຕັ້ງຄ່ານີ້ໄດ້"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ບໍ່ອະນຸຍາດໃຫ້ດຳເນີນການ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ບໍ່ສາມາດປ່ຽນລະດັບສຽງໄດ້"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ບໍ່ອະນຸຍາດການໂທ"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ SMS"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"ຂໍ້ມູນການຄວບຄຸມໃນໜ້າຈໍລັອກ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ສະແດງ ຫຼື ເຊື່ອງເນື້ອຫາການແຈ້ງເຕືອນ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ທັງໝົດ"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"ຊ່ວຍເຫຼືອ ແລະ ເຄັດລັບ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ເຄັດລັບ ແລະ ການຊ່ວຍເຫຼືອ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ຄວາມກວ້າງນ້ອຍທີ່ສຸດ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ບໍ່ມີແອັບທີ່ຕິດຕັ້ງຮ້ອງຂໍການເຂົ້າເຖິງ SMS ແບບພຣີມຽມ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS ແບບພຣີມຽມອາດເຮັດໃຫ້ທ່ານເສຍເງິນ ແລະ ຈະເພີ່ມຄ່າໃຊ້ຈ່າຍໃຫ້ກັບບິນຜູ້ໃຫ້ບໍລິການຂອງທ່ານ. ຫາກທ່ານເປີດໃຊ້ສິດອະນຸຍາດໃຫ້ກັບແອັບໃດໜຶ່ງ, ທ່ານຈະສາມາດສົ່ງ SMS ແບບພຣີມຽມໂດຍໃຊ້ແອັບນັ້ນໄດ້."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"ແອັບຮູບເງົາ ແລະ ໂທລະທັດ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ຂໍ້ມູນການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ມີຫຍັງໃໝ່ ແລະ ໜ້າຕື່ນເຕັ້ນ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ລອງເບິ່ງໂທລະສັບໃໝ່ຂອງທ່ານ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ລອງເບິ່ງແທັບເລັດໃໝ່ຂອງທ່ານ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f3b6389..f678493 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM prieigos užklausa"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"„<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų SIM kortelę. Suteikus prieigą prie SIM kortelės bus išjungtas duomenų ryšys įrenginyje, kol veiks šis ryšys. Leiskite pasiekti „<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>“"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kitiems įrenginiams matomas kaip „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ įrenginys"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsų įrenginiai"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Susieti naują įrenginį"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Leiskite planšetiniam kompiuteriui užmegzti ryšį su netoliese esančiais „Bluetooth“ įrenginiais"</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Nepavyko nustatyti „eSIM“ kortelių iš naujo"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"„eSIM“ kortelių nepavyko nustatyti iš naujo dėl klaidos."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Ištrinti visus duomenis (atkurti gamyklinius duomenis)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Taip bus ištrinti visi toliau nurodyti duomenys iš telefono "<b>"vidinės atminties"</b>".\n\n"<li>"„Google“ paskyra"</li>\n<li>"Sistemos ir programų duomenys bei nustatymai"</li>\n<li>"Atsisiųstos programos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="many">Labai ilga delsa (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Labai ilga delsa (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Skambučių ir nustatymų vibravimas išjungtas"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Skambučių ir nustatymų vibravimo intensyvumas nustatytas kaip mažas"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Skambučių ir nustatymų vibravimo intensyvumas nustatytas kaip vidutinis"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrano naudojimas po paskutinio visiško įkrovimo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrano suvartojama energija"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Programų naudojimas po visiško įkrovimo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Įrenginio naudojimas po visiško įkrovimo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Įrenginys pažadinamas fone"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Dažnai siunčiamos vietos užklausos"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Netinkamai veikiančių programų: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akumuliatoriaus būsena gera"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Programos veikia kaip įprasta"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Maža akumuliatoriaus talpa"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akumuliatoriaus veikimo laikas nebus ilgas"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Pagerinkite telefono akumuliatoriaus veikimo laiką"</string>
@@ -2197,9 +2209,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Planšetinis kompiuteris buvo naudojamas daugiau nei įprasta"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Įrenginys buvo naudojamas daugiau nei įprasta"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Akumuliatoriaus energija gali netrukus išsekti"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefonas buvo naudojamas daugiau nei įprastai. Akumuliatoriaus energija gali išsekti greičiau nei tikėjotės.\n\nToliau rodomos daugiausia nuo paskutinio visiško įkrovimo (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) naudotos programos (<xliff:g id="NUMBER">%1$d</xliff:g>)."</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Planšetinis kompiuteris buvo naudojamas daugiau nei įprastai. Akumuliatoriaus energija gali išsekti greičiau nei tikėjotės.\n\nToliau rodomos daugiausia nuo paskutinio visiško įkrovimo (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) naudotos programos (<xliff:g id="NUMBER">%1$d</xliff:g>)."</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Įrenginys buvo naudojamas daugiau nei įprastai. Akumuliatoriaus energija gali išsekti greičiau nei tikėjotės.\n\nToliau rodomos daugiausia nuo paskutinio visiško įkrovimo (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) naudotos programos (<xliff:g id="NUMBER">%1$d</xliff:g>)."</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Apriboti %1$d programą</item>
       <item quantity="few">Apriboti %1$d programas</item>
@@ -2238,8 +2253,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ši programa galės naudoti akumuliatoriaus energiją fone. Akumuliatoriaus energija gali išsekti greičiau nei tikėjotės."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Pašalinti"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Atšaukti"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Atsižvelgiant į jūsų naudojimą akumuliatoriaus energijos įprastai užtenka <xliff:g id="TIME_DURATION">%1$s</xliff:g>, kai akumuliatorius visiškai įkrautas.\n\nJei norite, kad akumuliatorius veiktų ilgiau, įjunkite Akumuliatoriaus tausojimo priemonę."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Jei norite, kad akumuliatorius veiktų ilgiau, įjunkite Akumuliatoriaus tausojimo priemonę"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Akumuliatoriaus tvarkytuvė"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Automatinis programų tvarkymas"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Apribokite retai naudojamų programų akumuliatoriaus energijos eikvojimą"</string>
@@ -3145,15 +3164,14 @@
     <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">"Blokuoti vaizdinius trikdžius"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Leisti vaizdinius signalus"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Apriboti pranešimus"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kai įjungtas netrukdymo režimas"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Pranešimai"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kai įjungtas netrukdymo režimas"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Nutildyti pranešimus"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Rodyti pranešimus, bet nutildyti garsą ir vibravimą"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Kai gausite naujų pranešimų, telefonas neskambės ir nevibruos"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Slėpti ir nutildyti pranešimus"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Pranešimai iš viso nebus rodomi"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Nematysite naujų ar esamų pranešimų, kai įjungtas netrukdymo režimas. Tačiau būtini pagrindinės telefono veiklos ir būsenos pranešimai vis tiek bus rodomi."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tyliai rodyti pranešimus"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Pranešimai bus nutildyti"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Gavus pranešimą telefonas neskleis garso ir nevibruos."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Slėpti pranešimus"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nematysite naujų ir esamų pranešimų"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Jūsų telefonas nerodys naujų ir esamų pranešimų, neskleis garso ir nevibruos. Pranešimai nebus rodomi perbraukus nuo ekrano viršaus.\n\nAtminkite, kad svarbūs pranešimai apie telefono veiklą ir būseną vis tiek bus rodomi."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tinkinti"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Įgalinti tinkintą nustatymą"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Pašalinti tinkintą nustatymą"</string>
@@ -3209,13 +3227,27 @@
       <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> taisyklės gali būti įjungta automatiškai</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> taisyklių gali būti įjungta automatiškai</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Gerai"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Elgsena"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Išimtys"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Tvarkaraštis"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Garsas ir vibravimas"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Įjungus netrukdymo režimą garsas ir vibravimas bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Nutildyti viską išskyrus"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Nutildyta"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Nenutildyta"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Nutildyta, bet leisti <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Nutildyta, bet leisti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ir <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Nutildyta, bet leisti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ir <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Pranešimai, įvykiai ir priminimai"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Įjungus netrukdymo režimą pranešimai, priminimai ir įvykiai bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Atnaujinti"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Neatnaujinti"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Jūsų telefonas gali dar labiau padėti jums susitelkti.\n\nAtnaujinkite nustatymus į:\n\n- visiškai slėpti pranešimus;\n\n- leisti pažymėtų žvaigždute kontaktų ir skambinančiųjų pakartotinai skambučius"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Atnaujinti netrukdymo režimą?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nustatymai"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Tai galite toliau tinkinti skiltyje „Nustatymai“."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokuoti, kai ekranas įjungtas"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokuoti, kai ekranas išjungtas"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Naudojant netrukdymo režimą galima blokuoti ne tik nepageidaujamus garsus, bet ir vaizdinius elementus. Tai gali būti naudinga, jei bandote užmigti, susikoncentruoti arba apriboti telefono naudojimo laiką."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Garsų ir vaizdinių elementų blokavimas"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Neįjungti ekrano ar pažadinti gavus pranešimų"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Visiškai nerodyti pranešimų, išskyrus pagrindinės telefono veiklos ir būsenos pranešimus"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Darbo profilio garsai"</string>
@@ -3394,21 +3426,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Skambučiai"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kai įjungtas netrukdymo režimas, gaunamieji skambučiai blokuojami. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pranešimai"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Visi pranešimai"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Pasirinkti pranešimai"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Pranešimai"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Kai kurie pranešimai"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Iš bet ko"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Tik iš kontaktų"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tik iš žvaigždutėmis pažymėtų kontaktų"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Iš žvaigždute pažymėtų kontaktų ir pakartotinai skambinančiųjų"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Iš kontaktų ir pakartotinai skambinančiųjų"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Tik iš pakartotinai skambinančiųjų"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nėra"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signalai"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Medija"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Lietimo garsai"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Priminimai"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Įvykiai"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi skambintojai"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pasirinkti skambintojai"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"bet kas"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"Kontaktai"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"žvaigždute pažymėti kontaktai"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pakartotinai skambinantys"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Tik iš <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Iš <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ir <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jei asmuo skambina antrą kartą per <xliff:g id="MINUTES">%d</xliff:g> min. laikotarpį"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Tinkintas garsas"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatiškai įjungti"</string>
@@ -3698,7 +3740,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Visos šios programos sukurtos netrukdymo režimo taisyklės bus pašalintos."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Neoptimizuoti"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizuoti"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Akumuliatorius gali būti išeikvotas greičiau"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Rekomenduojama, kad akumuliatoriaus veikimo laikas būtų ilgesnis"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Leisti „<xliff:g id="APP">%s</xliff:g>“ nepaisyti akumuliatoriaus optimizavimo nustatymų?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nėra"</string>
@@ -3776,7 +3819,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Atsarginės kopijos kūrimas išjungtas"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atnaujinta į <xliff:g id="VERSION">%1$s</xliff:g> versijos „Android“"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Pasiekiamas naujinys"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Nepav. pakeisti šio nustatymo"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Neleistinas veiksmas"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Nepavyko pakeisti garsumo"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Skambinti neleidžiama"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS pranešimai neleidžiami"</string>
@@ -3978,7 +4021,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Valdykite informaciją užrakinimo ekrane"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rodykite arba slėpkite pranešimo turinį"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Viskas"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Palaik. ir patarimai"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Patarimai ir palaikymas"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mažiausias plotis"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nėra jokių įdiegtų programų, pateikusių išskirtinių SMS prieigos užklausą"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Išskirtiniai SMS gali būti mokami ir į operatoriaus sąskaitas gali būti įtraukta papildomų mokesčių. Jei įgalinsite programos leidimą, galėsite siųsti išskirtinius SMS naudodami tą programą."</string>
@@ -4191,6 +4234,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmai ir TV programos"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatoriaus aprūpinimo informacija"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktyviklio operatoriaus aprūpinimas"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kas nauja ir verta dėmesio?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Peržiūrėkite naujo telefono apžvalgą"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Peržiūrėkite naujo planšetinio kompiuterio apžvalgą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0ac1e5a..01411f2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -168,6 +168,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pieprasījums piekļūt SIM kartei"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pieprasa piekļuvi SIM kartei. Piešķirot piekļuvi SIM kartei, savienojuma laikā ierīcē tiks atspējota datu savienojamība. Piešķirt piekļuvi ierīcei <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Citām ierīcēm redzama kā “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsu ierīces"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Savienošana pārī ar jaunu ierīci"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Ļaujiet planšetdatoram izveidot savienojumu ar tuvumā esošām Bluetooth ierīcēm."</string>
@@ -1466,6 +1468,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Nevar atiestatīt eSIM kartes"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Kļūdas dēļ nevar atiestatīt eSIM kartes."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Notīrīt visus datus (atiestatīt rūpnīcas datus)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
@@ -2018,6 +2022,8 @@
       <item quantity="one">Ļoti ilga aizkave (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Ļoti ilga aizkave (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Zvana un paziņojuma signāla vibrācija izslēgta"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Iestatīta zvana un paziņojuma signāla vibrācija: neliela"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Iestatīta zvana un paziņojuma signāla vibrācija: vidēja"</string>
@@ -2127,8 +2133,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrāna lietojums kopš pilnas uzlādes"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrāna lietojuma patēriņš"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Lietotnes izmantojums kopš pilnas uzlādes (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Ierīces izmantojums kopš pilnas uzlādes (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2159,8 +2165,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ierīce tiek aktivizēta fonā"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Bieži tiek pieprasīti atrašanās vietas dati"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> lietotnēm ir neatbilstoša darbība"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akumulators ir labā stāvoklī"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Lietotnes darbojas normāli"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Zema akumulatora kapacitāte"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akumulators nevar nodrošināt ilgu darbību"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Tālruņa akumulatora darbības ilguma uzlabošana"</string>
@@ -2175,9 +2187,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Planšetdators tika izmantots vairāk nekā parasti."</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Ierīce tika izmantota vairāk nekā parasti."</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Akumulators, iespējams, drīz izlādēsies"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Jūsu tālrunis tika izmantots vairāk nekā parasti. Akumulators var izlādēties ātrāk, nekā paredzēts.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> lietotne(-es), kas patērēja visvairāk akumulatora enerģijas kopš pēdējās uzlādes (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Jūsu planšetdators tika izmantots vairāk nekā parasti. Akumulators var izlādēties ātrāk, nekā paredzēts.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> lietotne(-es), kas patērēja visvairāk akumulatora enerģijas kopš pēdējās uzlādes (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Jūsu ierīce tika izmantota vairāk nekā parasti. Akumulators var izlādēties ātrāk, nekā paredzēts.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> lietotne(-es), kas patērēja visvairāk akumulatora enerģijas kopš pēdējās uzlādes (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="zero">Ierobežojiet %1$d lietotnes</item>
       <item quantity="one">Ierobežojiet %1$d lietotni</item>
@@ -2211,8 +2226,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Šī lietotne varēs izmantot akumulatora enerģiju fonā. Tādējādi akumulators var izlādēties ātrāk nekā parasti."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Noņemt"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Atcelt"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Spriežot pēc jūsu lietojuma datiem, akumulators pēc pilnas uzlādes parasti darbojas apmēram <xliff:g id="TIME_DURATION">%1$s</xliff:g>.\n\nJa vēlaties palielināt akumulatora darbības ilgumu, ieslēdziet akumulatora jaudas taupīšanas režīmu."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ja vēlaties palielināt akumulatora darbības ilgumu, ieslēdziet akumulatora jaudas taupīšanas režīmu"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Akumulatora pārvaldnieks"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Automātiska akumulatora enerģijas patēriņa pārvaldība"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ierobežojiet akumulatora enerģijas patēriņu tām lietotnēm, kuras neizmantojat bieži"</string>
@@ -3110,15 +3129,14 @@
     <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">"Bloķēt vizuālos traucējumus"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizuālu signālu atļaušana"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Paziņojumu ierobežošana"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kad aktivizēts režīms Netraucēt"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Paziņojumi"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kad aktivizēts režīms Netraucēt"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Izslēgt paziņojumu skaņu"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Rādīt paziņojumus, bet izslēgt skaņas signālus un vibrācijas"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Saņemot jaunus paziņojumus, nebūs tālruņa skaņas signāla vai vibrācijas"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Paslēpt paziņojumus un izslēgt paziņojumu skaņu"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Paziņojumi nemaz netiks rādīti"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Režīmā “Netraucēt” netiks rādīti jauni un esoši paziņojumi, izņemot tos paziņojumus, kas nepieciešami tālruņa pamatdarbībām un statusam."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Rādīt paziņojumus bez skaņas signāla"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Paziņojumi būs bez skaņas"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Saņemot paziņojumus, nebūs tālruņa skaņas signāla vai vibrācijas."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Slēpt paziņojumus"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Netiks rādīti jauni vai esoši paziņojumi"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Tālrunī netiks rādīti jauni vai esoši paziņojumi un nebūs skaņas signāla vai vibrācijas. Paziņojumi netiks rādīti, kad vilksiet lejup no tālruņa augšdaļas.\n\nŅemiet vērā, ka joprojām tiks rādīti kritiski paziņojumi par tālruņa darbību un statusu."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Pielāgoti"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Iespējot pielāgoto iestatījumu"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Noņemt pielāgoto iestatījumu"</string>
@@ -3155,8 +3173,8 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Režīmu “Netraucēt” automātiski ieslēdza lietotne (<xliff:g id="APP_NAME">%s</xliff:g>)."</string>
     <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Tikai prioritārie pārtraukumi"</string>
     <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Ieslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Izslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Ieslēgts / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Izslēgts / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Izslēgts"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Ieslēgts"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Vaicāt katru reizi (ja vien nav ieslēgts automātiski)"</string>
@@ -3172,13 +3190,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> kārtula var tikt ieslēgta automātiski</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> kārtulas var tikt ieslēgtas automātiski</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Labi"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Darbība"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Izņēmumi"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Grafiks"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Skaņa un vibrācija"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Esot ieslēgtam režīmam Netraucēt, tiks izslēgta skaņa un vibrācija, izņemot jūsu atļautajiem vienumiem."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Izslēgt skaņu visam, izņemot"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Izslēgta skaņa"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ieslēgta skaņa"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Izslēgta skaņa, bet atļaut: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Izslēgta skaņa, bet atļaut: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> un <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Izslēgta skaņa, bet atļaut: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> un <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Ziņojumi, pasākumi un atgādinājumi"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Esot ieslēgtam režīmam Netraucēt, netiks rādīti ziņojumi, atgādinājumi un paziņojumi, izņemot vienumus, ko atļāvāt. Varat pielāgot ziņojumu iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Atjaunināt"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Neatjaunināt"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Tālrunis var palīdzēt jums koncentrēties.\n\nAtjauniniet iestatījumus:\n\n- pilnībā slēpiet paziņojumus;\n\n- atļaujiet zvanus no kontaktpersonām, kas atzīmētas ar zvaigznīti, un atkārtotiem zvanītājiem."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Vai atjaunināt iestatījumu “Netraucēt”?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Iestatījumi"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Iestatījumos varat veikt papildu pielāgošanu."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloķēt, kad ekrāns ir ieslēgts"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloķēt, kad ekrāns ir izslēgts"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Režīmā “Netraucēt” var bloķēt ne tikai nevēlamas skaņas, bet arī vizuālos elementus. Tas var būt noderīgi, ja mēģināt gulēt, koncentrēties vai ierobežot tālruņa izmantošanas laiku."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloķēt skaņas un vizuālos elementus"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Neieslēgt ekrānu un neaktivizēt ierīci paziņojumu dēļ"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Nerādīt paziņojumus vispār, izņemot tālruņa pamatdarbībām un statusam"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Darba profila signāli"</string>
@@ -3353,21 +3385,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"No <xliff:g id="START">%1$s</xliff:g> līdz <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Zvani"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Esot ieslēgtam režīmam Netraucēt, ienākošie zvani ir bloķēti. Varat pielāgot iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Ziņojumi"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Visi ziņojumi"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Atlasītie ziņojumi"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Ziņojumi"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Daži ziņojumi"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"No ikviena"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Tikai no kontaktpersonām"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tikai no kontaktpersonām ar zvaigznīti"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"No kontaktpersonām, kas atzīmētas ar zvaigznīti, un no atkārtotiem zvanītājiem"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"No kontaktpersonām un atkārtotiem zvanītājiem"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Tikai no atkārtotiem zvanītājiem"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nav"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signāli"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Multivide"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Pieskāriena skaņas"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Atgādinājumi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Notikumi"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi zvanītāji"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Atlasīti zvanītāji"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ikviens"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktpersonas"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ar zvaigznīti atzīmētas kontaktpersonas"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Atkārtoti zvani"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Tikai no: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"No: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> un <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ja tā pati persona <xliff:g id="MINUTES">%d</xliff:g> minūšu laikā zvana vēlreiz"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Pielāgotas"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automātiski ieslēgt"</string>
@@ -3647,7 +3689,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Visas šajā lietotnē izveidotās kārtulas “Netraucēt” tiks noņemtas."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Neoptimizēt"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizēt"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Iespējams, akumulators tiks ātrāk izlādēts."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Ieteicams akumulatora darbības laika paildzināšanai"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Vai atļaut lietotnē <xliff:g id="APP">%s</xliff:g> ignorēt akumulatora darbības optimizāciju?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nav"</string>
@@ -3724,7 +3767,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Dublēšana atspējota"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atjaunināta uz Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ir pieejams atjauninājums"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Šo iestatījumu nevar mainīt"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Darbība nav atļauta"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Nevar mainīt skaļumu"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Nav atļauts zvanīt"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Nav atļauts sūtīt īsziņas"</string>
@@ -3920,7 +3963,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolējiet informāciju bloķēšanas ekrānā"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rādīt vai slēpt paziņojumu saturu"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Visas"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Atbalsts un padomi"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Padomi un atbalsts"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mazākais platums"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve maksas īsziņām."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Par maksas īsziņām no jums var tikt iekasēta samaksa, kas tiks pievienota jūsu mobilo sakaru operatora rēķinam. Ja kādai lietotnei iespējosiet piekļuves atļauju, varēsiet sūtīt maksas īsziņas, izmantojot šo lietotni."</string>
@@ -4123,6 +4166,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmu un TV lietotnes"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informācija par operatora nodrošināšanu"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizēt operatora nodrošināšanu"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kādi ir jaunumi?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Apskatiet savu jauno tālruni"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Apskatiet savu jauno planšetdatoru"</string>
diff --git a/res/values-mcc262-mnc02-sw/strings.xml b/res/values-mcc262-mnc02-sw/strings.xml
index 5c98759..7c911ff 100644
--- a/res/values-mcc262-mnc02-sw/strings.xml
+++ b/res/values-mcc262-mnc02-sw/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Huwezi kupiga simu za dharura ukitumia huduma ya Kupiga simu kupitia Wi-Fi. Ukijaribu kupiga simu za dharura, kifaa chako kitatumia mtandao wa simu kiotomatiki. Unaweza tu kupiga simu za dharura katika sehemu ambapo mtandao wa simu unapatikana."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Huwezi kupiga simu za dharura ukitumia huduma ya Kupiga simu kupitia Wi-Fi. Ukijaribu kupiga simu za dharura, moja kwa moja kifaa chako kitatumia mtandao wa simu. Unaweza tu kupiga simu za dharura ukiwa mahali ambapo mtandao wa simu unapatikana."</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index eca6cb6..16c9670 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Побаран е пристап до SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> сака да пристапи до вашата SIM-картичка. Доколку дозволите пристап до SIM-картичката, ќе се исклучи поврзувањето со податоци на уредот сѐ додека трае поврзувањето. Дозволете пристап до <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Другите уреди го гледаат како „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши уреди"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спарување нов уред"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Дозволете таблетот да комуницира со уредите со Bluetooth во близина"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Не може да се ресетираат eSIM-картичките"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM-картичките не може да се ресетираат поради грешка."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Избриши ги сите податоци (фабричко ресетирање)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Многу долго задржување (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Многу долго задржување (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Вибрациите при ѕвонење и известувања се поставени на исклучени"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Вибрациите при ѕвонење и известувања се поставени на ниски"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Вибрациите при ѕвонење и известувања се поставени на средни"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Употреба на екранот по целосно полнење"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошувачка на екранот"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилна мрежа"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Употреба од апликациите по целосно полнење (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Употреба од уредот по целосно полнење <xliff:g id="RELATIVE_TIME">^1</xliff:g>"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Го активира уредот во заднина"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Често бара локација"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> апликации се однесуваат необично"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батеријата е во добра форма"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Апликациите работат нормално"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Апликациите работат нормално"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефонот троши вообичаено количество батерија во заднина"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Таблетот троши вообичаено количество батерија во заднина"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Уредот троши вообичаено количество батерија во заднина"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Низок капацитет на батеријата"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батеријата не може да обезбеди добар век на траење"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Подобрете го траењето на батеријата на телефонот"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Таблетот се користи повеќе од вообичаено"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Уредот се користи повеќе од вообичаено"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Наскоро може да снема батерија"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Сте го користеле телефонот повеќе од вообичаено. Батеријата може да се потроши порано од очекуваното.\n\nТоп <xliff:g id="NUMBER">%1$d</xliff:g> апликации од последното полнење (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Сте го користеле таблетот повеќе од вообичаено. Батеријата може да се потроши порано од очекуваното.\n\nТоп <xliff:g id="NUMBER">%1$d</xliff:g> апликации од последното полнење (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Сте го користеле уредот повеќе од вообичаено. Батеријата може да се потроши порано од очекуваното.\n\nТоп <xliff:g id="NUMBER">%1$d</xliff:g> апликации од последното полнење (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Ограничете %1$d апликација</item>
       <item quantity="other">Ограничете %1$d апликации</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Апликацијава ќе може да ја користи батеријата во заднина. Батеријата може да се потроши порано од очекуваното."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Да"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Откажи"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Според користењето, батеријата обично ви трае околу <xliff:g id="TIME_DURATION">%1$s</xliff:g> кога е целосно наполнета.\n\nАко сакате да го продолжите траењето на батеријата, вклучете го „Штедачот на батерија“."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ако сакате да го продолжите траењето на батеријата, вклучете го „Штедачот на батерија“"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Вашите апликации користат нормално количество батерија. Ако апликациите трошат многу батерија, телефонот ќе предложи дејства што може да ги преземете.\n\nСекогаш може да вклучите „Штедач на батерија“ ако батеријата ви е при крај."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Вашите апликации користат нормално количество батерија. Ако апликациите трошат многу батерија, таблетот ќе предложи дејства што може да ги преземете.\n\nСекогаш може да вклучите „Штедач на батерија“ ако батеријата ви е при крај."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Вашите апликации користат нормално количество батерија. Ако апликациите трошат многу батерија, уредот ќе предложи дејства што може да ги преземете.\n\nСекогаш може да вклучите „Штедач на батерија“ ако батеријата ви е при крај."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Управник со батерија"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Автоматско управување со апликациите"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ограничете ја батеријата за апликации што не ги користите често"</string>
@@ -3075,15 +3087,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволи визуелни сигнали"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ограничување на известувањата"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Кога е вклучен режимот „Не вознемирувај“"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Известувања"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Кога е вклучен режимот „Не вознемирувај“"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Исклучи го звукот на известувањата"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Прикажувај известувања, но исклучи го звукот и вибрациите"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Кога ќе пристигнат нови известувања, телефонот нема да испушта звук ниту ќе вибрира"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Сокриј ги и исклучи го звукот на известувањата"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Известувања нема воопшто да се појавуваат"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Нема да гледате нови ниту постојни известувања кога е вклучен режимот „Не вознемирувај“. Меѓутоа, известувањата што се неопходни за основната активност на телефонот и статусот сѐ уште ќе се појавуваат."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Тивко прикажувај ги известувањата"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ќе се исклучи звукот на известувањата"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Кога ќе пристигнат известувања, телефонот нема да испушта звук или да вибрира."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Сокриј ги известувањата"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Нема да гледате нови ниту постојни известувања"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефонот нема да прикажува нови ниту постојни известувања и нема да испушта звук или да вибрира. Известувањата нема да се појавуваат кога повлекувате надолу од врвот на екранот.\n\nИмајте предвид дека критичните известувања за активноста и статусот на телефонот сѐ уште ќе се појавуваат."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Приспособени"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Овозможи ја приспособената поставка"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Отстрани ја приспособената поставка"</string>
@@ -3120,8 +3131,8 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Дадена апликација <xliff:g id="APP_NAME">%s</xliff:g> го вклучи режимот „Не вознемирувај“ автоматски"</string>
     <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Само приоритетно"</string>
     <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Вклучено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Исклучено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Вклучено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Исклучено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Исклучено"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Вклучено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Секогаш прашувај (освен ако не е вклучено автоматски)"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> правило може да се вклучи автоматски</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> правила може да се вклучат автоматски</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Во ред"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Однесување"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Исклучоци"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Распоред"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Звук и вибрации"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Кога е вклучен режимот „Не вознемирувај“, ќе се исклучат звукот и вибрациите, освен за ставките што ќе ги дозволите погоре."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Исклучи го звукот на сите, освен"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Исклучен звук"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Вклучен звук"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Исклучи го звукот, но дозволи <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Исклучи го звукот, но дозволи <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> и <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Исклучи го звукот, но дозволи <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Пораки, настани и потсетници"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Кога е вклучен режимот „Не вознемирувај“, ќе се исклучи звукот на пораките, потсетниците и настаните, освен за ставките што ќе ги дозволите погоре. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Ажурирај"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Не ажурирај"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Телефонот може да стори повеќе за да ви помогне да се фокусирате.\n\nАжурирајте ги поставките за да:\n\n- сокриете известувања целосно\n\n- дозволите повици од контактите со ѕвезди и повторените повикувачи"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Дали да се ажурира „Не вознемирувај“?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Поставки"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Ова може дополнително да го приспособите во „Поставки“."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Блокирај кога екранот е вклучен"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Блокирај кога екранот е исклучен"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Освен што ги блокира несаканите звуци, режимот „Не вознемирувај“ може да ги блокира и визуелните вознемирувања. Ова може да биде корисно ако се обидувате да спиете, да се фокусирате или да го ограничите времето што го поминувате на телефонот."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Блокирање звуци и визуелни вознемирувања"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Не вклучувај го екранот и не прикажувај известувања"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Воопшто не прикажувај известувања, освен за основната активност на телефонот и статусот"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуци на работниот профил"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Повици"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Кога е вклучен режимот „Не вознемирувај“, сите дојдовни повици се блокирани. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Пораки"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Сите пораки"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Избрани пораки"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Пораки"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Некои пораки"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Од сите"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Само од контактите"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само од контактите со ѕвезда"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Од контактите означени со ѕвезда и повторните повикувачи"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Од контактите и повторните повикувачи"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Само од повторните повикувачи"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Никој"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Аудиовизуелни содржини"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Звуци при допир"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Потсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Настани"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Сите повикувачи"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Избрани повикувачи"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"кој било"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"контакти"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"контакти означени со ѕвезда"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Редовни повикувачи"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Само од <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Од <xliff:g id="CALLER_TYPE">%1$s</xliff:g> и <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Доколку истото лице повикува по втор пат во период од <xliff:g id="MINUTES">%d</xliff:g> минути"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Приспособен"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Вклучи автоматски"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Сите правила Не вознемирувај што ги создава апликацијава ќе се отстранат."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Не оптимизирај"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Оптимизирај"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Може побрзо да ја потроши батеријата"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Препорачано за подобар живот на батеријата"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Дозволете <xliff:g id="APP">%s</xliff:g> да ги игнорира оптимизациите на батеријата?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ниедна"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Бекапот е оневозможен"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ажурирано на Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Достапно е ажурирање"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Поставкава не може да се смени"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Дејството не е дозволено"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Јачината на звукот не може да се смени"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Повикувањето не е дозволено"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-порака не е дозволена"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Контролирајте ги информациите на заклучениот екран"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прикажете или сокријте содржина на известување"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Сите"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Поддршка и совети"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Совети и поддршка"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Најмала ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ниедна од инсталираните апликации не побара пристап до премиум SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Премиум SMS може да ве чини пари, а сумата ќе се додаде на сметките од операторот. Ако овозможите дозвола за апликацијата, ќе може да испраќате премиум SMS со неа."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Апликации за филм и ТВ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информации за обезбедување оператор"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активирајте обезбедување оператор"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Што има ново и интересно?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознајте се со новиот телефон"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознајте се со новиот таблет"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4fed80f..3c77271 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ആക്‌സസ്സ് അഭ്യർത്ഥന"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ഉപകരണം SIM കാർഡ് ആക്‌സസ്സ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. SIM കാർഡിലേക്ക് ആക്‌സസ്സ് അനുവദിക്കുന്നത് കണക്ഷന്റെ സമയപരിധിയ്‌ക്കായി ഉപകരണത്തിൽ ഡാറ്റ കണക്റ്റിവിറ്റിയെ പ്രവർത്തനരഹിതമാക്കുന്നതിനിടയാക്കും. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ഉപകരണത്തിന് ആക്‌സസ്സ് നൽകുക"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"<xliff:g id="DEVICE_NAME">^1</xliff:g> എന്ന പേരിൽ മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കുക"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"നിങ്ങളുടെ ഉപകരണങ്ങൾ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"അടുത്തുള്ള Bluetooth ഉപകരണങ്ങളുമായി ആശയവിനിമയം നടത്താൻ നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ അനുവദിക്കുക"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"ഇ-സിമ്മുകൾ പുനഃസജ്ജീകരിക്കാനാവില്ല"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"പിശക് കാരണം ഇ-സിമ്മുകൾ പുനഃസജ്ജീകരിക്കാനാവില്ല."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ആന്തരിക സംഭരണത്തിൽ"</b>" നിന്നും ഇവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സി‌സ്റ്റത്തിന്റെയും അപ്ലിക്കേഷന്റെയും ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡുചെ‌യ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ഇത് നിങ്ങളുടെ ഫോണിലെ "<b>"ആന്തരിക സംഭരണത്തിലെ"</b>" എല്ലാ ഡാറ്റയും മായ്ക്കും, അതിൽ ഇവയുൾപ്പെടുന്നു:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്റ്റം, അപ്ലിക്കേഷൻ എന്നിവയുടെ ഡാറ്റയും ക്രമീകരണങ്ങളും"</li>\n<li>"ഡൗൺലോഡ്ചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" നിലവിൽ, നിങ്ങൾ ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിലേക്ക് സൈൻ ഇൻ ചെ‌യ്തിരിക്കുന്നു:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">വളരെ നീണ്ട കാലതാമസം (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> മിസെ)</item>
       <item quantity="one">വളരെ നീണ്ട കാലതാമസം (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> മിസെ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"റിംഗ് ചെയ്യലും അറിയിപ്പും ഓഫായി സജ്ജീകരിച്ചു"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"റിംഗ് ചെയ്യലും അറിയിപ്പും കുറഞ്ഞതായി സജ്ജീകരിച്ചു"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"റിംഗ് ചെയ്യലും അറിയിപ്പും ഇടത്തരമായി സജ്ജീകരിച്ചു"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള സ്‌ക്രീൻ ഉപയോഗം"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"സ്‌ക്രീൻ ഉപഭോഗം"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യൽ"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"പൂർണ്ണമായി ചാർജ് ചെയ്‌തതിന് ശേഷമുള്ള ആപ്പ് ഉപയോഗം (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"പൂർണ്ണമായി ചാർജ് ചെയ്‌തതിന് ശേഷമുള്ള ഉപകരണ ഉപയോഗം (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"പശ്ചാത്തലത്തിൽ ഉപകരണം സജീവമാക്കുന്നു"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ലൊക്കേഷൻ കൂടെക്കൂടെ അഭ്യർത്ഥിക്കുന്നു"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ബാറ്ററിക്ക് പ്രശ്‌നങ്ങളൊന്നുമില്ല"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ആപ്പുകൾ സാധാരണ രീതിയിൽ റൺ ചെയ്യുന്നു"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"കുറഞ്ഞ ബാറ്ററി ശേഷി"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ബാറ്ററിക്ക് മികച്ച ബാറ്ററി ലൈഫ് നൽകാനാവുന്നില്ല"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"നിങ്ങളുടെ ഫോണിന്റെ ബാറ്ററി ലൈഫ് മെച്ചപ്പെടുത്തുക"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ടാബ്‌ലെറ്റ്, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ഉപകരണം, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ബാറ്ററി ഉടൻ തീർന്നേക്കാം"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"സാധാരണയിൽ കൂടുതൽ സമയം നിങ്ങളുടെ ഫോൺ ഉപയോഗിച്ചിരിക്കുന്നു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം ഏറ്റവും കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"സാധാരണയിൽ കൂടുതൽ സമയം നിങ്ങളുടെ ടാബ്‌ലെറ്റ് ഉപയോഗിച്ചിരിക്കുന്നു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം ഏറ്റവും കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"സാധാരണയിൽ കൂടുതൽ സമയം നിങ്ങളുടെ ഉപകരണം ഉപയോഗിച്ചിരിക്കുന്നു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം ഏറ്റവും കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d ആപ്പുകളെ നിയന്ത്രിക്കുക</item>
       <item quantity="one">%1$d ആപ്പിനെ നിയന്ത്രിക്കുക</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ഈ ആപ്പിന് പശ്ചാത്തലത്തിൽ ബാറ്ററി ഉപയോഗിക്കാനാവും. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"നീക്കം ചെയ്യുക"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"റദ്ദാക്കുക"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"പൂർണ്ണമായും ചാർജ് ആയ ശേഷം ഉപയോഗത്തിന്റെ അടിസ്ഥാനത്തിൽ സാധാരണ <xliff:g id="TIME_DURATION">%1$s</xliff:g> വരെ ബാറ്ററി നിൽക്കാറുണ്ട്.\n\n ബാറ്ററി ലൈഫ് ദീർഘിപ്പിക്കണമെങ്കിൽ, ബാറ്ററി ലാഭിക്കൽ ഓണാക്കുക."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ബാറ്ററി ലൈഫ് ദീർഘിപ്പിക്കണമെങ്കിൽ, ബാറ്ററി ലാഭിക്കൽ ഓണാക്കുക"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ബാറ്ററി മാനേജർ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ആപ്പുകൾ സ്വമേധയാ മാനേജ് ചെയ്യുക"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"നിങ്ങൾ ഇടയ്ക്കിടെ ഉപയോഗിക്കാത്ത ആപ്പുകൾക്കായി ബാറ്ററി ഉപഭോഗം നിയന്ത്രിക്കുക"</string>
@@ -3075,38 +3094,21 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ദൃശ്യ സിഗ്നലുകൾ അനുവദിക്കുക"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"ശല്ല്യപ്പെടുത്തരുത് എന്നത് ഓണാക്കുമ്പോൾ"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"അറിയിപ്പുകൾ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"അറിയിപ്പുകൾ നിശ്ശബ്ദമായി കാണിക്കുക"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"അറിയിപ്പുകൾ മ്യൂട്ട് ചെയ്യപ്പെടും"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"അറിയിപ്പുകൾ വരുമ്പോൾ നിങ്ങളുടെ ഫോൺ ശബ്ദമുണ്ടാക്കുകയോ വൈബ്രേറ്റ് ചെയ്യുകയോ ഇല്ല."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"അറിയിപ്പുകൾ മറയ്ക്കുക"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"നിങ്ങൾ പുതിയതോ നിലവിലുള്ളതോ ആയ അറിയിപ്പുകൾ കാണില്ല"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"നിങ്ങളുടെ ഫോൺ പുതിയതോ നിലവിലുള്ളതോ ആയ അറിയിപ്പുകൾ കാണിക്കില്ല, ശബ്ദമുണ്ടാക്കുകയോ വൈബ്രേറ്റ് ചെയ്യുകയോ ഇല്ല. സ്ക്രീനിന്റെ മുകളിൽ നിന്ന് താഴേക്ക് സ്വൈപ്പ് ചെയ്യുമ്പോൾ, അറിയിപ്പുകൾ ദൃശ്യമാകില്ല.\n\nഫോൺ ആക്‌റ്റിവിറ്റിയും സ്റ്റാറ്റസും ആയി ബന്ധപ്പെട്ട സുപ്രധാന അറിയിപ്പുകൾ അപ്പോഴും ദൃശ്യമാകും എന്ന കാര്യം ശ്രദ്ധിക്കുക."</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ഇഷ്‌ടം"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ഇഷ്‌ടാനുസൃത ക്രമീകരണം പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ഇഷ്‌ടാനുസൃത ക്രമീകരണം നീക്കം ചെയ്യുക"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ദൃശ്യമാവും"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ഭാഗികമായി അദൃശ്യമാക്കി"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"അദൃശ്യമാക്കി"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ഇഷ്‌ടാനുസൃത നിയന്ത്രണങ്ങൾ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"സ്‌ക്രീൻ ഓണായിരിക്കുമ്പോൾ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"സ്‌ക്രീൻ ഓഫായിരിക്കുമ്പോൾ"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"ശബ്‌ദവും വൈബ്രേഷനും മ്യൂട്ട് ചെയ്യുക"</string>
@@ -3151,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> നയങ്ങൾ സ്വമേധയാ ഓണാക്കാനാവും</item>
       <item quantity="one">ഒരു നയം സ്വമേധയാ ഓണാക്കാനാവും</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ശരി"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"പ്രവർത്തനരീതി"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ഒഴിവാക്കലുകൾ"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"ഷെഡ്യൂള്‍‌"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ശബ്ദവും വൈബ്രേഷനും"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, ശബ്ദവും വൈബ്രേഷനും മ്യൂട്ട് ചെയ്യപ്പെടും."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ഇനിപ്പറയുന്നത് ഒഴികെയുള്ള എല്ലാം മ്യൂട്ട് ചെയ്യുക"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"മ്യൂട്ട് ചെയ്തു"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"മ്യൂട്ട് ചെയ്തിട്ടില്ല"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"മ്യൂട്ട് ചെയ്തു, എന്നാൽ <xliff:g id="SOUND_TYPE">%1$s</xliff:g> അനുവദിക്കുന്നു"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"മ്യൂട്ട് ചെയ്തു, എന്നാൽ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> എന്നിവ അനുവദിക്കുന്നു"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"മ്യൂട്ട് ചെയ്തു, എന്നാൽ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> എന്നിവ അനുവദിക്കുന്നു"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും മ്യൂട്ട് ചെയ്യപ്പെടും. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"അപ്ഡേറ്റ് ചെയ്യുക"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"അപ്‌ഡേറ്റ് ചെയ്യരുത്"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"നിങ്ങൾക്ക് ശ്രദ്ധ കേന്ദ്രീകരിക്കാൻ നിങ്ങളുടെ ഫോണിന് കൂടുതൽ ചെയ്യാനാകും.\n\nഇനിപ്പറയുന്നവയിലേക്ക് ക്രമീകരണം അപ്‌ഡേറ്റ് ചെയ്യുക:\n\n- അറിയിപ്പുകൾ പൂർണ്ണമായി അദൃശ്യമാക്കുക\n\n- നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകളിൽ നിന്നും ആവർത്തിച്ച് വിളിക്കുന്ന കോളർമാരിൽ നിന്നുമുള്ള കോളുകൾ അനുവദിക്കുക"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\'ശല്യപ്പെടുത്തരുത്\' അപ്‌ഡേറ്റ് ചെയ്യണോ?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ക്രമീകരണം"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"നിങ്ങൾക്ക് ക്രമീകരണത്തിൽ ഇത് കൂടുതൽ ഇഷ്‌ടാനുസൃതമാക്കാം."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"സ്ക്രീൻ ഓണായിരിക്കുമ്പോൾ ബ്ലോക്ക് ചെയ്യുക"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"സ്‌കീൻ ഓഫായിരിക്കുമ്പോൾ ബ്ലോക്ക് ചെയ്യുക"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"ആവശ്യമില്ലാത്ത ശബ്‌ദങ്ങൾ മാത്രമല്ല, വിഷ്വലുകളും ബ്ലോക്ക് ചെയ്യാൻ \'ശല്യപ്പെടുത്തരുത്\' എന്നതിന് കഴിയും. ഉറങ്ങാനോ ശ്രദ്ധ കേന്ദ്രീകരിക്കാനോ അല്ലെങ്കിൽ ഫോണിൽ ചിലവഴിക്കുന്ന സമയം പരിമിതപ്പെടുത്താനോ ശ്രമിക്കുന്നെങ്കിൽ, ഇത് സഹായകമായേക്കാം."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ശബ്‌ദങ്ങളും വിഷ്വലുകളും ബ്ലോക്ക് ചെയ്യുക‌"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"സ്‌ക്രീൻ ഓണാക്കുകയോ അറിയിപ്പുകൾക്കായി സജീവമാക്കുകയോ ചെയ്യരുത്"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"അടിസ്ഥാന ഫോൺ ആക്റ്റിവിറ്റിയും സ്‌റ്റാറ്റസും ഒഴികെയുള്ള ഒരു അറിയിപ്പും കാണിക്കരുത്"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്ദങ്ങൾ"</string>
@@ -3328,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> മുതൽ <xliff:g id="END">%2$s</xliff:g> വരെ"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"കോളുകൾ"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, ഇൻകമിംഗ് കോളുകൾ ബ്ലോക്ക് ചെയ്യപ്പെടുന്നു. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"സന്ദേശങ്ങള്‍"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"എല്ലാ സന്ദേശങ്ങളും"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"തിരഞ്ഞെടുത്ത സന്ദേശങ്ങൾ"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"സന്ദേശങ്ങള്‍‌"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ചില സന്ദേശങ്ങൾ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ആരിൽ നിന്നും"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"കോൺടാക്റ്റുകളിൽ നിന്ന് മാത്രം"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"നക്ഷത്രമിട്ട കോൺടാക്‌റ്റിൽ നിന്നുമാത്രം"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"നക്ഷത്രമിട്ടിട്ടുള്ള കോൺടാക്‌റ്റുകളിൽ നിന്നും ആവർത്തിച്ച് വിളിക്കുന്നവരിൽ നിന്നും"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"കോൺടാക്‌റ്റുകളിൽ നിന്നും ആവർത്തിച്ച് വിളിക്കുന്നവരിൽ നിന്നും"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ആവർത്തിച്ച് വിളിക്കുന്നവരിൽ നിന്ന് മാത്രം"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ആരിൽ നിന്നും വേണ്ട"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"അലാറങ്ങൾ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"മീഡിയ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"സ്‌പർശന ശബ്‌ദങ്ങൾ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"റിമൈൻഡറുകൾ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ഇവന്റുകൾ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"കോൾ ചെയ്യുന്ന എല്ലാവരും"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"തിരഞ്ഞെടുത്ത കോളർമാർ"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ആര്‍ക്കും"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"കോണ്‍‌ടാക്റ്റുകള്‍"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകൾ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ആവർത്തിച്ച് വിളിക്കുന്നവർ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> എന്ന വ്യക്തിയിൽ നിന്ന് മാത്രം"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>, <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> എന്നീ വ്യക്തികളിൽ നിന്ന് മാത്രം"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റ് കാലയളവിനുള്ളിൽ അതേ വ്യക്തി രണ്ടാമത്തെ തവണ വിളിക്കുകയാണെങ്കിൽ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ഇഷ്ടാനുസൃതം"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
@@ -3612,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ഈ ആപ്പ് സൃഷ്ടിച്ചിട്ടുള്ള എല്ലാ \'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങളും നീക്കംചെയ്യപ്പെടും."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ഓപ്റ്റിമൈസ് ചെയ്യരുത്"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ഓപ്‌റ്റിമൈസ് ചെയ്യുക"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ബാറ്ററിയെ വേഗത്തിൽ തീർത്തേക്കാം"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ബാറ്ററിക്ക് കൂടുതൽ ഈടുകിട്ടുന്നതിന് ശുപാർശ ചെയ്യുന്നു"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ അവഗണിക്കാൻ <xliff:g id="APP">%s</xliff:g> എന്നതിനെ അനുവദിക്കണോ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ഒന്നുമില്ല"</string>
@@ -3688,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ബാക്കപ്പ് പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g>-ലേക്ക് അപ്‌ഡേറ്റ് ചെയ്തു"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"അപ്‌ഡേറ്റ് ലഭ്യമാണ്"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ഈ ക്രമീകരണം മാറ്റാനാവില്ല"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"പ്രവർത്തനം അനുവദനീയമല്ല"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"വോളിയം മാറ്റാനാകില്ല"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"കോൾ ചെയ്യുന്നത് അനുവദനീയമല്ല"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS അനുവദനീയമല്ല"</string>
@@ -3878,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"ലോക്ക് സ്‌ക്രീനിൽ ‌വിവരം നിയന്ത്രിക്കുക"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"അറിയിപ്പ് ഉള്ളടക്കം കാണിക്കുക അല്ലെങ്കിൽ മറയ്ക്കുക"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"എല്ലാം"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"സഹായവും ‌നുറുങ്ങുകളും"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"നുറുങ്ങുകളും പിന്തുണയും"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ഏറ്റവും ചെറിയ വീതി"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ഇൻസ്റ്റാൾ ചെയ്തിട്ടുള്ള ആപ്സൊന്നും പ്രീമിയം SMS ആക്‌സസ് അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"പ്രീമിയം SMS-ന് നിങ്ങൾ പണം നൽകേണ്ടി വന്നേക്കാം, കാരിയറുടെ ബില്ലിലേക്ക് ഈ തുക ചേർക്കുന്നതാണ്. നിങ്ങളൊരു ആപ്പിന് അനുമതി പ്രവർത്തനക്ഷമമാക്കുന്നുവെങ്കിൽ, ആ ആപ്പ് ഉപയോഗിച്ച് പ്രീമിയം SMS അയയ്ക്കാനാകും."</string>
@@ -4071,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"സിനിമ, ടിവി ആപ്പുകൾ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"കാരിയര്‍ പ്രൊവിഷനിംഗ് വിവരം"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"കാരിയർ പ്രൊവിഷനിംഗ് തുടങ്ങുക"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"പുതിയതും ആവേശമുണർത്തുന്നതുമായ കാര്യങ്ങൾ എന്തൊക്കെയാണ്?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"നിങ്ങളുടെ പുതിയ ഫോണിനെ അറിയുക‌"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"നിങ്ങളുടെ ‌പുതിയ ‌ടാബ്‌ലെറ്റിനെ അറിയുക‌"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 9d7eb33..6cdb4b9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"СИМ хандалтын хүсэлт"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> нь таны СИМ картанд хандах хүсэлтэй байна. СИМ картанд хандалтыг нээж өгснөөр холболтын хугацааны туршид төхөөрөмжийн дата холболтыг идэвхгүй болгоно. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-д хандалтыг нээх"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Бусад төхөөрөмжид “<xliff:g id="DEVICE_NAME">^1</xliff:g>”-р харагдана"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Таны төхөөрөмж"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Шинэ төхөөрөмж холбох"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Таблетдаа ойролцоох Bluetooth төхөөрөмжүүдэд холбогдохыг зөвшөөрөх"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM-г шинэчилж чадсангүй"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM-г алдааны улмаас шинэчилж чадсангүй."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоогоор шинэчлэх)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Энэ таны таблетын "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Энэ таны утасны "<b>"дотоод сангаас"</b>" таны \n\n дараах бүх өгөгдлийг устгах болно: "<li>" Google бүртгэл"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан аппууд"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Та одоогоор дараах бүртгэлүүдээр нэвтэрсэн байна:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Маш урт хугацааны саатал (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> милсекунд)</item>
       <item quantity="one">Маш урт хугацааны саатал (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> милсекунд)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Хонхны дуу &amp; мэдэгдлийг унтраасан"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Хонхны дуу &amp; мэдэгдлийг бага түвшинд тохируулсан"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Хонхны дуу &amp; мэдэгдлийг дундаж түвшинд тохируулсан"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Бүрэн цэнэглэснээс хойшхи дэлгэц ашиглалт"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Дэлгэцийн хэрэглээ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Бүрэн цэнэглэснээс хойшхи аппын ашиглалт (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Бүрэн цэнэглэснээс хойших төхөөрөмжийн ашиглалт (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Төхөөрөмжийг цаана сэрээж байна"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Байршлыг тогтмол хүсэж байна"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> апп буруу ажиллаж байна"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарей хэвийн ажиллаж байна"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Аппууд хэвийн ажиллаж байна"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Бага батерейны багтаамж"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батерейны амь бага байна"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Утасныхаа батерейны амийг сайжруулах"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Таблетыг ердийнхөөс их хэмжээгээр ашигласан"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Төхөөрөмжийг ердийнхөөс их хэмжээгээр ашигласан"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Батерей удахгүй дуусаж болзошгүй"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Таны утсыг ердийнхөөс их хэмжээгээр ашигласан байна. Таны батарей тооцоолж байснаас хурдан дуусаж болзошгүй.\n\n Хамгийн сүүлд бүрэн цэнэглэснээс (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) хойш ашигласан шилдэг <xliff:g id="NUMBER">%1$d</xliff:g> апп:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Таны таблетыг ердийнхөөс их хэмжээгээр ашигласан байна. Таны батарей тооцоолж байснаас хурдан дуусаж болзошгүй.\n\n Хамгийн сүүлд бүрэн цэнэглэснээс (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) хойш ашигласан шилдэг <xliff:g id="NUMBER">%1$d</xliff:g> апп:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Таны төхөөрөмжийг ердийнхөөс их хэмжээгээр ашигласан байна. Таны батарей тооцоолж байснаас хурдан дуусаж болзошгүй.\n\n Хамгийн сүүлд бүрэн цэнэглэснээс (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) хойш ашигласан шилдэг <xliff:g id="NUMBER">%1$d</xliff:g> апп:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d аппыг хязгаарлах</item>
       <item quantity="one">%1$d аппыг хязгаарлах</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Энэ апп батерейг цаана ашиглах боломжтой болно. Таны батерей тооцоолж байснаас хурдан дуусаж болзошгүй."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Устгах"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Цуцлах"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Таны хэрэглээнд тулгуурлан таны батарейг бүрэн цэнэглэсэн тохиолдолд ихэвчлэн <xliff:g id="TIME_DURATION">%1$s</xliff:g> барьдаг.\n\nХэрэв та батарейны ажиллах хугацаагаа ихэсгэх шаардлагатай бол Батарей хэмнэгч горимыг асаана уу."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Хэрэв та батарейны ажиллах хугацаагаа ихэсгэх шаардлагатай бол Батарей хэмнэгч горимыг асаана уу"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Батерейны менежер"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Аппыг автоматаар удирдах"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Тогтмол ашигладаггүй аппуудын батерейг хязгаарлах"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Харагдаж буй дохиог зөвшөөрөх"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Мэдэгдлийг хязгаарлах"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Бүү саад бол горим асаалттай үед"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Мэдэгдэл"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Бүү саад бол горим асаалттай үед"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Мэдэгдлийн дууг хаах"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Мэдэгдлийг харуулах хэдий ч дуу болон чичиргээний дууг хаах"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Таны утсанд шинэ мэдэгдэл ирэх үед дуу гарахгүй буюу эсвэл чичрэхгүй"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Мэдэгдлийг нууж дууг хаах"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Мэдэгдэл огт харагдахгүй"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Та Бүү саад бол горим асаалттай үед шинэ эсвэл хүлээгдэж буй мэдэгдлийг харахгүй. Гэсэн хэдий ч утасны хэвийн үйл ажиллагаанд шаардлагатай мэдэгдэл болон төлөв харагдсан хэвээр байх болно."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Мэдэгдлийг чимээгүй харуулах"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Мэдэгдлийг хаах болно"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Мэдэгдэл ирэх үед таны утас ямар нэгэн дуу гаргахгүй буюу эсвэл чичрэхгүй."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Мэдэгдлийг нуух"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Та шинэ эсвэл байгаа мэдэгдлийг харахгүй"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Таны утас шинэ эсвэл байгаа мэдэгдлийг харуулахгүй бөгөөд дуу гаргахгүй буюу эсвэл чичрэхгүй. Мэдэгдэл таныг дэлгэцийнхээ дээд хэсгээс доош шудрахад харагдахгүй.\n\nУтасны үйл ажиллагаа болон төлөвийн талаар чухал мэдэгдлүүд харагдсан хэвээр байна гэдгийг санана уу."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Захиалгат"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Захиалгат тохиргоог идэвхжүүлэх"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Захиалгат тохиргоог устгах"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> дүрмийг автоматаар асааж болно</item>
       <item quantity="one">1 дүрмийг автоматаар асааж болно</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ок"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Төлөв"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Үл хамаарах зүйлс"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Хуваарь"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Дуу &amp; чичиргээ"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Бүү саад бол горим асаалттай үед таны сонгосон зүйлсээс бусад зүйлийн дууг хаана."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Дараахаас бусдын дууг хаах"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Дууг хаасан"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Дууг хаагаагүй"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Дууг хаасан хэдий ч <xliff:g id="SOUND_TYPE">%1$s</xliff:g>-г зөвшөөрдөг"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Дууг хаасан хэдий ч <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> болон <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>-г зөвшөөрдөг"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Дууг хаасан хэдий ч <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> болон <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>-г зөвшөөрдөг"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Зурвас, арга хэмжээ &amp; сануулагч"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Шинэчлэх"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Бүү шинэчил"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Таны утас таныг анхаарлаа төвлөрөхөд туслахын тулд илүү их зүйл хийх боломжтой.\n\nТохиргоог дараахад шинэчилнэ үү:\n\n- Мэдэгдлийг бүрмөсөн нуух\n\n- Одтой харилцагчдын дуудлагыг зөвшөөрч дуудлага хийгчийг давтах"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Бүү саад бол горимыг шинэчлэх үү?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Тохиргоо"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Та үүнийг цаашид Тохиргооны хэсэгт өөрчлөх боломжтой."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Дэлгэц асаалттай үед хориглох"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Дэлгэц унтраалттай үед хориглох"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Бүү саад бол горим нь сонсохыг хүсэхгүй дууг хориглоод зогсохгүй харагдах зүйлсийг хориглох боломжтой. Энэ нь танд унтах, төвлөрөх буюу эсвэл утсандаа зарцуулах цагаа багасгахаар оролдох үед тусалж болзошгүй."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Дуу болон харагдах зүйлсийг хориглох"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Мэдэгдэл ирэхэд дэлгэцийг асаах эсвэл сэрээх хэрэггүй"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Утасны үндсэн үйл ажиллагаа, төлөвөөс бусад бүх мэдэгдлийг бүү харуул"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ажлын профайлын дуу"</string>
@@ -3310,21 +3342,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Дуудлага"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Бүү саад бол горим асаалттай үед ирсэн дуудлагыг блоклох болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Зурвасууд"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Бүх зурвас"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Сонгосон зурвасууд"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Зурвас"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Зарим зурвас"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Хүн бүрээс"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Зөвхөн харилцагчаас"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Зөвхөн одтой харилцагчаас"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Одтой харилцагчид болон дахин дуудлага хийгчээс"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Харилцагчид болон дахин дуудлага хийгчээс"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Зөвхөн дахин дуудлага хийгчээс"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Байхгүй"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Сэрүүлэг"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Медиа"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Хүрэлтийн ая"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Сануулагч"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Үйл явдал"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Бүх дуудлага"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Сонгосон дуудлага хийгч"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"дурын хүн"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"харилцагчид"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"одоор тэмдэглэсэн харилцагчид"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Давтан дуудлага хийгч"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Зөвхөн <xliff:g id="CALLER_TYPE">%1$s</xliff:g>-с"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> болон <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>-с"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Хэрэв нэг хүн <xliff:g id="MINUTES">%d</xliff:g> минутын дотор хоёр дахь удаагаа дуудлага хийвэл"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Тусгай"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматаар асаах"</string>
@@ -3594,7 +3636,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Энэ апп-аас үүсгэсэн \"Бүү саад бол\" дүрэм нь хүчингүй болно."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Оновчлохгүй"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Оновчлох"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Taны тэжээлийн цэнэгийг түргэн дуусгаж болох юм"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Тэжээлийн цэнэгийг удаан барихад зориулсан"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g>-д тэжээлийн оновчлол хамаарахгүй болгох уу?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Байхгүй"</string>
@@ -3670,7 +3713,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Нөөцлөлт идэвхгүй болсон"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Андройдын <xliff:g id="VERSION">%1$s</xliff:g> хувилбарт шинэчилсэн"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Шинэчлэх боломжтой"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Энэ тохиргоог өөрчлөх боломжгүй"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Үйлдлийг зөвшөөрөөгүй"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Дууны түвшнийг өөрчлөх боломжгүй"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Дуудлага хийх боломжгүй"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS илгээх боломжгүй"</string>
@@ -3860,7 +3903,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Түгжигдсэн дэлгэцийн мэдээллийг хянах"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Харуулах эсвэл нуух мэдэгдлийн агуулга"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Бүгд"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Дэмжлэг &amp; зөвлөгөө"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Зөвлөгөө &amp; дэмжлэг"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Хамгийн бага өргөн"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Суулгасан апп гуравдагч талын SMS хандалтыг шаардаагүй байна"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Гуравдагч талын SMS нь таны оператор компанийн төлбөр дээр нэмэгдэж болно. Хэрэв та энэ апп-д зөвшөөрлийг идэвхжүүлбэл энэ апп-р гуравдагч тал SMS илгээх боломжтой болно."</string>
@@ -4053,6 +4096,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Кино, ТВ апп"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Оператор компанийн хангалтын мэдээлэл"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Оператор компанийн хангалтыг асаах"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шинэ соргог зүйл юу байна?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Шинэ утастай танилцах"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Шинэ таблеттай танилцах"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 2bf4ffb..8bfd302 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"सिम प्रवेश विनंती"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपल्या सिम कार्डवर प्रवेश करू इच्छित आहे. सिम कार्डवर प्रवेश मंजूर केल्यामुळे कनेक्शनच्या कालावधीसाठी आपल्या डिव्हाइसवरील डेटा कनेक्टिव्हिटी अक्षम होईल. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> वर प्रवेश द्या"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"इतर डिव्‍हाइसना \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' म्‍हणून दिसत आहे"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तुमचे डिव्हाइस"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नवीन डिव्हाइस जोडा"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"तुमच्या टॅबलेटला जवळपासच्या ब्लूटूथ डिव्हाइसशी संवाद साधण्याची अनुमती द्या"</string>
@@ -223,7 +225,7 @@
     <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"सिग्नल सामर्थ्य:"</string>
     <string name="radio_info_call_status_label" msgid="2611065018172747413">"व्हॉइस कॉल स्थिती:"</string>
     <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"डेटा पाठविला:"</string>
-    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"संदेश प्रतीक्षा:"</string>
+    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"मेसेज प्रतीक्षा:"</string>
     <string name="radio_info_phone_number_label" msgid="7942153178953255231">"फोन नंबर:"</string>
     <string name="radio_info_band_mode_label" msgid="8730871744887454509">"रेडिओ बँड निवडा"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"व्हॉइस नेटवर्क प्रकार:"</string>
@@ -303,7 +305,7 @@
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
-    <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"SMS मेसेज"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"मोबाइल नेटवर्कवर डेटा वापराला अनुमती द्या"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग करताना डेटा वापरास अनुमती द्या"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
@@ -359,7 +361,7 @@
     <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="owner_info_settings_title" msgid="5530285568897386122">"लॉक स्क्रीन मेसेज"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"विजेट सुरू करा"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"प्रशासकाने अक्षम केलेले"</string>
     <string name="lockdown_settings_title" msgid="7393790212603280213">"लॉकडाउन पर्याय दाखवा"</string>
@@ -1454,6 +1456,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM रीसेट करता आले नाही"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"एका एररमुळे eSIM रीसेट करता येणार नाहीत."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"तुम्ही खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
@@ -1999,6 +2003,8 @@
       <item quantity="one">खूप दीर्घ विलंब (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> मिसे)</item>
       <item quantity="other">खूप दीर्घ विलंब (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> मिसे)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"रिंग आणि सूचना हे बंदवर सेट केले"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"रिंग आणि सूचना हे कमीवर सेट केले"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"रिंग आणि सूचना हे मध्यमवर सेट केले"</string>
@@ -2106,8 +2112,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज झाल्यानंतर स्क्रीन वापर"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन उपयोग"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"पूर्ण चार्ज केल्‍यापासूनचा अॅप वापर (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"पूर्ण चार्ज केल्‍यापासूनचा डिव्‍हाइस वापर (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2138,8 +2144,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिव्हाइसला बॅकग्राउंडमध्‍ये सक्रिय ठेवते"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"स्थानाशी संबंधित माहिती वारंवार मागत आहे"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अ‍ॅप्स विचित्र प्रकारे काम करत आहेत"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"बॅटरी चांगल्या स्थितीत आहे"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"अॅप्स नेहमीप्रमाणे चालत आहेत"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"बॅटरीची क्षमता कमी"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"बॅटरी लाइफ जास्त वेळ टिकण्यासारखी नाही"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"तुमच्या फोनचे बॅटरी लाइफ सुधारा"</string>
@@ -2154,9 +2166,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"टॅबलेट नेहमीपेक्षा जास्त वापरले गेला"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"डिव्हाइस नेहमीपेक्षा जास्त वापरले गेले"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"बॅटरी लवकर संपू शकते"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"तुमचा फोन नेहमीपेक्षा जास्त वापरले गेला आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते. मागील चार्जपासून (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) बॅटरीचा जास्त वापर करणारी \n\nटॉप <xliff:g id="NUMBER">%1$d</xliff:g> अॅप्स:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"तुमचा टॅबलेट नेहमीपेक्षा जास्त वापरले गेला आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते. मागील चार्जपासून (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) बॅटरीचा जास्त वापर करणारी \n\nटॉप <xliff:g id="NUMBER">%1$d</xliff:g> अॅप्स:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"तुमचे डिव्हाइस नेहमीपेक्षा जास्त वापरले गेले आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते. मागील चार्जपासून (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) बॅटरीचा जास्त वापर करणारी \n\nटॉप <xliff:g id="NUMBER">%1$d</xliff:g> अॅप्स:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">%1$d अ‍ॅपला प्रतिबंधित करा</item>
       <item quantity="other">%1$d अ‍ॅप्सना प्रतिबंधित करा</item>
@@ -2185,8 +2200,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"या अॅपला बॅकग्राउंडमध्ये बॅटरी वापरता येईल. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"काढा"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"रद्द करा"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"तुमच्या वापरावर आधारित, पूर्णपणे चार्ज झाल्यावर तुमची बॅटरी सहसा <xliff:g id="TIME_DURATION">%1$s</xliff:g> तास सुरू राहते.\n\nतुम्हाला तुमचे बॅटरी लाइफ वाढवायचे असल्यास, बॅटरी सेव्हर सुरू करा."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"तुम्हाला तुमचे बॅटरी लाइफ वाढवायचे असल्यास, बॅटरी सेव्हर सुरू करा"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"बॅटरी व्यवस्थापक"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"अॅप्स आपोआप व्यवस्थापित करा"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"तुम्ही नेहमी वापरत नसलेल्या अॅप्सचा बॅटरी वापर मर्यादित करा"</string>
@@ -2440,7 +2459,7 @@
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Google सर्व्हरवरील आपल्या वाय-फाय पासवर्ड, बुकमार्क, इतर सेटिंग्ज आणि अॅप डेटाचा बॅक अप घेणे थांबवायचे तसेच सर्व प्रती मिटवायच्या?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि (अॅप्सद्वारे स्टोअर केलेल्या सेटिंग्ज आणि फायली यासारख्या) अॅप डेटाचा बॅकअप घेणे थांबवायचे, तसेच दूरस्थ सर्व्हर वरील सर्व प्रती मिटवायच्या?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"आपोआप डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे स्टोअर केलेल्या सेटिंग्ज आणि फायली) दूरस्‍थपणे बॅकअप घ्‍या.\n\nतुम्ही स्वयंचलित बॅकअप चालू करता तेव्‍हा, डिव्हाइस आणि अ‍ॅप डेटा ठराविक कालावधीने दूरस्‍थपणे सेव्ह केला जातो. अ‍ॅप डेटा हा संपर्क, संदेश आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने सेव्ह केलेला (डेव्हलपरच्या सेटिंग्जवर आधारित) कोणताही डेटा असू शकतो."</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"आपोआप डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे स्टोअर केलेल्या सेटिंग्ज आणि फायली) दूरस्‍थपणे बॅकअप घ्‍या.\n\nतुम्ही स्वयंचलित बॅकअप चालू करता तेव्‍हा, डिव्हाइस आणि अ‍ॅप डेटा ठराविक कालावधीने दूरस्‍थपणे सेव्ह केला जातो. अ‍ॅप डेटा हा संपर्क, मेसेज आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने सेव्ह केलेला (डेव्हलपरच्या सेटिंग्जवर आधारित) कोणताही डेटा असू शकतो."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"डिव्हाइस प्रशासक सेटिंग्ज"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"डिव्हाइस प्रशासक अॅप"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"हे डिव्हाइस अॅडमिन अॅप बंद करा"</string>
@@ -2534,9 +2553,9 @@
     <string name="header_add_an_account" msgid="756108499532023798">"खाते जोडा"</string>
     <string name="finish_button_label" msgid="481587707657751116">"समाप्‍त"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"खाते काढायचे?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"हे खाते काढल्याने त्याचे सर्व संदेश, संपर्क आणि टॅब्लेटवरील अन्य डेटा हटतील!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"हे खाते काढल्याने त्याचे सर्व संदेश, संपर्क आणि फोनवरील अन्य डेटा हटवला जाईल!"</string>
-    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"हे खाते काढल्याने त्याचे सर्व संदेश, संपर्क आणि डिव्हाइसवरील इतर डेटा हटवला जाईल!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"हे खाते काढल्याने त्याचे सर्व मेसेज, संपर्क आणि टॅब्लेटवरील अन्य डेटा हटतील!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"हे खाते काढल्याने त्याचे सर्व मेसेज, संपर्क आणि फोनवरील अन्य डेटा हटवला जाईल!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"हे खाते काढल्याने त्याचे सर्व मेसेज, संपर्क आणि डिव्हाइसवरील इतर डेटा हटवला जाईल!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"या बदलाला आपल्या प्रशासकाद्वारे अनुमती नाही"</string>
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"व्यक्तिचलितपणे सिंक करू शकत नाही"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"या आयटमसाठी सध्या सिंक अक्षम केले आहे. हे सेटिंग बदलण्यासाठी, पार्श्वभूमीवरील डेटा आणि आपोआप होणारे सिंक तात्पुरते चालू करा."</string>
@@ -2947,7 +2966,7 @@
     <string name="search_menu" msgid="6283419262313758339">"सेटिंग्ज शोधा"</string>
     <string name="keywords_wifi" msgid="3646884600964177062">"वायफाय, वाय-फाय, नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाय फाय"</string>
     <string name="keywords_change_wifi_state" msgid="627068244033681010">"वायफाय, वाय-फाय, टॉगल, कंट्रोल"</string>
-    <string name="keywords_more_default_sms_app" msgid="8597706109432491909">"एसएमएस, मजकूर पाठवणे, संदेश, मेसेजिंग, डीफॉल्ट"</string>
+    <string name="keywords_more_default_sms_app" msgid="8597706109432491909">"एसएमएस, मजकूर पाठवणे, मेसेज, मेसेजिंग, डीफॉल्ट"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"वायफाय, वाय-फाय, कॉल, कॉलिंग"</string>
     <string name="keywords_home" msgid="294182527446892659">"लाँचर, डीफॉल्ट, अॅप्स"</string>
@@ -3076,38 +3095,28 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"व्हिज्युअल सिग्नलना अनुमती द्या"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
+    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"सूचना"</string>
+    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"कस्टम"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"कस्टम सेटिंग सुरू करा"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"कस्टम सेटिंग काढून टाका"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"दिसेल"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"अंशतः लपवलेले"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"लपवलेले"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"कस्टम प्रतिबंध"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"स्क्रीन चालू असताना"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"स्क्रीन बंद असताना"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"ध्वनी आणि व्हायब्रेट म्यूट करा"</string>
@@ -3152,13 +3161,40 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> नियम आपोआप चालू केला जाऊ शकतो</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> नियम आपोआप चालू केले जाऊ शकतात</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ओके"</string>
+    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
+    <skip />
+    <!-- no translation found for zen_sound_title (424490228488531372) -->
+    <skip />
+    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
+    <skip />
+    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
+    <skip />
+    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
+    <skip />
+    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
+    <skip />
+    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
+    <skip />
+    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
+    <skip />
+    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
+    <skip />
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"अपडेट करा"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"अपडेट करू नका"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"लक्ष केंद्रित करण्याकरता तुम्हाला मदत करण्यासाठी तुमचा फोन बरेच काही करू शकतो.\n\nसूचना पूर्णपणे लपवण्यासाठी\n\nतारांकित संपर्कांकडील आणि नियमित कॉलरकडील कॉल ना अनुमती देण्यासाठी\nसेटिंग्ज अपडेट करा\n"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"व्यत्यय आणू नका अपडेट करायचे का?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"सेटिंग्ज"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"तुम्‍ही हे पुढे सेटिंग्‍जमध्‍ये कस्‍टमाइझ करू शकता."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"स्‍क्रीन सुरू असताना ब्‍लॉक करा"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"स्‍क्रीन बंद असताना ब्‍लॉक करा"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"व्‍यत्‍यय आणू नका नको असलेले ध्‍वनी ब्‍लॉक करण्‍यापेक्षा बरेच काही करू शकते - हे व्हिज्‍युअल देखील ब्‍लॉक करू शकते. तुम्‍ही झोपण्‍याचा, लक्ष देण्‍याचा किंवा तुमच्‍या फोनवर वेळ घालवणे मर्यादित करण्‍याचा प्रयत्‍न करत असल्‍यास, हे उपयुक्‍त ठरू शकते."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ध्‍वनी आणि व्हिज्‍युअल ब्‍लॉक करा"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"स्क्रीन सुरू करू नका किंवा सूचना सुरू करू नका"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"मुलभूत फोन अॅक्टिव्हिटी आणि स्थितीसाठी सूचना अजिबात दाखवू नका"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"कार्य प्रोफाइल ध्वनी"</string>
@@ -3229,7 +3265,7 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"इंस्टॉल केलेल्या कोणत्याही अ‍ॅप्सने सूचना प्रवेशाची विनंती केली नाही."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी सूचना प्रवेशास अनुमती द्यायची?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तुम्ही प्राप्त करता ती संपर्क नावे आणि मजकूर संदेश यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे अॅपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तुम्ही प्राप्त करता ती संपर्क नावे आणि मजकूर मेसेज यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे अॅपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"तुम्ही <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> साठी सूचनांमधील प्रवेश बंद केल्यास, व्यत्यय आणू नका मधील प्रवेश देखील बंद केला जाऊ शकतो."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"बंद करा"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"रद्द करा"</string>
@@ -3329,21 +3365,42 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ते <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
-    <string name="zen_mode_messages" msgid="5886440273537510894">"संदेश"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"सर्व संदेश"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"निवडलेले संदेश"</string>
+    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
+    <string name="zen_mode_messages" msgid="5886440273537510894">"मेसेज"</string>
+    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
+    <skip />
+    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
+    <skip />
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"कोणाहीकडून"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"केवळ संपर्कांकडून"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"केवळ तारांकित संपर्कांकडून"</string>
+    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
+    <skip />
     <string name="zen_mode_from_none" msgid="8219706639954614136">"काहीही नाही"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"मीडिया"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"स्पर्श ध्वनी"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"स्मरणपत्रे"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इव्हेंट"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"सर्व कॉलकर्ता"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"निवडलेले कॉलर"</string>
+    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
+    <skip />
+    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
+    <skip />
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"नियमित कॉलर"</string>
+    <!-- no translation found for zen_mode_calls_summary_one (2867689575419791866) -->
+    <skip />
+    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
+    <skip />
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"एकाच व्यक्तीने <xliff:g id="MINUTES">%d</xliff:g> मिनिटांच्या आत दुसर्‍या वेळी कॉल केल्यास"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"कस्टम"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वयंचलितपणे चालू करा"</string>
@@ -3386,12 +3443,12 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"सुरक्षित प्रारंभ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"सुरु ठेवा"</string>
-    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"सुरू होण्यापूर्वी तुमचा पिन आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"सुरू होण्यापूर्वी तुमचा पॅटर्न आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न हवा?"</string>
-    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"सुरू होण्यापूर्वी तुमचा पासवर्ड आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड हवा?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचे फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी तुमचा पिन आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचे फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी तुमचा पॅटर्न आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न हवा?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमचे फिंगरप्रिंट वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुम्ही तुमचा पासवर्ड आवश्‍यक करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, तो कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nहे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड आवश्‍यक आहे का?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"सुरू होण्यापूर्वी तुमचा पिन आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, मेसेज किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"सुरू होण्यापूर्वी तुमचा पॅटर्न आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, मेसेज किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न हवा?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"सुरू होण्यापूर्वी तुमचा पासवर्ड आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, मेसेज किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड हवा?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचे फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी तुमचा पिन आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, मेसेज किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचे फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी तुमचा पॅटर्न आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, मेसेज किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न हवा?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमचे फिंगरप्रिंट वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुम्ही तुमचा पासवर्ड आवश्‍यक करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, तो कॉल, मेसेज किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nहे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड आवश्‍यक आहे का?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"होय"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"नाही"</string>
     <string name="restricted_true_label" msgid="4761453839409220473">"प्रतिबंधित"</string>
@@ -3613,7 +3670,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"या अॅपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ऑप्टिमाइझ करू नका"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ऑप्टिमाइझ करा"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"आपली बॅटरी अधिक द्रुतपणे संपवू शकते"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"बॅटरी चांगली चालण्यासाठी शिफारस केलेले"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"बॅटरी ऑप्टिमायझेशनकडे दुर्लक्ष करण्यासाठी <xliff:g id="APP">%s</xliff:g> ला अनुमती द्यायची?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"काहीही नाही"</string>
@@ -3689,7 +3747,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"बॅक अप घेणे अक्षम केले"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> वर अपडेट केले"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"अपडेट उपलब्ध"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"हे सेटिंग बदलू शकत नाही"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"क्रियेस अनुमती नाही"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"व्हॉल्यूम बदलू शकत नाही"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"कॉलिंगला अनुमती नाही"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ला अनुमती नाही"</string>
@@ -3819,9 +3877,9 @@
     <string name="home_app" msgid="4066188520886810030">"होम अॅप"</string>
     <string name="no_default_home" msgid="7184117487704520238">"डीफॉल्ट होम नाही"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"सुरक्षित प्रारंभ"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न आवश्यक आहे. बंद केले असताना, या डिव्हाइस ला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तुमचे डिव्हाइस सुरू करण्यासाठी पिन आवश्यक आहे. बंद केले असताना, या डिव्हाइस ला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड आवश्यक आहे. बंद केले असताना, या डिव्हाइसला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न आवश्यक आहे. बंद केले असताना, या डिव्हाइस ला कॉल, मेसेज, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तुमचे डिव्हाइस सुरू करण्यासाठी पिन आवश्यक आहे. बंद केले असताना, या डिव्हाइस ला कॉल, मेसेज, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड आवश्यक आहे. बंद केले असताना, या डिव्हाइसला कॉल, मेसेज, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"आणखी एक फिंगरप्रिंट जोडा"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"दुसर्‍या बोटाने अनलॉक करा"</string>
     <string name="battery_saver_on_summary" msgid="7722791295871319534">"सुरू"</string>
@@ -3879,7 +3937,8 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"लॉक स्क्रीनवरील माहिती नियंत्रित करा"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सामग्री दर्शवा किंवा लपवा"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"सर्व"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"साहाय्य आणि टिपा"</string>
+    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
+    <skip />
     <string name="developer_smallest_width" msgid="7516950434587313360">"सर्वात लहान रुंदी"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल केलेल्या कोणत्याही अॅप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम SMS मुळे तुम्हाला कदाचित शुल्क द्यावे लागू शकेल आणि आपल्या कॅरियर बिलिंग मध्ये जोडले जाईल. तुम्ही अॅपसाठी परवानगी सक्षम केल्यास, तो अॅप वापरून तुम्ही प्रीमियम SMS पाठविण्यात सक्षम असाल."</string>
@@ -4072,6 +4131,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"चित्रपट आणि टीव्ही अॅप्स"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"वाहक तरतूद माहिती"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक तरतूद ट्रिगर करा"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नवीन आणि रोमांचक असे काय आहे?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"तुमच्या नवीन फोनबद्दल माहिती देणार्‍या सफरीवर चला"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"तुमच्या नवीन टॅबलेटबद्दल माहिती देणार्‍या सफरीवर चला"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 3b4dee4..71371b9 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> mahu mengakses kad SIM anda. Pemberian akses kepada kad SIM akan melumpuhkan sambungan data pada peranti anda untuk tempoh sambungan itu. Berikan akses kepada <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kelihatan kepada peranti lain sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Peranti anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Gandingkan peranti baharu"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Benarkan tablet anda berkomunikasi dengan peranti Bluetooth yang berdekatan"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Tidak dapat menetapkan semula eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM tidak dapat ditetapkan semula kerana ralat."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Padamkan semua data (tetapan semula kilang)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Kelengahan sangat lama (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Kelengahan sangat lama (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Dering &amp; pemberitahuan ditetapkan kepada mati"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Dering &amp; pemberitahuan ditetapkan kepada rendah"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Dering &amp; pemberitahuan ditetapkan kepada sederhana"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan skrin sejak cas penuh"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Penggunaan skrin"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Penggunaan apl sejak cas penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Penggunaan peranti sejak cas penuh (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Membangkitkan peranti dalam latar belakang"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Kerap meminta lokasi"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apl bergelagat tak normal"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateri dalam keadaan baik"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apl berjalan seperti biasa"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Kapasiti bateri rendah"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Battery tidak dapat memberikan hayat yang panjang"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Lanjutkan hayat bateri telefon anda"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet digunakan lebih kerap berbanding biasa"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Peranti digunakan lebih kerap berbanding biasa"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Bateri akan kehabisan tidak lama lagi"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon anda telah digunakan lebih kerap berbanding biasa. Bateri anda mungkin kehabisan lebih cepat daripada yang dijangkakan.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> apl yang paling kerap digunakan sejak cas penuh (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablet anda telah digunakan lebih kerap berbanding biasa. Bateri anda mungkin kehabisan lebih cepat daripada yang dijangkakan.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> apl yang paling kerap digunakan sejak cas penuh (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Peranti anda telah digunakan lebih kerap berbanding biasa. Bateri anda mungkin kehabisan lebih cepat daripada yang dijangkakan.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> apl yang paling kerap digunakan sejak cas penuh (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Hadkan %1$d apl</item>
       <item quantity="one">Hadkan %1$d apl</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Apl ini dapat menggunakan bateri di latar belakang. Bateri anda mungkin kehabisan lebih cepat daripada yang dijangkakan."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Alih keluar"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Batal"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Berdasarkan penggunaan anda, bateri biasanya habis kira-kira <xliff:g id="TIME_DURATION">%1$s</xliff:g> apabila dicas penuh.\n\nJika anda ingin melanjutkan hayat bateri, hidupkan Penjimat Bateri."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Jika anda perlu melanjutkan hayat bateri anda, hidupkan Penjimat Bateri"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Pengurus Bateri"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Urus apl secara automatik"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Hadkan bateri untuk apl yang jarang digunakan"</string>
@@ -3075,15 +3094,14 @@
     <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">"Sekat gangguan visual"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Benarkan isyarat visual"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Hadkan pemberitahuan"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Apabila Jangan Ganggu dihidupkan"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Pemberitahuan"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Apabila Jangan Ganggu dihidupkan"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Redamkan pemberitahuan"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Tunjukkan pemberitahuan tetapi redamkan bunyi &amp; getaran"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Apabila pemberitahuan baharu diterima, telefon anda tidak akan berbunyi atau bergetar"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Sembunyikan &amp; redamkan pemberitahuan"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Pemberitahuan tidak akan dipaparkan sama sekali"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Anda tidak akan melihat pemberitahuan baharu atau sedia ada apabila Jangan Ganggu dihidupkan. Walau bagaimanapun, pemberitahuan yang diperlukan untuk aktiviti telefon asas dan status masih dipaparkan."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tunjukkan pemberitahuan secara senyap"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Pemberitahuan akan diredamkan"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Apabila pemberitahuan diterima, telefon anda tidak akan berbunyi atau bergetar."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sembunyikan pemberitahuan"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Anda tidak akan melihat pemberitahuan baharu atau sedia ada"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon anda tidak akan menunjukkan pemberitahuan baharu atau sedia ada dan tidak akan berbunyi atau bergetar. Pemberitahuan tidak akan muncul apabila anda meleret ke bawah dari bahagian atas skrin anda.\n\nJangan lupa, pemberitahuan kritikal untuk aktiviti dan status telefon masih dipaparkan."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tersuai"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Dayakan tetapan tersuai"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Alih keluar tetapan tersuai"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> peraturan boleh dihidupkan secara automatik</item>
       <item quantity="one">1 peraturan boleh dihidupkan secara automatik</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Gelagat"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Pengecualian"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Jadual"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Bunyi &amp; getaran"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Apabila Jangan Ganggu dihidupkan, bunyi dan getaran akan diredamkan, kecuali item yang anda benarkan di atas."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Redamkan semua kecuali"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Diredamkan"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Tidak diredamkan"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Diredamkan, tetapi benarkan <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Diredamkan tetapi benarkan <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> dan <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Diredamkan, tetapi benarkan <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> dan <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesej, acara &amp; peringatan"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Apabila Jangan Ganggu Dihidupkan, mesej, peringatan dan acara akan diredamkan, kecuali item yang anda benarkan di atas. Anda boleh melaraskan tetapan mesej untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Kemas Kini"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Jangan kemas kini"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefon anda dapat melakukan pelbagai perkara untuk membantu anda fokus.\n\nKemas kini tetapan kepada:\n\n- Sembunyikan pemberitahuan sepenuhnya\n\n- Benarkan panggilan daripada kenalan yang dibintangi dan pemanggil berulang"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Kemas Kini Jangan Ganggu?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Tetapan"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Anda boleh memperibadikan perkara ini selanjutnya dalam Tetapan."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Sekat apabila skrin dihidupkan"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Sekat apabila skrin dimatikan"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Jangan Ganggu boleh melakukan lebih banyak perkara selain menyekat bunyi yang tidak diingini - ciri ini boleh menyekat visual juga. Ini mungkin berguna jika anda sedang cuba tidur, menumpukan perhatian atau mengehadkan masa yang diluangkan pada telefon."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Sekat bunyi dan visual"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Jangan hidupkan skrin atau bangkitkan peranti untuk pemberitahuan"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Jangan tunjukkan pemberitahuan sama sekali, kecuali untuk aktiviti telefon asas dan status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Bunyi profil kerja"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> hingga <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Panggilan"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Apabila Jangan Ganggu dihidupkan, panggilan masuk disekat. Anda boleh melaraskan tetapan untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesej"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Semua mesej"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mesej yang dipilih"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesej"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Sesetengah mesej"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Daripada sesiapa sahaja"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Daripada kenalan sahaja"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Daripada kenalan dibintangkan sahaja"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Daripada kenalan yang dibintangi dan pemanggil berulang"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Daripada kenalan dan pemanggil berulang"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Daripada pemanggil berulang sahaja"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tiada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Penggera"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Bunyi sentuhan"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Peringatan"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua pemanggil"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Pemanggil dipilih"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"sesiapa sahaja"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kenalan"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kenalan yang dibintangi"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Pemanggil berulang"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Daripada <xliff:g id="CALLER_TYPE">%1$s</xliff:g> sahaja"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Daripada <xliff:g id="CALLER_TYPE">%1$s</xliff:g> dan <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jika orang yang sama memanggil sekali lagi dalam tempoh <xliff:g id="MINUTES">%d</xliff:g> minit"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Tersuai"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Hidupkan secara automatik"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Semua peraturan Jangan Ganggu yang dibuat oleh apl ini akan dialih keluar."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Jangan optimumkan"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimumkan"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Cas bateri anda mungkin susut dengan lebih cepat lagi"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Disyorkan untuk hayat bateri yang lebih lama"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Benarkan <xliff:g id="APP">%s</xliff:g> mengabaikan pengoptimuman bateri?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Tiada"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Sandaran dilumpuhkan"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Dikemas kini kepada Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Kemas kini tersedia"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Tetapan tidak boleh ditukar"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Tindakan tidak dibenarkan"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Kelantangan tidak boleh ditukar"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Panggilan tidak dibenarkan"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS tidak dibenarkan"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kawal maklumat pada skrin kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Tunjukkan atau sembunyikan kandungan pemberitahuan"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Sokongan &amp; petua"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Petua &amp; sokongan"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Tiada apl terpasang yang telah meminta akses SMS Premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium bukan percuma dan cajnya akan ditambahkan pada bil pembawa anda. Jika anda mendayakan kebenaran untuk apl, anda akan dapat menghantar SMS premium menggunakan apl itu."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apl Filem &amp; TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maklumat Peruntukan Pembawa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cetus Peruntukan Pembawa"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apakah yang baharu dan menarik?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Teroka telefon baharu anda"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Teroka tablet baharu anda"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 2db15ac..52d7871 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -235,7 +235,7 @@
   </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"စက်တွင်းသိုလှောင်ကိရိယာ"</item>
-    <item msgid="3738430123799803530">"ဖယ်ရှား၍ရသောSDကဒ်"</item>
+    <item msgid="3738430123799803530">"ဖယ်ရှား၍ရသောSDကတ်"</item>
     <item msgid="4498124044785815005">"စနစ်အား ဆုံးဖြတ်ပါစေ"</item>
   </string-array>
   <string-array name="app_ops_categories">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 90ba1b2..e4467b3 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -91,7 +91,7 @@
     <string name="font_size_preview_text_body" msgid="2846183528684496723">"မျက်လုံးများကို ကာကွယ်ရန် အစိမ်းရောင်မျက်မှန်များ တပ်ထားသော်လည်း ဒေါ်ရသီနှင့် သူ့သူယ်ချင်းများသည် အံ့ဩဖွယ်မြို့တော်၏ တောက်ပမှုကြောင့် မျက်စိစူးသွားပါသေးသည်။ အစိမ်းရောင်စကျင်ကျောက်များဖြင့် ဆောက်လုပ်ထားပြီး တဖိတ်ဖိတ်တောက်ပနေသည့် မြများ မြုပ်သွင်းထားသည့် လှပသောအိမ်များကို လမ်းများတလျှောက် အစီအရီ တည်ဆောက်ထားပါသည်။ နေရောင်အောက်တွင် တစ်လျှပ်လျှပ်တောက်ပနေသည့် မြများကို ခပ်စိတ်စိတ် အတန်းလိုက် စီတန်း၍ဆက်ထားပြီး ယင်းအစိမ်းရောင်စကျင်ကျောက်ဖြင့်ပင် ဆက်ခင်းထားသည့် ပလပ်ဖောင်းတလျှောက် သူတို့ လမ်းလျှောက်လာခဲ့ကြသည်။ ပြတင်းပေါက်မှန်များအားလုံးသည် အစိမ်းရောင်ဖန်သားများဖြစ်သည်။ မြို့အထက်ရှိ ကောင်းကင်ပြင်သည်ပင်လျှင် အစိမ်းရောင်သန်းလျက်ရှိပြီး နေရောင်ခြည်သည်လည်း အစိမ်းရောင်ပင်ဖြစ်သည်။ \n\nလူများစွာရှိပြီး ယောကျာ်း၊ မိန်းမနှင့် ကလေးများ လမ်းလျှောက်လျက်ရှိကာ ၎င်းတို့အားလုံးသည် အစိမ်းရောင်အဝတ်အစားများကို ဝတ်ဆင်ထား၍ အစိမ်းရောင်သန်းသည့် အသားရောင်များ ရှိကြပါသည်။ သူတို့သည် ဒေါ်ရသီနှင့် ကွဲပြားခြားနားသည့် သူ့အဖော်များကို စိတ်ဝင်တစား ကြည့်နေကြပြီး ခြင်္သေ့ကို တွေ့လိုက်သည့်အခါတွင် ကလေးများက သူတို့၏ မိခင်နောက်ကျောသို့ သွားရောက် ကွယ်ဝှက်နေကြသည်။ သို့သော် မည်သူကမျှ သူတို့ကို စကားမပြောကြပါ။ လမ်းတလျှောက် ဆိုင်များစွာ ရှိသည်။ ၎င်းဆိုင်များရှိ အရာအားလုံးသည် အစိမ်းရောင်များဖြစ်သည်ကို ဒေါ်ရသီ တွေ့ခဲ့ရသည်။ အစိမ်းရောင်ချိုချဉ်နှင့် အစိမ်းရောင်ပေါက်ပေါက်ဆုတ်တို့အပြင် အစိမ်းရောင်ဖိနပ်၊ အစိမ်းရောင်ဦးထုပ်နှင့် အစိမ်းရောင် အဝတ်အထည် မျိုးစုံတို့ကို ရောင်းနေကြသည်။ တစ်နေရာတွင် လူတစ်ဦးသည် အစိမ်းရောင် သံပုရာရည်ကို ရောင်းချနေပြီး ကလေးများကလည်း အစိမ်းရောင် ဒင်္ဂါးပြားများဖြင့် ပေးချေနေသည်ကို ဒေါ်ရသီတွေ့ခဲ့ရသည်။ \n\nထိုနေရာတွင် မြင်းအစရှိသည့် တိရစ္ဆာန်တစ်ကောင်မျှ မတွေ့ခဲ့ရပါ။ ယောကျာ်းများသည် ပစ္စည်းများကို လှည်းတစ်ခုထဲထည့်၍ တွန်းသွားပါသည်။ လူတိုင်းလူတိုင်းသည် ပျော်ရွှင်ကျေနပ်အားရနေပုံ ရပါသည်။"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USBသိုလှောင်ကိရိယာ"</string>
-    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ကဒ်"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ကတ်"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ဘလူးတုသ်"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"အနီးတဝှက်ရှိဘလူးတုသ်စက်များအားလုံးမှ တွေ့ရှိစေရန်<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"အနီးတဝှက်ရှိဘလူးတုသ်စက်များအားလုံးမှ တွေ့ရှိစေရန်"</string>
@@ -164,9 +164,11 @@
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"နောက်ထပ်မမေးပါနှင့်"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"စာသုံးခွင့်ပြုရန်တောင်းခံချက်"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s သည် သင်၏ စာများကို ရယူအသုံးပြုလိုသည်။ %2$s ကို အသုံးပြုခွင့် ပေးမည်လား?"</string>
-    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ကဒ် သုံးခွင့် တောင်းဆိုမှု"</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ကတ် သုံးခွင့် တောင်းဆိုမှု"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> သည် သင့် SIM ကဒ်အား ဝင်ရောက်သုံးလို၏။ SIM ကဒ်အား ဝင်ရောက်သုံးခွင့်ပြုပါက ချိတ်ဆက်နေစဉ်ကာလအတွင်း သင့် စက်ကိရိယာ၏ ဒေတာချိတ်ဆက်မှုအား ပိတ်ထားလိမ့်မည်။ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> အား ဝင်ရောက်သုံးခွင့်ပြုရန်"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"အခြားစက်ပစ္စည်းများက \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' အဖြစ် မြင်ရပါမည်"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"သင်၏ စက်ပစ္စည်းများ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"စက်အသစ် တွဲချိတ်ရန်"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"သင့်တက်ဘလက်အား အနီးအနားရှိ \'ဘလူးတုသ်\' စက်ပစ္စည်းများနှင့် ချိတ်ဆက်ခွင့်ပေးသည်"</string>
@@ -285,7 +287,7 @@
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"တက်ဘလက်၏အချက်အလက်"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"ဖုန်းအချက်အလက်"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USBသိုလှောင်ကိရိယာ"</string>
-    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ကဒ်"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ကတ်"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ပရောက်စီ ဆက်တင်များ"</string>
     <string name="cancel" msgid="6859253417269739139">"မလုပ်တော့"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
@@ -1234,7 +1236,7 @@
     <string name="status_awake_time" msgid="2393949909051183652">"ပြန်ပွင့်မည်အချိန်"</string>
     <string name="internal_memory" msgid="9129595691484260784">"စက်တွင်း သိုလှောင်ထားမှု"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBဖြင့် သိမ်းဆည်းခြင်း"</string>
-    <string name="sd_memory" product="default" msgid="151871913888051515">"SD ကဒ်"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD ကတ်"</string>
     <string name="memory_available" msgid="5052397223077021181">"နေရာလွတ်"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"အသုံးပြုနိုင်သည် (ဖတ်ရန်သပ်သပ်)"</string>
     <string name="memory_size" msgid="6629067715017232195">"စုစုပေါင်း မမ်မိုရီနေရာ"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM များ ပြင်ဆင်သတ်မှတ်၍မရပါ"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"အမှားတစ်ခုကြောင့် eSIM များ ပြင်ဆင်သတ်မှတ်၍မရပါ။"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အက်ပ်ဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အက်ပ်"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ဤသည်က သင့်ဖုန်း၏"<b>"စက်အတွင်းသိုလှောင်မှု"</b>" အပါအဝင် အောက်ပါတို့ကို ဖျက်ပါလိမ့်မည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
@@ -1679,7 +1683,7 @@
     <string name="external_code_size_label" msgid="3459343140355961335">"USBသိုလှောင်မှု အက်ပ်"</string>
     <string name="data_size_label" msgid="6117971066063850416">"အသုံးပြုသူ၏ ဒေတာ"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USBသိုလှောင်မှု ဒေတာ"</string>
-    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ကဒ်"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ကတ်"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"ဖယ်ရှားခြင်း"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"သုံးစွဲသူအားလုံးအတွက် ဖြုတ်ရန်"</string>
     <string name="install_text" msgid="884360662922471113">"ထည့်သွင်းရန်"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">အလွန်ရှည်လျားသည့် နှောင့်နှေးမှု (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">အလွန်ရှည်လျားသည့် နှောင့်နှေးမှု (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"မြည်သံနှင့် အကြောင်းကြားချက်ကို ပိတ်ထားသည်"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"မြည်သံနှင့် အကြောင်းကြားချက်ကို အသံနှိမ့်ထားသည်"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"မြည်သံနှင့် အကြောင်းကြားချက်ကို အလယ်အလတ် သတ်မှတ်ထားသည်"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"အားအပြည့်သွင်းကတည်းက မျက်နှာပြင်သုံးမှု"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"မျက်နှာပြင် သုံးစွဲမှု"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"မိုဘိုင်းကွန်ရက် ရှာဖွေခြင်း"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"အားအပြည့်သွင်းပြီးကတည်းက အက်ပ်အသုံးပြုချိန် (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"အားအပြည့်သွင်းပြီးကတည်းက စက်ပစ္စည်းအသုံးပြုချိန် (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"စက်ပစ္စည်းကို နောက်ခံ၌ ပွင့်နေစေသည်"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"တည်နေရာကို မကြာခဏတောင်းဆိုနေသည်"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"အက်ပ် <xliff:g id="NUMBER">%1$d</xliff:g> ခုသည် ပုံမှန်အလုပ်မလုပ်ပါ"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ဘက်ထရီ အားပြည့်နေပါသည်"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"အက်ပ်များသည် ပုံမှန်လုပ်ဆောင်နေပါသည်"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ဘက်ထရီစွမ်းရည်နည်း"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ဘက်ထရီက ကောင်းမွန်သော ဘက်ထရီသက်တမ်း ထုတ်မပေးနိုင်ပါ"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"ဖုန်း၏ ဘက်ထရီသက်တမ်းကို ပိုကောင်းလာအောင်လုပ်ခြင်း"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"တက်ဘလက်ကို ပုံမှန်ထက် ပိုသုံးထားသည်"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"စက်ပစ္စည်းကို ပုံမှန်ထက် ပိုသုံးထားသည်"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"မကြာမီ ဘက်ထရီကုန်သွားနိုင်ပါသည်"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"သင့်ဖုန်းကို ပုံမှန်ထက်ပို၍ အသုံးပြုထားပါသည်။ သင့်ဘက်ထရီသည် ခန့်မှန်းထားသည်ထက် ပိုမြန်၍ ကုန်နိုင်ပါသည်။\n\nနောက်ဆုံး အားအပြည့်သွင်းပြီးသည့်နောက် ထိပ်တန်းအက်ပ် <xliff:g id="NUMBER">%1$d</xliff:g> ခု(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)−"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"သင့်တက်ဘလက်ကို ပုံမှန်ထက်ပို၍ အသုံးပြုထားပါသည်။ သင့်ဘက်ထရီသည် ခန့်မှန်းထားသည်ထက် ပိုမြန်၍ ကုန်နိုင်ပါသည်။\n\nနောက်ဆုံး အားအပြည့်သွင်းပြီးသည့်နောက် ထိပ်တန်းအက်ပ် <xliff:g id="NUMBER">%1$d</xliff:g> ခု(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)−"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"သင့်စက်ပစ္စည်းကို ပုံမှန်ထက်ပို၍ အသုံးပြုထားပါသည်။ သင့်ဘက်ထရီသည် ခန့်မှန်းထားသည်ထက် ပိုမြန်၍ ကုန်နိုင်ပါသည်။\n\nနောက်ဆုံး အားအပြည့်သွင်းပြီးသည့်နောက် ထိပ်တန်းအက်ပ် <xliff:g id="NUMBER">%1$d</xliff:g> ခု(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)−"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">အက်ပ် %1$d ခုကို ကန့်သတ်ရန်</item>
       <item quantity="one">အက်ပ် %1$d ခုကို ကန့်သတ်ရန်</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ဤအက်ပ်သည် နောက်ခံတွင် ဘက်ထရီကို အသုံးပြုနိုင်ပါသည်။ သင်၏ ဘက်ထရီသည် ခန့်မှန်းထားသည်ထက် စောလျင်စွာ ကုန်နိုင်ပါသည်။"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"ဖယ်ရှားရန်"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"မလုပ်တော့"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ဘက်ထရီကို အားအပြည့်သွင်းထားလျှင် သင်၏အသုံးပြုမှုအပေါ် အခြေခံ၍ သာမန်အားဖြင့် <xliff:g id="TIME_DURATION">%1$s</xliff:g> ခန့် အသုံးပြုနိုင်ပါသည်။\n\nသင်၏ ဘက်ထရီသက်တမ်းကို ကြာရှည်ခံစေလိုပါက \'ဘက်ထရီအားထိန်း\' ကို ဖွင့်ပါ။"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"သင်၏ ဘက်ထရီသက်တမ်းကို ကြာရှည်ခံစေလိုပါက \'ဘက်ထရီအားထိန်း\' ကို ဖွင့်ပါ"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ဘက်ထရီ စီမံခန့်ခွဲမှုစနစ်"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"အက်ပ်များကို အလိုအလျောက် စီမံခြင်း"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"အသုံးပြုလေ့ မရှိသော အက်ပ်များအတွက် ဘက်ထရီ ကန့်သတ်ရန်"</string>
@@ -3064,7 +3083,7 @@
     <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"<xliff:g id="CATEGORIES">%1$s</xliff:g> မှလွဲ၍ အခြားအသံ ပိတ်ထားသည်"</string>
     <string name="zen_mode_behavior_alarms_only" msgid="6455884547877702466">"နှိုးစက်နှင့် မီဒီယာ မှလွဲ၍ အခြားအသံ ပိတ်ထားသည်"</string>
     <string name="zen_mode_automation_settings_title" msgid="2517800938791944915">"အလိုအလျောက် ဖွင့်ရန်"</string>
-    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"အလိုအလျောက် စည်းမျဉ်းများ"</string>
+    <string name="zen_mode_automation_settings_page_title" msgid="7069221762714457987">"အော်တိုစည်းမျဉ်းများ"</string>
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="9041488774587594301">"အလိုအလျောက် စည်းမျဉ်း"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="4321254843908888574">"အချို့အချိန်၌ ဖုန်းအသံတိတ်ခြင်း"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"\'မနှောင့်ယှက်ရ\' စည်းမျဉ်းများထည့်ရန်"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ပြသမှုများကို ခွင့်ပြုရန်"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"အကြောင်းကြားချက်များ ကန့်သတ်ခြင်း"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"\'မနှောင့်ယှက်ရ\' ကို ဖွင့်ထားသည့်အခါ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"အကြောင်းကြားချက်များ"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"\'မနှောင့်ယှက်ရ\' ကို ဖွင့်ထားသည့်အခါ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"အကြောင်းကြားချက်များ ဖျောက်ထားသည်"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"အကြောင်းကြားချက်များ ပြသော်လည်း အသံနှင့် တုန်ခါမှုများ ပိတ်ထားသည်"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"အကြောင်းကြားချက်အသစ်များ လာသည့်အခါ သင့်ဖုန်း အသံထွက်ခြင်း သို့မဟုတ် တုန်ခါခြင်း မလုပ်ပါ"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"အကြောင်းကြားချက်များ ဖျောက်ပြီး ပိတ်ထားရန်"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"အကြောင်းကြားချက်များ လုံးဝပေါ်လာမည် မဟုတ်ပါ"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"\'မနှောင့်ယှက်ရ\' ကိုဖွင့်ထားသည့်အခါ အသစ် သို့မဟုတ် ရှိနှင့်ပြီး အကြောင်းကြားချက်များကို မြင်ရမည်မဟုတ်ပါ။ သို့သော်လည်း အခြေခံဖုန်းလုပ်ဆောင်ချက်အတွက် အကြောင်းကြားချက်များ လိုအပ်ပြီး အခြေအနေပြဘား ဆက်ပေါ်လာဦးမည်။"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"အကြောင်းကြားချက်များကို တိတ်ဆိတ်စွာပြပါ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"အကြောင်းကြားချက်များကို ပိတ်ထားပါမည်"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"အကြောင်းကြားချက်များ လာသည့်အခါ သင့်ဖုန်း အသံထွက်ခြင်း သို့မဟုတ် တုန်ခါခြင်း လုပ်မည်မဟုတ်ပါ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"အကြောင်းကြားများကို ဖျောက်ထားရန်"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"အသစ် သို့မဟုတ် ရှိနှင့်ပြီး အကြောင်းကြားချက်များကို မြင်ရမည်မဟုတ်ပါ"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"သင့်ဖုန်းသည် အသစ် သို့မဟုတ် ရှိနှင့်ပြီး အကြောင်းကြားချက်များကို ပြသမည်မဟုတ်ပါ။ ထို့ပြင် အသံ သို့မဟုတ် တုန်ခါမှုလည်း ပြုလုပ်မည်မဟုတ်ပါ။ မျက်နှာပြင်၏ ထိပ်မှ ပွတ်ဆွဲချသည့်အခါ အကြောင်းကြားချက်များ ပေါ်လာမည်မဟုတ်ပါ။\n\nဖုန်းလုပ်ဆောင်ချက်နှင့် အခြေအနေအတွက် အရေးကြီး အကြောင်းကြားချက်များ ဆက်လက်၍ပေါ်နေမည်ကို သတိပြုပါ။"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"စိတ်ကြိုက်"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"စိတ်ကြိုက် ဆက်တင်ကို ဖွင့်ရန်"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"စိတ်ကြိုက်ဆက်တင်ကို ဖယ်ရှားရန်"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other">စည်းမျဉ်း <xliff:g id="ON_COUNT">%d</xliff:g> ခုကို အလိုလိုဖွင့်နိုင်သည်</item>
       <item quantity="one">စည်းမျဉ်း ၁ ခုကို အလိုလိုဖွင့်နိုင်သည်</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"လုပ်ဆောင်ပုံ"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ခြွင်းချက်များ"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"အချိန်ဇယား"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"အသံနှင့် တုန်ခါမှု"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ သင်အထက်တွင် ခွင့်ပြုထားသည်များအတွက်မှလွဲ၍ အသံနှင့် တုန်ခါမှုကို ပိတ်ထားပါမည်။"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"အောက်ပါမှလွဲ၍ အားလုံး ပိတ်ထားပါ"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ပိတ်ထားသည်"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ပိတ်မထားပါ"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ပိတ်ထားသော်လည်း <xliff:g id="SOUND_TYPE">%1$s</xliff:g> ကို ခွင့်ပြုသည်"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ပိတ်ထားသော်လည်း <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> နှင့် <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ကို ခွင့်ပြုသည်"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ပိတ်ထားသော်လည်း <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>၊ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> နှင့် <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> ကို ခွင့်ပြုသည်"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"မက်ဆေ့ဂျ်၊ အစီအစဉ်နှင့် သတိပေးချက်များ"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ မက်ဆေ့ဂျ်၊ သတိပေးချက်နှင့် အစီအစဉ်များကို ပိတ်ထားပါမည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်ကိုဆက်သွယ်နိုင်စေရန် မက်ဆေ့ဂျ်ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"အပ်ဒိတ်လုပ်ရန်"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"အပ်ဒိတ်မလုပ်ပါနှင့်"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"သင်အာရုံစူးစိုက်နိုင်ရန် သင့်ဖုန်းက ကူညီနိုင်ပါသည်။\n\nဆက်တင်များကို အောက်ပါအတိုင်း အပ်ဒိတ်လုပ်ပါ-\n\n- အကြောင်းကြားချက်များကို လုံးဝ ဖျောက်ထားပါ\n\n- ကြယ်ပြထားသော အဆက်အသွယ်များနှင့် အကြိမ်ကြိမ် ခေါ်ဆိုသူများထံမှ ဖုန်းခေါ်ဆိုမှုများကိုသာ ခွင့်ပြုပါ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\'မနှောင့်ယှက်ရ\' ကို အပ်ဒိတ်လုပ်လိုသလား။"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ဆက်တင်များ"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"၎င်းကို \'ဆက်တင်များ\' ထဲတွင် နောက်ထပ် စိတ်ကြိုက်ပြင်ဆင်နိုင်ပါသည်။"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"မျက်နှာပြင်ကို ဖွင့်ထားသည့်အခါ ပယ်ရန်"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"မျက်နှာပြင်ကို ပိတ်ထားသည့်အခါ ပယ်ရန်"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\'မနှောက်ယှက်ရ\' သည် မလိုလားအပ်သည့် အသံများကို ပိတ်ခြင်းအပြင် − ရုပ်ပုံများကိုလည်း ပိတ်ပေးနိုင်ပါသည်။ သင်အိပ်စက်ရန်၊ အာရုံစိုက်ရန် သို့မဟုတ် ဖုန်းအသုံးပြုမှုအချိန်ကို ကန့်သတ်ရန် ကြိုးပမ်းနေသည့်အခါ ၎င်းသည် အထောက်အကူဖြစ်စေနိုင်ပါသည်။"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"အသံနှင့် ရုပ်ပုံများကို ပိတ်ရန်"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"မျက်နှာပြင်ကို မဖွင့်ပါနှင့် သို့မဟုတ် အကြောင်းကြားချက်များအတွက် မနှိုးပါနှင့်"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"အခြေခံဖုန်း လုပ်ဆောင်ချက်နှင့် အခြေအနေမှလွဲ၍ မည်သည့် အကြောင်းကြားချက်ကိုမျှ မပြပါနှင့်"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"အလုပ်ပရိုဖိုင်ဆိုင်ရာ အသံများ"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> မှ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ခေါ်ဆိုမှုများ"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ အဝင်ခေါ်ဆိုမှုများကို ပိတ်ထားပါသည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်ကိုဆက်သွယ်နိုင်စေရန် ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"မက်ဆေ့ဂျ်များ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"မက်ဆေ့ချ်များ အားလုံး"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ရွေးချယ်ထားသော စာများ"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"မက်ဆေ့ဂျ်များ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"မက်ဆေ့ဂျ်အချို့"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"မည်သူ့ထံမှ မဆို"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"အဆက်အသွယ်များ ထံမှသာ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ကြယ်ပွင့်ပြ အဆက်အသွယ်များထံမှသာ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ကြယ်ပွင့်ပြထားသော အဆက်အသွယ်များနှင့် အကြိမ်ကြိမ် ခေါ်ဆိုသူများမှ"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"အဆက်အသွယ်များနှင့် အကြိမ်ကြိမ် ခေါ်ဆိုသူများမှ"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"အကြိမ်ကြိမ် ခေါ်ဆိုသူများမှသာ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"မရှိ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"နှိုးစက်များ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"မီဒီယာ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"စခရင်ထိသံ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"သတိပေးချက်များ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"အစီအစဉ်များ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"ခေါ်ဆိုသူ အားလုံး"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ရွေးချယ်ထားသည့် ခေါ်ဆိုသူများ"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"မည်သူမဆို"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"အဆက်အသွယ်များ"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ကြယ်ပွင့်ပြထားသော အဆက်အသွယ်များ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"အကြိမ်ကြိမ်ခေါ်ဆိုသူများ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> မှ သာ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> နှင့် <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> မှ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> မိနစ်အတွင်း တစ်ဦးတည်းက ဖုန်းထပ်ခေါ်လျှင်"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"စိတ်ကြိုက်"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"အလိုအလျောက် ဖွင့်ရန်"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ဤအက်ပ်မှ ဖန်တီးခဲ့သည့် Do Not Disturb စည်းမျဉ်းများ အားလုံးကို ဖယ်ရှားပစ်ပါမည်။"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"သင့်မြတ်အောင် မလုပ်ပါနှင့်"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"သင့်မြတ်အောင် လုပ်ကိုင်ရန်"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"သင့်ဘတ်ထရီအား ပိုမိုလျှင်မြန်စွာ ကုန်စေပါသည်။"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ပိုမိုကောင်းမွန်သည့် ဘတ်ထရီသက်တမ်းအတွက် အကြံပြုထား၏။"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ဘက်ထရီ ပိုမိုကောင်းမွန်ရေးကို လျစ်လျူရှုရန် <xliff:g id="APP">%s</xliff:g>ကိုခွင့်ပြုမလား?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"မရှိ"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"အရံကူးယူခြင်း ပိတ်ထားသည်"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> သို့ အပ်ဒိတ်လုပ်ထားသည်"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"အပ်ဒိတ် ရနိုင်သည်"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ဤဆက်တင်ကို ပြောင်း၍မရပါ"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"လုပ်ဆောင်ချက်ကို ခွင့်မပြုပါ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"အသံအတိုးအကျယ်ကို ပြောင်း၍မရပါ"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ဖုန်းခေါ်ဆိုခွင့် မရှိပါ"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ပို့ခွင့်မပြုပါ"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"လော့ခ်ချမျက်နှာပြင်ရှိ အချက်အလက်များကို ထိန်းချုပ်ရန်"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"အကြောင်းကြားချက်ပါ အကြောင်းအရာများကို ပြပါ သို့မဟုတ် ဝှက်ပါ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"အားလုံး"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"အကူအညီနှင့် နည်းလမ်းများ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"အကြံပြုချက်များနှင့် ပံ့ပိုးမှု"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"အသေးဆုံး အကျယ်"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ထည့်သွင်းထားသည့် မည်သည့်အက်ပ်တစ်ခုမျှ ပရီမီယံ SMS အသုံးပြုခွင့်တောင်းဆိုမှု မရှိပါ။"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ပရီမီယံ SMS သည်ငွေကြေးကုန်ကျနိုင်ပြီး သင့်ဖုန်းဝန်​ဆောင်မှုပေးသူ၏ ငွေတောင်းခံလွှာသို့ ပေါင်း၍ ထည့်သွင်းပါမည်။ အက်ပ်တစ်ခုကို သင်ခွင့်ပြုလိုက်လျှင် ၎င်းအက်ပ်ကိုအသုံးပြုပြီး ပရီမီယံ SMS ပို့နိုင်မည်ဖြစ်သည်။"</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"ရုပ်ရှင်နှင့် TV အက်ပ်များ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ဝန်ဆောင်မှုပေးသူက ပေးထားသည့် အချက်အလက်များ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"စိတ်လှုပ်ရှားဖွယ်ရာ အသစ်အဆန်း ရှိပါသလား။"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"သင်၏ဖုန်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"သင်၏တက်ဘလက်အသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d63edc0d..e117529 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Forespørsel om tilgang til SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil ha tilgang til SIM-kortet ditt. Hvis du gir tilgang til SIM-kortet, slås datatilkoblingen på enheten av så lenge tillatelsen varer. Gi tilgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Synlig som «<xliff:g id="DEVICE_NAME">^1</xliff:g>» for andre enheter"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Enhetene dine"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koble til en ny enhet"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tillat at nettbrettet ditt kommuniserer med Bluetooth-enheter i nærheten"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Kan ikke tilbakestille e-SIM-kort"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"E-SIM-kortene kan ikke tilbakestilles på grunn av en feil."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Slett alle data (tilbakestilling til fabrikkstandard)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Dette sletter alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Dette sletter alle data fra telefonens "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Veldig lang forsinkelse (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Veldig lang forsinkelse (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Ringing og varsler er satt til av"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Ringing og varsler er satt til lav"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Ringing og varsler er satt til middels"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjermbruk siden batteriet var fulladet"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Strømforbruk fra skjermen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Appbruk siden sist batteriet var fulladet (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Bruk av enheten siden sist batteriet var fulladet (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Vekker enheten i bakgrunnen"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Forespør posisjon ofte"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apper fungerer ikke som de skal"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Alt er bra med batteriet"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apper kjører som normalt"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Lav batterikapasitet"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batteriet kan ikke gi god batterilevetid"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Forbedre telefonens batterilevetid"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Nettbrettet brukes mer enn vanlig"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Enheten brukes mer enn vanlig"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Batteriet går kanskje snart tomt"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefonen din er blitt brukt mer enn vanlig. Batteriet kan gå tomt raskere enn forventet.\n\nTopp <xliff:g id="NUMBER">%1$d</xliff:g> apper siden sist batteriet var fulladet(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Nettbrettet ditt er blitt brukt mer enn vanlig. Batteriet kan gå tomt raskere enn forventet.\n\nTopp <xliff:g id="NUMBER">%1$d</xliff:g> apper siden sist batteriet var fulladet(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Enheten din er blitt brukt mer enn vanlig. Batteriet kan gå tomt raskere enn forventet.\n\nTopp <xliff:g id="NUMBER">%1$d</xliff:g> apper siden sist batteriet var fulladet(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Begrens %1$d apper</item>
       <item quantity="one">Begrens %1$d app</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Denne appen kan bruke batteri i bakgrunnen. Batteriet kan gå tomt raskere enn forventet."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Fjern"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Avbryt"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Basert på bruken din varer batteriet vanligvis omtrent <xliff:g id="TIME_DURATION">%1$s</xliff:g> når det er fulladet.\n\nSlå på Batterisparing hvis du må forlenge batterilevetiden."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Slå på Batterisparing for å forlenge batterilevetiden"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Batteristyring"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Administrer apper automatisk"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Begrens batteribruken for apper du sjelden bruker"</string>
@@ -3075,15 +3094,14 @@
     <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">"Blokkér visuelle forstyrrelser"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillat visuelle signaler"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Begrens varsler"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Når «Ikke forstyrr» er på"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Varsler"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Når Ikke forstyrr er på"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Ignorer varsler"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Vis varsler, men kutt lyder og vibrering"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Når du mottar nye varsler på telefonen, kommer den ikke til å lage lyd eller vibrere"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Skjul og ignorer varsler"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Varsler vises ikke i det hele tatt"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Du kommer ikke til å se nye eller eksisterende varsler når Ikke forstyrr er slått på. Varsler som er nødvendige for grunnleggende telefonaktivitet og status, vises imidlertid fremdeles."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Vis varsler uten lyd"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Varsler blir ignorert"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Når du mottar varsler, kommer ikke telefonen til å lage lyd eller vibrere."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skjul varsler"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Du ser ikke nye eller eksisterende varsler"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonen din viser ikke nye eller eksisterende varsler og kommer ikke til å lage lyd eller vibrere. Varsler vises ikke når du sveiper nedover fra toppen av skjermen.\n\nHusk at kritiske varsler for telefonaktivitet og -status fremdeles vises."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tilpasset"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Slå på tilpasset innstilling"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fjern tilpasset innstilling"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regler kan slås på automatisk</item>
       <item quantity="one">1 regel kan slås på automatisk</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Atferd"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Unntak"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Planlegg"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Lyd og vibrering"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Når «Ikke forstyrr» er på, slås lyd og vibrering av, med unntak av for elementene du tillater ovenfor."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Ignorer alle unntatt"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Ignorert"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ikke ignorert"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Ignorert, men tillat <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Ignorert, men tillat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> og <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ignorert, men tillat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Meldinger, aktiviteter og påminnelser"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillinger for å la venner, familie eller andre kontakter nå deg."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Oppdater"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ikke oppdater"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefonen din kan gjøre mer for å gjøre det enklere å fokusere.\n\nOppdater innstillinger for\n\n– å skjule varsler helt\n\n– å tillate anrop fra stjernemerkede kontakter og gjentatte oppringere"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Vil du oppdatere «Ikke forstyrr»?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Innstillinger"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Du kan tilpasse dette videre i innstillingene."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokkér når skjermen er slått på"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokkér når skjermen er slått av"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"«Ikke forstyrr» kan gjøre mer enn å blokkere uønskede lyder – funksjonen kan også blokkere visuelle elementer. Dette kan være nyttig hvis du prøver å sove, fokusere på noe eller begrense hvor mye tid du bruker på telefonen."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokkér lyder og visuelle elementer"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ikke slå på skjermen eller vekk for varsler"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ikke vis varsler i det hele tatt, med unntak av grunnleggende telefonaktivitet og status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Lyder i jobbprofilen"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> til <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Anrop"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Når «Ikke forstyrr» er på, blir innkommende anrop blokkert. Du kan justere innstillinger for å la venner, familie eller andre kontakter nå deg."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meldinger"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Alle meldinger"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Valgte meldinger"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Meldinger"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Noen meldinger"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Fra alle"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Bare fra kontakter"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Bare fra stjernemerkede kontakter"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Fra stjernemerkede kontakter og gjentatte oppringere"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Fra kontakter og gjentatte oppringere"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Bare fra gjentatte oppringere"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Medier"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Berøringslyder"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Hendelser"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle oppringere"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Utvalgte oppringere"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"alle"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakter"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"stjernemerkede kontakter"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gjentatte anrop"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Bare fra <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Fra <xliff:g id="CALLER_TYPE">%1$s</xliff:g> og <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Hvis samme person ringer enda en gang innen <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Tilpasset"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Slå på automatisk"</string>
@@ -3359,7 +3401,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Av"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Én-appsmodus"</string>
-    <string name="screen_pinning_description" msgid="1110847562111827766">"Når denne innstillingen er slått på, kan du bruke én-appsmodus for å holde den nåværende skjermen åpen til du løsner den.\n\nSlik bruker du én-appsmodus:\n\n1. Sørg for at én-appsmodus er slått på\n\n2.Åpne Oversikt\n\n3. Trykk på appikonet øverst på skjermen, og trykk deretter på Fest"</string>
+    <string name="screen_pinning_description" msgid="1110847562111827766">"Når denne innstillingen er slått på, kan du bruke én-appsmodus for å holde den nåværende skjermen åpen til du løsner den.\n\nSlik bruker du én-appsmodus:\n\n1. Sørg for at én-appsmodus er slått på\n\n2. Åpne Oversikt\n\n3. Trykk på appikonet øverst på skjermen, og trykk deretter på Fest"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Krev opplåsingsmønster for å løsne apper"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-kode for å løsne apper"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Krev passord for å løsne apper"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle Ikke forstyrr-regler opprettet av denne appen blir fjernet."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ikke optimaliser"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimaliser"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Dette kan tappe batteriet ditt raskere."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Anbefales for bedre batterilevetid"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Vil du tillate at <xliff:g id="APP">%s</xliff:g> ignorerer batterioptimaliseringer?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ingen"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Sikkerhetskopiering er slått av"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Oppdatert til Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"En oppdatering er tilgjengelig"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Kan ikke endre innstillingen"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Handlingen er ikke tillatt"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Kan ikke endre volumet"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Ringing er ikke tillatt"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS er ikke tillatt"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrollér informasjon på låseskjermen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul varselinnhold"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Brukerstøtte og tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tips og brukerstøtte"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minste bredde"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerte apper har bedt om tilgang til premium-SMS."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium-SMS kan koste penger og legges til telefonregningen din. Hvis du slår på tillatelse for en app, kan du sende premium-SMS via den appen."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- og TV-apper"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informasjon om operatørhåndtering"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Utløs operatørhåndtering"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hva er nytt og spennende?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en innføring i den nye telefonen din"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en innføring i det nye nettbrettet ditt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index aa28e3a..87fe838 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM पहुँच अनुरोध"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ले तपाईँको SIM कार्ड पहुँच गर्न चाहन्छ। यन्त्रमा SIM कार्ड पहुँच प्रदान गर्दा जडान अवधिको समयमा तपाईँको डेटा जडान निष्क्रिय हुनेछ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> लाई पहुँच प्रदान गर्नुहोस्"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"अन्य यन्त्रहरूमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देखिन्छ"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तपाईंका यन्त्रहरू"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"आफ्नो ट्याब्लेटलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM हरू रिसेट गर्न सकिएन"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"कुनै त्रुटिले गर्दा eSIM हरू रिसेट गर्न सकिएन।"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"यस कार्यले तपाईँको सम्पूर्ण डेटा मेटाउँछ ट्याब्लेटको "<b>" आन्तरिक भण्डारणबाट "</b>" : जसमा, \n \n "<li>" तपाईँको Google खाता "</li>" \n "<li>" प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>" \n "<li>" डाउनलोड गरिएका अनुप्रयोगहरू "</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"यसले निम्नलगायतका सबै डेटा तपाईंको "<b>"आन्तरिक भण्डारणबाट मेटाउँदछ"</b>":\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र अनुप्रयोग डेटा र सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका अनुप्रयोगहरू"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n" \nतपाईं अहिले निम्न खाताहरूमा साइन इन हुनुहुन्छ:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">धेरै लामो ढिलाइ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> मिलिसेकेण्ड)</item>
       <item quantity="one">धेरै लामो ढिलाइ (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> मिलिसेकेण्ड)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"घन्टी तथा सूचनालाई निष्क्रियका रूपमा सेट गरियो"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"घन्टी तथा सूचनालाई न्यूनका रूपमा सेट गरियो"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"घन्टी तथा सूचनालाई मध्यमका रूपमा सेट गरियो"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज भएदेखि स्क्रिनको प्रयोग"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रिनले गरेको पावरको खपत"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"पूर्ण चार्ज भएदेखि अनुप्रयोगको प्रयोग (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"पृष्ठभूमिमा यन्त्रलाई सक्रिय गर्दै"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बारम्बार स्थानसम्बन्धी जानकारी प्राप्त गर्ने अनुरोध गर्दैछ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अनुप्रयोगहरूले असामान्य व्यवहार देखाउँदैछन्"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ब्याट्री राम्रो स्थितिमा छ"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"अनुप्रयोगहरू सामान्य रूपमा चलिरहेका छन्"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ब्याट्रीको कम चार्ज क्षमता"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ब्याट्रीको चार्ज स्तर बढी समयसम्म कायम रहन सक्दैन"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"आफ्नो फोनको ब्याट्रीको आयुमा सुधार गर्नुहोस्"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ट्याब्लेट सामान्यभन्दा बढी प्रयोग भयो"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"यन्त्रलाई सामान्यभन्दा बढी प्रयोग भयो"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ब्याट्री चाँडै सकिन सक्छ"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"तपाईंको फोन सामान्यभन्दा बढी प्रयोग भएको छ। तपाईंको ब्याट्री अपेक्षा गरेभन्दा चाँडै सकिन सक्छ। \n\nपछिल्लो पटक पूर्ण चार्ज (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) गरेपछि शीर्ष <xliff:g id="NUMBER">%1$d</xliff:g> अनुप्रयोगहरू:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"तपाईंको ट्याब्लेट सामान्यभन्दा बढी प्रयोग भएको छ। तपाईंको ब्याट्री अपेक्षा गरेभन्दा चाँडै सकिन सक्छ। \n\nपछिल्लो पटक पूर्ण चार्ज (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) गरेपछि शीर्ष <xliff:g id="NUMBER">%1$d</xliff:g> अनुप्रयोगहरू:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"तपाईंको यन्त्र सामान्यभन्दा बढी प्रयोग भएको छ। तपाईंको ब्याट्री अपेक्षा गरेभन्दा चाँडै सकिन सक्छ। \n\nपछिल्लो पटक पूर्ण चार्ज (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) गरेपछि शीर्ष <xliff:g id="NUMBER">%1$d</xliff:g> अनुप्रयोगहरू:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d अनुप्रयोगहरूमाथि बन्देज लगाउनुहोस्</item>
       <item quantity="one">%1$d माथि बन्देज लगाउनुहोस्</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"यो अनुप्रयोग पृष्ठभूमिमा ब्याट्रीको प्रयोग गर्न सक्षम हुने छ। तपाईंको ब्याट्री अपेक्षा गरेभन्दा चाँडै सकिन सक्छ।"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"हटाउनुहोस्"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"रद्द गर्नुहोस्"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"तपाईंले गर्ने प्रयोगको आधारमा, तपाईंको ब्याट्री पूर्ण चार्ज भएको अवस्थामा लगभग <xliff:g id="TIME_DURATION">%1$s</xliff:g> सम्म टिक्छ।\n\nतपाईंलाई आफ्नो ब्याट्रीको आयु लम्ब्याउनु परेको खण्डमा ब्याट्री सेभरलाई सक्रिय गर्नुहोस्‌।"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"तपाईंलाई आफ्नो ब्याट्रीको आयु लम्ब्याउनु परेको खण्डमा ब्याट्री सेभरलाई सक्रिय गर्नुहोस्‌"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ब्याट्री प्रबन्धक"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"अनुप्रयोगहरूलाई स्वतः व्यवस्थित गर्नुहोस्"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"तपाईंले प्रायः प्रयोग नगर्ने अनुप्रयोगहरूमा ब्याट्री सीमित गर्नुहोस्"</string>
@@ -3075,38 +3094,21 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"सङ्केतहरूलाई देखिन दिनुहोस्"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"सूचनाहरू"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"सूचनाहरूलाई मौन रूपमा देखाउनुहोस्"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"सूचनाहरू म्युट गरिने छन्"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"सूचनाहरू आउँदा तपाईंको फोनले आवाज निकाल्ने वा कम्पन गर्ने छैन।"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"सूचनाहरू लुकाउनुहोस्"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"तपाईं नयाँ वा विद्यमान सूचनाहरू देख्नु हुने छैन"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"तपाईंको फोनले नयाँ वा विद्यमान सूचनाहरू देखाउने, आवाज निकाल्ने वा कम्पन गर्ने छैन। तपाईंले आफ्नो स्क्रिनको माथिल्लो भागबाट तल स्वाइप गर्दा सूचनाहरू देखिने छैनन्।\n\nयाद राख्नुहोस्, फोनको गतिविधि तथा स्थितिसम्बन्धी महत्त्वपूर्ण सूचनाहरू अझै पनि देखिने छन्।"</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"आफू अनुकूल"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"आफू अनुकूल सेटिङ सक्षम पार्नुहोस्‌"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"आफू अनुकूल सेटिङ हटाउनुहोस्‌"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"देखा पर्ने छ"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"आंशिक रूपमा लुकेको"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"लुकेको"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"आफू अनुकूल बन्देजहरू"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"स्क्रिन सक्रिय रहेको अवस्थामा"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"स्क्रिन निष्क्रिय रहेको अवस्थामा"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"ध्वनि र कम्पनलाई म्यूट गर्नुहोस्"</string>
@@ -3151,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> नियमहरू स्वतः सक्रिय हुन सक्छन्‌</item>
       <item quantity="one">१ नियम स्वतः सक्रिय हुन सक्छ</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ठिक छ"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"व्यवहार"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"अपवादहरू"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"समयतालिका"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"आवाज तथा कम्पन"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक आवाज तथा कम्पनलाई म्युट गरिने छ।"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"यीबाहेक सबै म्युट गर्नुहोस्"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"म्युट गरिएको छ"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"म्युट गरिएको छैन"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"म्युट गरिएको छ, तर <xliff:g id="SOUND_TYPE">%1$s</xliff:g> लाई अनुमति दिनुहोस्"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"म्युट गरिएको छ, तर <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> र <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> लाई अनुमति दिनुहोस्"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"म्युट गरिएको छ, तर <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> र <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> लाई अनुमति दिनुहोस्"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"सन्देश, कार्यक्रम तथा रिमाइन्डरहरू"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक सन्देश, रिमाइन्डर तथा कार्यक्रमहरूलाई म्युट गरिने छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सन्देशसम्बन्धी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"अद्यावधिक गर्नुहोस्"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"अद्यावधिक नगर्नुहोस्"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"तपाईंलाई केन्द्रित गर्न मद्दत गर्न तपाईंको फोनले धेरै गर्न सक्छ।\n\nनिम्न कार्य सेटिङहरू अद्यावधिक गर्नुहोस्:\n\n- पूर्ण रूपमा सूचनाहरू लुकाउनुहोस्‌\n\n- ताराङ्कित सम्पर्क र दोहोरिएका कलहरूबाट कलहरू गर्न अनुमति दिनुहोस्‌"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"बाधा नपुर्याउनुहोस्‌लाई अद्यावधिक गर्ने हो?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"सेटिङहरू"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"तपाईं सेटिङहरूमा गएर यसलाई अझै आफू अनुकूल पार्न सक्नुहुन्छ।"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"स्क्रिन सक्रिय भएको बेला रोक लगाउनुहोस्"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"स्क्रिन निष्क्रिय भएको बेला रोक लगाउनुहोस्"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"बाधा नपुर्याउनुहोस् नामक मोडले अनावश्यक घ्वनिहरूमाथि रोक लगाउने मात्र नभई थुप्रै कुरा गर्न सक्छ - यसले भिजुअलहरूमाथि रोक लगाउन सक्छ। तपाईं सुत्न, केन्द्रित हुन वा फोनमा खर्च गरिने समय सीमित गर्न खोज्दै हुनुहुन्छ भने यो सहयोगी हुन सक्छ।"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ध्वनि र भिजुअलहरूमाथि रोक लगाउनुहोस्"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"स्क्रिन सक्रिय नगर्नुहोस् वा सूचनाहरूका लागि सक्रिय नगर्नुहोस्‌"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"फोनको आधारभूत गतिविधि र त्यसको स्थितिसम्बन्धी सूचनाबाहेक अरू कुनै पनि सूचना नदेखाउनुहोस्"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"कार्य प्रोफाइलका ध्वनिहरू"</string>
@@ -3328,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>बाट <xliff:g id="END">%2$s</xliff:g>सम्म"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कलहरू"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला आगमन कलहरूमाथि रोक लगाइन्छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"सन्देशहरू"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"सबै सन्देशहरू"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"चयन गरिएका सन्देशहरू"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"सन्देशहरू"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"केही सन्देशहरू"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"कसैबाट"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"मात्र सम्पर्कहरूबाट"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ताराङ्कित सम्पर्कहरूबाट मात्र"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ताराङ्कित सम्पर्क ठेगाना तथा बारम्बार कल गर्ने व्यक्तिका कलहरू"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"सम्पर्क ठेगानामा भएका तथा बारम्बार कल गर्ने व्यक्तिका कलहरू"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"बारम्बार कल गर्ने व्यक्तिका कलहरू मात्र"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कुनै पनि होइन"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्महरू"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"मिडिया"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"छुवाइसम्बन्धी ध्वनि"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमान्डरहरू"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"कार्यक्रमहरू"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"सबै कल गर्ने व्यक्तिहरू"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"कलरहरू चयन गर्नुहोस्"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"जोसुकै"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"सम्पर्क ठेगानाहरू"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ताराङ्कित सम्पर्कहरू"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कलरहरू दोरोर्‍याउनुहोस्"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> का कलहरू मात्र"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> र <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> का कलहरू"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"एउटै व्यक्तिले <xliff:g id="MINUTES">%d</xliff:g> मिनेटको अवधिमा दोस्रो पटक कल गरेको खण्डमा"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"आफू अनुकूल"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूपमा चालू"</string>
@@ -3612,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"यस अनुप्रयोगले बनाएका सबै बाधा नपुर्याउनुहोस् नियम हटाइनेछ।"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"आफू अनुकूल नगर्नुहोस्"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"अनुकुलन गर्नुहोस्"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"यसले तपाईँको ब्याट्री चाँडै खपत गर्न सक्छ।"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"अझ टिकाउयुक्त ब्याट्रीका लागि सिफारिस गरिएको"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> लाई ब्याट्री आफू अनुकूल बेवास्ता गर्नै अनुमति दिने हो?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"कुनै पनि होइन"</string>
@@ -3688,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ब्याकअप असक्षम गरियो"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> मा अद्यावधिक गरियो"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"अद्यावधिक उपलब्ध छ"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"यो सेटिङ परिवर्तन गर्न सकिँदैन"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"कार्यलाई अनुमति छैन"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"भोल्युम परिवर्तन गर्न सकिँदैन"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"कल गर्न अनुमति छैन"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS लाई अनुमति छैन"</string>
@@ -3878,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"लक स्क्रिनमा जानकारी नियन्त्रण गर्नुहोस्"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सम्बन्धी सामग्री देखाउनुहोस् वा लुकाउनुहोस्"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"सबै"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"सहायता र सुझावहरू"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"सुझाव तथा सहायता"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"सबैभन्दा सानो चौडाइ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"स्थापना गरिएका कुनै पनि अनुप्रयोगहरूले प्रिमियम SMS माथि पहुँचका लागि अनुरोध गरेका छैनन्"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रिमियम SMS सक्रिय गर्नाले तपाईंलाई पैसा लाग्न सक्छ र उक्त रकम तपाईंको वाहकलाई तिर्नु पर्ने बिलमा जोडिनेछ। यदि तपाईं अनुप्रयोगको लागि अनुमति सक्रिय गर्नुहुन्छ भने तपाईं त्यस अनुप्रयोगको प्रयोग गरेर प्रिमियम SMS पठाउन सक्नुहुनेछ।"</string>
@@ -4071,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"चलचित्र तथा TV अनुप्रयोगहरू"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"सेवा प्रदायकको प्रावधान सम्बन्धी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"सेवा प्रदायकको प्रावधानलाई ट्रिगर गर्नुहोस्"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"सेटिङहरूको गृहपृष्ठमा नयाँ र रोमाञ्चक के छ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"आफ्नो नयाँ फोनको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"आफ्नो नयाँ ट्याब्लेटको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 198328f..c25bfe1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Toegangsverzoek voor simkaart"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang tot je simkaart. Als je toegang tot de simkaart verleent, wordt de gegevensverbinding op je apparaat uitgeschakeld voor de duur van de verbinding. Toegang verlenen aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Zichtbaar als <xliff:g id="DEVICE_NAME">^1</xliff:g> voor andere apparaten"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Je apparaten"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Nieuw apparaat koppelen"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Je tablet toestaan om te communiceren met Bluetooth-apparaten in de nabije omgeving"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Kan e-simkaarten niet resetten"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"De e-simkaarten kunnen niet worden gereset vanwege een fout."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je bent momenteel aangemeld bij de volgende accounts:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Zeer lange vertraging (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Zeer lange vertraging (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Bellen en meldingen ingesteld op Uit"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Bellen en meldingen ingesteld op Laag"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Bellen en meldingen ingesteld op Normaal"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Schermgebruik sinds volledige lading"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Schermverbruik"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scannen naar mobiele netwerken"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"App-gebruik sinds volledige lading (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Apparaatgebruik sinds volledige lading (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Schakelt apparaat in op de achtergrond"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Vraagt regelmatig om locatie"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps veroorzaken problemen"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Het batterijniveau is goed"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Apps worden normaal uitgevoerd"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Lage batterijcapaciteit"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batterij kan geen goede gebruiksduur leveren"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"De batterijduur van de telefoon verbeteren"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet heeft meer verbruikt dan normaal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Apparaat heeft meer verbruikt dan normaal"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Batterij is bijna leeg"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Je telefoon is vaker gebruikt dan normaal. Je batterij is mogelijk eerder leeg dan verwacht.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> apps met het hoogste batterijverbruik sinds de laatste keer dat de telefoon volledig is opgeladen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Je tablet is vaker gebruikt dan normaal. Je batterij is mogelijk eerder leeg dan verwacht.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> apps met het hoogste batterijverbruik sinds de laatste keer dat de tablet volledig is opgeladen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Je apparaat is vaker gebruikt dan normaal. Je batterij is mogelijk eerder leeg dan verwacht.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> apps met het hoogste batterijverbruik sinds de laatste keer dat het apparaat volledig is opgeladen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d apps beperken</item>
       <item quantity="one">%1$d app beperken</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Deze app kan de batterij op de achtergrond gebruiken. Je batterij is mogelijk eerder leeg dan verwacht."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Verwijderen"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Annuleren"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Je batterij gaat meestal ongeveer <xliff:g id="TIME_DURATION">%1$s</xliff:g> mee wanneer deze volledig is opgeladen (op basis van je gebruik).\n\nAls je de batterijduur wilt verlengen, schakel je Batterijbesparing in."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Als je de batterijduur wilt verlengen, schakel je Batterijbesparing in"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Batterijbeheer"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Apps automatisch beheren"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Batterijgebruik beperken voor apps die je niet vaak gebruikt"</string>
@@ -3075,15 +3094,14 @@
     <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">"Blokkeer visuele onderbreking"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Visuele signalen toestaan"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Meldingen beperken"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wanneer \'Niet storen\' is ingeschakeld"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Meldingen"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Wanneer \'Niet storen\' is ingeschakeld"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Meldingen negeren"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Toon meldingen maar demp geluiden en trillingen"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Wanneer er nieuwe meldingen binnenkomen, laat je telefoon geen geluid horen en trilt niet"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Meldingen verbergen en negeren"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Meldingen worden helemaal niet weergegeven"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Als \'Niet storen\' is ingeschakeld, zie je geen nieuwe of bestaande meldingen. Meldingen die nodig zijn voor basistelefoonactiviteit en -status worden nog wel steeds weergegeven."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Meldingen zonder geluid weergeven"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Meldingen worden gedempt"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Wanneer er meldingen binnenkomen, laat je telefoon geen geluid horen en trilt deze niet"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Meldingen verbergen"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Je ziet geen nieuwe of bestaande meldingen"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Je telefoon geeft geen nieuwe of bestaande meldingen weer, laat geen geluid horen en trilt niet. Er worden geen meldingen weergegeven wanneer je vanaf de bovenkant van het scherm omlaag veegt.\n\nHoud er rekening mee dat belangrijke meldingen voor telefoonactiviteit en -status nog wel steeds worden weergegeven."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Aangepast"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aangepaste instelling inschakelen"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Aangepaste instelling verwijderen"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regels kunnen automatisch worden ingeschakeld</item>
       <item quantity="one">1 regel kan automatisch worden ingeschakeld</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Gedrag"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Uitzonderingen"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Schema"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Geluid en trillen"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Wanneer \'Niet storen\' is ingeschakeld, worden geluiden en trillingen gedempt, behalve voor de items die je hierboven toestaat."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Alles dempen behalve"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Gedempt"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Niet gedempt"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Gedempt, maar <xliff:g id="SOUND_TYPE">%1$s</xliff:g> wel toestaan"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Gedempt, maar <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> en <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> wel toestaan"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Gedempt, maar <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> , <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> en <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> wel toestaan"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Meldingen, afspraken en herinneringen"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en gebeurtenissen gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Updaten"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Niet updaten"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Je telefoon kan je helpen bij je focus.\n\nUpdate je instellingen om:\n\n- meldingen volledig te verbergen;\n\n- oproepen van contacten met ster en terugkerende bellers toe te staan."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\'Niet storen\' updaten?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Instellingen"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Je kunt dit aanpassen via Instellingen."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokkeren wanneer het scherm is ingeschakeld"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokkeren als het scherm is uitgeschakeld"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\'Niet storen\' kan niet alleen ongewenste geluiden blokkeren maar ook beelden. Dit kan handig zijn als je wilt slapen, als je je moet concentreren of als je minder tijd op je telefoon wilt doorbrengen."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Geluiden en beelden blokkeren"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Het scherm niet inschakelen of niet activeren voor meldingen"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Helemaal geen meldingen weergeven, behalve voor basistelefoonactiviteit en -status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Geluiden voor werkprofiel"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> t/m <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Oproepen"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Wanneer \'Niet storen\' is ingeschakeld, worden inkomende oproepen geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Berichten"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Alle berichten"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Geselecteerde berichten"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Berichten"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Sommige berichten"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Van iedereen"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Alleen van contacten"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Alleen van contacten met ster"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Van contacten met ster en terugkerende bellers"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Van contacten en terugkerende bellers"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Alleen van terugkerende bellers"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Geen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wekkers"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Aanraakgeluiden"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Herinneringen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenementen"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle bellers"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Geselecteerde bellers"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"iedereen"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contacten"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contacten met ster"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Terugkerende bellers"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Alleen van <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Van <xliff:g id="CALLER_TYPE">%1$s</xliff:g> en <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Als dezelfde persoon binnen <xliff:g id="MINUTES">%d</xliff:g> minuten een tweede keer belt"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Aangepast"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatisch aan"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle \'Niet storen\'-regels die door deze app zijn gemaakt, worden verwijderd."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Niet optimaliseren"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimaliseren"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Hierdoor kan je accuverbruik toenemen"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Aanbevolen voor een langere accuduur"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> toestaan om batterijoptimalisatie te negeren?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Geen"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Back-up uitgeschakeld"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Geüpdatet naar Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update beschikbaar"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Kan instelling niet wijzigen"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Actie niet toegestaan"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Kan het volume niet wijzigen"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Bellen niet toegestaan"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Sms niet toegestaan"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Informatie op vergrendelingsscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Content van meldingen weergeven of verbergen"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Ondersteuning &amp; tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tips en ondersteuning"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Er zijn geen geïnstalleerde apps die premium sms-toegang hebben aangevraagd"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium sms\'jes kunnen je geld kosten en worden toegevoegd aan de facturen van je provider. Als je rechten aan een app verleent, kun je premium sms\'jes verzenden met die app."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- en tv-apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Gegevens voor providerregistratie"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Providerregistratie activeren"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is er nieuw en interessant?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Een rondleiding volgen voor je nieuwe telefoon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Een rondleiding volgen voor je nieuwe tablet"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 3a40d6c..5642e60 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -166,6 +166,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ସିମ୍‌ ଆକ୍ସେସ୍‌ ଅନୁରୋଧ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, ଆପଣଙ୍କର SIM କାର୍ଡ ଆକ୍‌ସେ‌ସ୍‌ କରିବାକୁ ଚାହୁଁଛି। SIM କାର୍ଡ ପ୍ରତି ଆକ୍‌ସେସ୍‌ର ମଞ୍ଜୁରି ଦେଲେ, ତାହା ସଂଯୋଗ ଥିବା ପର୍ଯ୍ୟନ୍ତ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ଡାଟା ସଂଯୋଗତା ଅକ୍ଷମ ରହିବ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>କୁ ଅନୁମତି ଦିଅନ୍ତୁ।"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ “<xliff:g id="DEVICE_NAME">^1</xliff:g>” ରୂପେ ଦୃଶ୍ୟମାନ"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ନୂଆ ଡିଭାଇସ୍‌କୁ ପେୟାର୍‌ କରନ୍ତୁ"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ଆପଣଙ୍କର ଟାବଲେଟ୍‌କୁ ଆଖପାଖରେ ଥିବା ବ୍ଲୁ-ଟୂଥ୍‍ ଡିଭାଇସ୍ ସହ ଯୋଗାଯୋଗ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
@@ -382,7 +384,7 @@
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ଲକ୍‌ ସ୍କ୍ରୀନ୍‌ ସମ୍ପର୍କିତ ପସନ୍ଦ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ମୋ ଅବସ୍ଥାନ, ସ୍କ୍ରିନ୍‌ ଅନଲକ୍‌, SIM କାର୍ଡ ଲକ୍‌, ପରିଚୟ ଷ୍ଟୋରେଜ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ମୋ ଲୋକେଶନ୍‌, ସ୍କ୍ରୀନ୍‌ ଅନ୍‌ଲକ୍‌, ତଥ୍ୟ ଷ୍ଟୋରେଜ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="security_passwords_title" msgid="2881269890053568809">"ଗୋପନିୟତା"</string>
+    <string name="security_passwords_title" msgid="2881269890053568809">"ଗୋପନୀୟତା"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ଆଡମିନ୍‌ଙ୍କ ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ସୁରକ୍ଷା ସ୍ଥିତି"</string>
     <string name="security_dashboard_summary" msgid="6757421634477554939">"ସ୍କ୍ରୀନ୍‌ ଲକ୍‌, ଆଙ୍ଗୁଠି ଚିହ୍ନ"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMଗୁଡ଼ିକୁ ରିସେଟ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"ଗୋଟିଏ ତ୍ରୁଟି କାରଣରୁ eSIMଗୁଡ଼ିକୁ ରିସେଟ୍ କରାଯାଇପାରିବ ନାହିଁ|"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ସମସ୍ତ ଡାଟା ଖାଲି କରିଦିଅନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ଏହା, ଆପଣଙ୍କ ଟାବଲେଟର "<b>"ଆଭ୍ୟନ୍ତର ଷ୍ଟୋରେଜରେ ଥିବା ସମସ୍ତ ଡାଟା"</b>", ଯେପରି:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଓ ଏପ ଡାଟା ଓ ସେଟିଙ୍ଗ"</li>\n<li>"ଡାଉନଲୋଡ ହୋଇଥିବା ଏପ୍ସକୁ ଖାଲି କରିଦେବ।"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ଏହା, ଆପଣଙ୍କ ଫୋନ୍‌‍ "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍‌"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟାକୁ ଖାଲି କରିଦେବ, ଯେପରି ଆପଣଙ୍କର:\n\n"<li>"Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଓ ଆପ୍‌ ଡାଟା ଓ ସେଟିଙ୍ଗ"</li>\n<li>"ଡାଉନ୍‌ଲୋଡ୍‌ ହୋଇଥିବା ସମସ୍ତ ଆପ୍‌"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ଆପଣ ବର୍ତ୍ତମାନ ନିମ୍ନ ଆକାଉଣ୍ଟଗୁଡ଼ିକରେ ସାଇନ୍‌ ଇନ୍‌ କରିଛନ୍ତି:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">ବହୁତ ଲମ୍ବା ବିଳମ୍ବ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ମିସେ)</item>
       <item quantity="one">ବହୁତ ଲମ୍ବା ବିଳମ୍ବ (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ମିସେ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ରିଙ୍ଗ ଓ ବିଜ୍ଞପ୍ତିକୁ ଅଫ୍ କରାଯାଇଛି"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ରିଙ୍ଗ ଓ ବିଜ୍ଞପ୍ତିକୁ କମ୍‌ରେ ସେଟ୍ କରାଯାଇଛି"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ରିଙ୍ଗ ଓ ବିଜ୍ଞପ୍ତିକୁ ମଧ୍ୟମରେ ସେଟ୍ କରାଯାଇଛି"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ସ୍କ୍ରୀନ୍‌ର ବ୍ୟବହାର"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ସ୍କ୍ରୀନ୍‌ ବ୍ୟବହାର"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ଖୋଜୁଛି"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"ସମ୍ଫୂର୍ଣ୍ଣ ଚାର୍ଜ ପରଠାରୁ ଆପ୍‌ର ବ୍ୟବହାର (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ପୂର୍ଣ୍ଣ ଚାର୍ଜ ପରଠାରୁ ଡିଭାଇସର ବ୍ୟବହାର (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ଡିଭାଇସ୍‌ ଜାଗ୍ରତ ରହୁଛି"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ଲଗାତର ଲୋକେଶନ୍‌ର ଅନୁରୋଧ କରାଯାଉଛି"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g>ଟି ଆପ୍‌ ଠିକ୍‌ ଭାବେ କାମ କରୁନି"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ବ୍ୟାଟେରୀ ଭଲ ଅଛି"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ଆପ୍‌ଗୁଡ଼ିକ ଠିକ୍‌ ଭାବେ ଚାଲୁଛି"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ନିମ୍ନ ବ୍ୟାଟେରୀ ସାମର୍ଥ୍ୟତା"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ବ୍ୟାଟେରୀଟି ଭଲ ବ୍ୟାଟେରୀ ଜୀବନ ଦେଇପାରିବ ନାହିଁ"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"ଆପଣଙ୍କ ଫୋନ୍‌ର ବ୍ୟାଟେରୀ ଜୀବନ ଉନ୍ନତ କରେ"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ଟାବଲେଟ୍‌ ସାଧାରଣ ତୁଳନାରେ ଅଧିକ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ଡିଭାଇସ୍‌ ସାଧାରଣ ତୁଳନାରେ ଅଧିକ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ଖୁବ୍ ଶୀଘ୍ର ବ୍ୟାଟେରୀ ସରିଯାଇପାରେ"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"ଆପଣଙ୍କର ଫୋନ୍ ସାଧାରଣଠାରୁ ଅଧିକ ବ୍ୟବହାର ହେଉଛି। ଆଶାଠାରୁ ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଖୁବ୍ ଶୀଘ୍ର ସରିଯାଇପାରେ। \n\n ଶେଷଥର (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ପୂର୍ବେ ପୂରା ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="NUMBER">%1$d</xliff:g>ଟି ଶୀର୍ଷ ଆପ୍:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"ଆପଣଙ୍କର ଟାବଲେଟ୍ ସାଧାରଣଠାରୁ ଅଧିକ ବ୍ୟବହାର ହେଉଛି। ଆଶାଠାରୁ ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଖୁବ୍ ଶୀଘ୍ର ସରିଯାଇପାରେ। \n\n ଶେଷଥର (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ପୂର୍ବେ ପୂରା ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="NUMBER">%1$d</xliff:g>ଟି ଶୀର୍ଷ ଆପ୍:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"ଆପଣଙ୍କର ଡିଭାଇସ୍ ସାଧାରଣଠାରୁ ଅଧିକ ବ୍ୟବହାର ହେଉଛି। ଆଶାଠାରୁ ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଖୁବ୍ ଶୀଘ୍ର ସରିଯାଇପାରେ। \n\n ଶେଷଥର (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ପୂର୍ବେ ପୂରା ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="NUMBER">%1$d</xliff:g>ଟି ଶୀର୍ଷ ଆପ୍:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$dଟି ଆପ୍‌କୁ ଅବରୋଧ କରନ୍ତୁ</item>
       <item quantity="one">%1$dଟି ଆପ୍‌କୁ ଅବରୋଧ କରନ୍ତୁ</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ଏହି ଆପ୍‌ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ବ୍ୟାଟେରୀ ବ୍ୟବହାର କରି ପାରିବ। ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଅନୁମାନ କରିଥିବା ସମୟର ପୂର୍ବରୁହିଁ ସରିଯାଇପାରେ।"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"କ୍ୟାନ୍ସଲ୍"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ଆପଣଙ୍କ ବ୍ୟବହାର ଉପରେ ଭିତ୍ତି କରି, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ କରିବା ପରେ ତାହା ପ୍ରାୟ <xliff:g id="TIME_DURATION">%1$s</xliff:g> ଚାଲେ।\n\nଯଦି ଆପଣ ବ୍ୟାଟେରୀ ଅଧିକ ସମୟ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ଚାହାନ୍ତି, ତେବେ ବ୍ୟାଟେରୀ ସେଭର୍‌ ଅନ୍‌ କରନ୍ତୁ।"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ଯଦି ଆପଣ ବ୍ୟାଟେରୀ ଅଧିକ ସମୟ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ଚାହାନ୍ତି, ତେବେ ବ୍ୟାଟେରୀ ସେଭର୍‌ ଅନ୍‌ କରନ୍ତୁ"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ବ୍ୟାଟେରୀ ମ୍ୟାନେଜର୍‌"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ସ୍ଵଚାଳିତଭାବେ ଆପ୍‌ ପରିଚାଳନା କରନ୍ତୁ"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ଆପଣ ଅଧିକାଂଶ ସମୟରେ ବ୍ୟବହାର କରୁନଥିବା ଆପ୍ ପାଇଁ ବ୍ୟାଟେରୀ ବ୍ୟବହାରକୁ ସୀମିତ କରନ୍ତୁ"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ଭିଜୁଆଲ୍‌ ସଙ୍କେତ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"ବିଜ୍ଞପ୍ତିକୁ ସୀମାବଦ୍ଧ କରନ୍ତୁ"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଚାଲୁ ଥିବ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ବିଜ୍ଞପ୍ତି"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଚାଲୁ ରହିଥିବ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"ବିଜ୍ଞପ୍ତିକୁ ମ୍ୟୁଟ୍ କରନ୍ତୁ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"ବିଜ୍ଞପ୍ତିକୁ ଦେଖାନ୍ତୁ କିନ୍ତୁ ଶବ୍ଦ ଓ କମ୍ପନକୁ ମ୍ୟୁଟ୍ କରନ୍ତୁ"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"ଯେତେବେଳେ ନୂଆ ବିଜ୍ଞପ୍ତି ଆପଣଙ୍କ ଫୋନ୍‍କୁ ଆସିବ ସେତେବେଳେ ଶବ୍ଦ କିମ୍ବା କମ୍ପନ ହେବ ନାହିଁ"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"ଲୁଚାଇବା ଓ ମ୍ୟୁଟ୍‍ର ବିଜ୍ଞପ୍ତି"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"ବିଜ୍ଞପ୍ତି ଆଦୌ ଦେଖାଦେବ ନାହିଁ"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ୍ ଥିବା ବେଳେ ଆପଣ ନୂଆ କିମ୍ବା ବିଦ୍ୟମାନ ଥିବା ବିଜ୍ଞପ୍ତିକୁ ଦେଖିପାରିବେ ନାହିଁ। ମୌଳିକ ଫୋନ୍ କାର୍ଯ୍ୟକଳାପ ପାଇଁ ବିଜ୍ଞପ୍ତି ଆବଶ୍ୟକ ହେବ ଏବଂ ତଥାପି ମଧ୍ୟ ଷ୍ଟାଟସ୍ ଦେଖାଦେବ।"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ବିଜ୍ଞପ୍ତିକୁ ନିରବରେ ଦେଖାନ୍ତୁ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ବିଜ୍ଞପ୍ତିକୁ ମ୍ୟୁଟ୍ କରାଯିବ"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ଯେତେବେଳେ ବିଜ୍ଞପ୍ତି ଦେଖାଦେବ, ଆପଣଙ୍କର ଫୋନ୍‍ରେ ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହେବନାହିଁ।"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ବିଜ୍ଞପ୍ତି ଲୁଚାନ୍ତୁ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ଆପଣ ନୂଆ କିମ୍ବା ବିଦ୍ୟମାନ ଥିବା ବିଜ୍ଞପ୍ତିକୁ ଦେଖିପାରିବେ ନାହିଁ"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ଆପଣଙ୍କର ଫୋନ୍ ନୂଆ କିମ୍ବା ବିଦ୍ୟମାନ ବିଜ୍ଞପ୍ତିକୁ ପ୍ରଦର୍ଶନ କରିବ ନାହିଁ ତଥା ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହେବନାହିଁ। ଯେତେବେଳେ ଆପଣ ସ୍କ୍ରୀନ୍‍ର ଉପରୁ ତଳକୁ ସ୍ୱାଇପ୍ କରିବେ ବିଜ୍ଞପ୍ତି ଦେଖାଯିବ ନାହିଁ। \n\nମନେରଖନ୍ତୁ ଯେ, ଫୋନ୍ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଷ୍ଟାଟସ୍ ପାଇଁ ଜଟିଳ ବିଜ୍ଞପ୍ତି ତଥାପି ଦୃଶ୍ୟମାନ ହେଉଥିବ।"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"କଷ୍ଟମ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"କଷ୍ଟମ ସେଟିଙ୍ଗକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"କଷ୍ଟମ ସେଟିଙ୍ଗକୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
@@ -3135,7 +3153,26 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>ଟି ନିୟମ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ ହେବ</item>
       <item quantity="one">1ଟି ନିୟମ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ ହେବ</item>
     </plurals>
-    <!-- no translation found for zen_onboarding_ok (4332223974819182383) -->
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ଗତିବିଧି"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ବ୍ୟତିକ୍ରମ"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"ନିର୍ଦ୍ଧାରିତ"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ସାଉଣ୍ଡ ଓ ଭାଇବ୍ରେଶନ୍"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଆଇଟମ୍ ବ୍ୟତୀତ ସାଉଣ୍ଡ ଓ ଭାଇବ୍ରେଶନ୍ ମ୍ୟୁଟ୍ ହୋଇଯିବ।"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ଏହା ବ୍ୟତୀତ ସମସ୍ତକୁ ମ୍ୟୁଟ୍ କରନ୍ତୁ"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ମ୍ୟୁଟ୍‌ କରାଗଲା"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ମ୍ୟୁଟ୍ ହୋ‍ଇନାହିଁ"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ମ୍ୟୁଟ୍ ହୋ‍ଇଛି, କିନ୍ତୁ <xliff:g id="SOUND_TYPE">%1$s</xliff:g>କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ମ୍ୟୁଟ୍ ହୋ‍ଇଛି, କିନ୍ତୁ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ଓ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ମ୍ୟୁଟ୍ ହୋ‍ଇଛି, କିନ୍ତୁ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ଓ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ମେସେଜ୍, ଇଭେଣ୍ଟ ଓ ରିମାଇଣ୍ଡର୍"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ୍ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଆଇଟମ୍ ବ୍ୟତୀତ ମେସେଜ୍, ରିମାଇଣ୍ଡର୍ ଓ ଇଭେଣ୍ଟ ମ୍ୟୁଟ୍ ହୋ‍ଇଯିବ। ସାଙ୍ଗ, ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟାନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଙ୍ଗକୁ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
+    <!-- no translation found for zen_onboarding_ok (4157146842078658361) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_no_update (3103752501952811308) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_description (4051020254348888576) -->
+    <skip />
+    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (4243599835234481809) -->
     <skip />
     <!-- no translation found for zen_onboarding_settings (9046451821239946868) -->
     <skip />
@@ -3145,10 +3182,6 @@
     <skip />
     <!-- no translation found for zen_onboarding_screen_off_title (3153498025037206166) -->
     <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_description (1941519590822188992) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1442575104084675243) -->
-    <skip />
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"ସ୍କ୍ରୀନ୍‌କୁ ଚାଲୁ କରନ୍ତୁ ନାହିଁ କିମ୍ବା ବିଜ୍ଞପ୍ତି ପାଇଁ ଜଗାନ୍ତୁ ନାହିଁ"</string>
     <!-- no translation found for zen_onboarding_screen_on_summary (4351138746406623307) -->
     <skip />
@@ -3322,21 +3355,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ରୁ <xliff:g id="END">%2$s</xliff:g> ପର୍ଯ୍ୟନ୍ତ"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"କଲ୍‌ଗୁଡ଼ିକ"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ୍ ଥିବ, ସେତେବେଳେ ଇନକମିଙ୍ଗ କଲ୍ ଅବରୋଧ ହେବ। ସାଙ୍ଗ, ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟାନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଙ୍ଗକୁ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ମେସେଜ୍‌"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"ସମସ୍ତ ମେସେଜ୍‌ଗୁଡ଼ିକ"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ଚୟନିତ ମେସେଜ୍‌"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"ମେସେଜ୍‌"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"କିଛି ମେସେଜ୍"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ଯେକୌଣସି ବ୍ୟକ୍ତିଙ୍କଠାରୁ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"କେବଳ ଯୋଗାଯୋଗଙ୍କ ମଧ୍ୟରୁ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"କେବଳ ତାରାଙ୍କିତ ଯୋଗାଯୋଗଙ୍କଠାରୁ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗ ଓ ବାରମ୍ୱାର କରୁଥିବା କଲର୍‍ଙ୍କଠାରୁ"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"ଯୋଗାଯୋଗ ଓ ବାରମ୍ୱାର କରୁଥିବା କଲର୍‍ଙ୍କଠାରୁ"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"କେବଳ ବାରମ୍ୱାର କରୁଥିବା କଲର୍‍ଙ୍କଠାରୁ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"କିଛି ନୁହେଁ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ଆଲାର୍ମ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"ମିଡିଆ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ସ୍ପର୍ଶଜନିତ ସାଉଣ୍ଡ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ରିମାଇଣ୍ଡର"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ଇଭେଣ୍ଟ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"କଲ୍‌ କରୁଥୁବା ସମସ୍ତ ବ୍ୟକ୍ତି"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ଚୟନିତ କଲ‍ର୍‌ମାନେ"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ଯେକୌଣସି ବ୍ୟକ୍ତି"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ଯୋଗାଯୋଗ"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ବାରମ୍ୱାର ଫୋନ୍‌ କରୁଥିବା କଲର୍"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"କେବଳ <xliff:g id="CALLER_TYPE">%1$s</xliff:g>ଙ୍କଠାରୁ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ଓ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>ଙ୍କଠାରୁ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> ମିନିଟ୍‌ ମଧ୍ୟରେ ଯଦି ସେହି ସମାନ ବ୍ୟକ୍ତି ଦ୍ୱିତୀୟ ଥର ପାଇଁ କଲ୍‌ କରନ୍ତି"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"କଷ୍ଟମ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ସ୍ଵତଃସ୍ପୃତଭାବ ଅନ୍‌"</string>
@@ -3609,7 +3652,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ଏହି ଆପ୍‌ ଦ୍ୱାରା, \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ପାଇଁ କରାଯାଇଥିବା ସମସ୍ତ ନିୟମ କାଢ଼ିଦିଆଯିବ।"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ଅନୁକୁଳ କରନାହିଁ"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ଅନୁକୁଳ"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ଖୁବ ଶୀଘ୍ର ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ସାରିଦେଇପାରେ"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ବ୍ୟାଟେରୀ କାମ କରିବା ସମୟ ବଢାଇବାକୁ ସୁପାରିଶ କରାଯାଇଛି"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ବ୍ୟାଟେରୀ ଅନୁକୂଳନ ଏଡ଼ାଇବାକୁ <xliff:g id="APP">%s</xliff:g> କୁ ଅନୁମତି ଦେବେ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"କିଛି ନୁହେଁ"</string>
@@ -3685,7 +3729,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ବ୍ୟାକ-ଅପ ବନ୍ଦ କରିଦିଆଯାଇଛି"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> ଭର୍ସନ୍‌କୁ ଅପଡେଟ୍‌ ହୋଇଗଲା"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ଅପଡେଟ୍‌ ଉପଲବ୍ଧ"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ଏହି ସେଟିଙ୍ଗକୁ ବଦଳାଇହେବ ନାହିଁ"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"କାର୍ଯ୍ୟଟି ଅନୁମୋଦିତ ନୁହେଁ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ଭଲ୍ୟୁମ୍‌କୁ ବଦଳାଇହେବ ନାହିଁ"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"କଲ୍‌ କରିବାର ଅନୁମତି ନାହିଁ"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ପଠାଇବାର ଅନୁମତି ନାହିଁ"</string>
@@ -3875,7 +3919,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"ଲକ୍‌ ସ୍କ୍ରୀନ୍‌ ଉପରେ ନିୟନ୍ତ୍ରଣ ସମ୍ପର୍କିତ ବିଜ୍ଞପ୍ତି"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ବିଜ୍ଞପ୍ତି କଣ୍ଟେଣ୍ଟକୁ ଦେଖାନ୍ତୁ କିମ୍ୱା ଲୁଚାନ୍ତୁ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ସମସ୍ତ"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"ସପୋର୍ଟ ଓ ଟିପ୍ସ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ପରାମର୍ଶ ଓ ସପୋର୍ଟ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ସବୁଠାରୁ ଛୋଟ ଓସାର"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ପ୍ରିମିୟମ୍‌ SMS ଆକସେସ୍‌ ଅନୁରୋଧ କରିନାହାଁନ୍ତି"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ପ୍ରିମିୟମ୍‌ SMSରେ ଆପଣଙ୍କୁ ଖର୍ଚ୍ଚ କରିବାକୁ ପଡ଼ିପାରେ ଏବଂ ତାହା ଆପଣଙ୍କର କେରିଅର୍‌ ବିଲ୍‌ରେ ଯୋଡ଼ି ହୋଇଯିବ। ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍‌ ପାଇଁ ଅନୁମତି ଦେଇଛନ୍ତି, ତେବେ ସେହି ଆପ୍‌ ବ୍ୟବହାର କରି ଆପଣ ପ୍ରିମିୟମ୍‌ SMS ପଠାଇପାରିବେ।"</string>
@@ -4068,6 +4112,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"ସିନେମା ଓ ଟିଭି ଆପ୍‌"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ବାହକ ପ୍ରାବଧାନ ସୂଚନା"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"କେରିଅର୍‌ ପ୍ରୋଭିଜନିଙ୍ଗ ଟ୍ରିଗର୍‌ କରନ୍ତୁ"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"କଣ ନୂତନ ତଥା ମଜାଦାର ଅଛି?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ଆପଣଙ୍କ ନୂଆ ଫୋନ୍‌କୁ ଚଲାଇ ଦେଖନ୍ତୁ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ଆପଣଙ୍କ ନୂଆ ଟାବ୍‌ଲେଟ୍‌କୁ ଚଲାଇ ଦେଖନ୍ତୁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index a916d12..f41fac3 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ਸਿਮ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ ਦੀ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ। ਸਿਮ ਕਾਰਡ ਦੀ ਪਹੁੰਚ ਦੇਣਾ ਕਨੈਕਸ਼ਨ ਦੀ ਸਮਾਂ ਮਿਆਦ ਦੇ ਲਈ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਕਨੈਕਟਿਵਿਟੀ ਨੂੰ ਅਸਮਰਥਿਤ ਕਰ ਦੇਵੇਗਾ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ਨੂੰ ਪਹੁੰਚ ਦਿਓ"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਲਈ <xliff:g id="DEVICE_NAME">^1</xliff:g> ਵਜੋਂ ਦਿਖਣਯੋਗ"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ਆਪਣੇ ਟੈਬਲੇੱਟ ਨੂੰ ਨਜ਼ਦੀਕੀ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦਿਓ"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"ਈ-ਸਿਮ ਰੀਸੈੱਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"ਕੋਈ ਗੜਬੜ ਹੋਣ ਕਰਕੇ ਈ-ਸਿਮ ਰੀਸੈੱਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ।"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਹੋ:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">ਬਹੁਤ ਲੰਮੀ ਦੇਰੀ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">ਬਹੁਤ ਲੰਮੀ ਦੇਰੀ (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ਘੰਟੀ ਅਤੇ ਸੂਚਨਾ ਬੰਦ \'ਤੇ ਸੈੱਟ ਹਨ"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ਘੰਟੀ ਅਤੇ ਸੂਚਨਾ ਘੱਟ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ਘੰਟੀ ਅਤੇ ਸੂਚਨਾ ਔਸਤ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਵਰਤੋਂ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ਸਕ੍ਰੀਨ ਖਪਤ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਵਰਤੋਂ (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ਵਾਰ-ਵਾਰ ਟਿਕਾਣੇ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ਐਪਾਂ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀਆਂ ਹਨ"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ਬੈਟਰੀ ਚੰਗੀ ਹਾਲਤ ਵਿੱਚ ਹੈ"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ਐਪਾਂ ਆਮ ਵਾਂਗ ਚੱਲ ਰਹੀਆਂ ਹਨ"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ਘੱਟ ਬੈਟਰੀ ਸਮਰੱਥਾ"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ਬੈਟਰੀ ਜ਼ਿਆਦਾ ਦੇਰ ਤੱਕ ਨਹੀਂ ਚੱਲ ਸਕਦੀ ਹੈ"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਬਿਹਤਰ ਬਣਾਓ"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਹੋਈ ਹੈ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਹੋਈ ਹੈ"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ਬੈਟਰੀ ਛੇਤੀ ਹੀ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਹੀ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ।\n\nਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਦੇ (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ਤੋਂ ਬਾਅਦ ਵਰਤੀਆਂ ਪ੍ਰਮੁੱਖ <xliff:g id="NUMBER">%1$d</xliff:g> ਐਪਾਂ:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਹੀ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ।\n\nਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਦੇ (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ਤੋਂ ਬਾਅਦ ਵਰਤੀਆਂ ਪ੍ਰਮੁੱਖ <xliff:g id="NUMBER">%1$d</xliff:g> ਐਪਾਂ:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਹੀ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ।\n\nਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਦੇ (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) ਤੋਂ ਬਾਅਦ ਵਰਤੀਆਂ ਪ੍ਰਮੁੱਖ <xliff:g id="NUMBER">%1$d</xliff:g> ਐਪਾਂ:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">%1$d ਐਪ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਓ</item>
       <item quantity="other">%1$d ਐਪਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਓ</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ਇਹ ਐਪ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕੇਗੀ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਹੀ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"ਹਟਾਓ"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"ਰੱਦ ਕਰੋ"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ਤੁਹਾਡੀ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਪੂਰੀ ਚਾਰਜ ਹੋਣ \'ਤੇ ਲਗਭਗ <xliff:g id="TIME_DURATION">%1$s</xliff:g> ਚੱਲਦੀ ਹੈ।\n\nਜੇਕਰ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਵਧਾਉਣ ਦੀ ਲੋੜ ਹੈ, ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ਜੇਕਰ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਵਧਾਉਣ ਦੀ ਲੋੜ ਹੈ, ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਚਾਲੂ ਕਰੋ"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ਬੈਟਰੀ ਪ੍ਰਬੰਧਕ"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"ਐਪਾਂ ਦਾ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ਉਹਨਾਂ ਐਪਾਂ ਲਈ ਬੈਟਰੀ ਵਰਤੋਂ ਸੀਮਤ ਕਰੋ ਜਿਨ੍ਹਾਂ ਨੂੰ ਤੁਸੀਂ ਅਕਸਰ ਨਹੀਂ ਵਰਤਦੇ"</string>
@@ -3075,38 +3094,21 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਸਿਗਨਲ ਦਿਖਣ ਦਿਓ"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ਸੂਚਨਾਵਾਂ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ਸੂਚਨਾਵਾਂ ਚੁੱਪ-ਚਪੀਤੇ ਢੰਗ ਨਾਲ ਦਿਖਾਓ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ਸੂਚਨਾਵਾਂ ਨੂੰ ਮਿਊਟ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ਸੂਚਨਾਵਾਂ ਆਉਣ \'ਤੇ ਤੁਹਾਡਾ ਫ਼ੋਨ ਕੋਈ ਧੁਨੀ ਨਹੀਂ ਵਜਾਵੇਗਾ ਜਾਂ ਥਰਥਰਾਹਟ ਨਹੀਂ ਕਰੇਗਾ।"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ਸੂਚਨਾਵਾਂ ਲੁਕਾਓ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਜਾਂ ਮੌਜੂਦਾ ਸੂਚਨਾਵਾਂ ਦਿਖਾਈ ਨਹੀਂ ਦੇਣਗੀਆਂ"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਨਵੀਆਂ ਅਤੇ ਮੌਜੂਦਾ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਦਿਖਾਵੇਗਾ ਅਤੇ ਨਾ ਕੋਈ ਧੁਨੀ ਵਜਾਵੇਗਾ ਜਾਂ ਥਰਥਰਾਹਟ ਕਰੇਗਾ। ਤੁਹਾਡੇ ਵੱਲੋਂ ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਸਿਖਰ ਤੋਂ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦਿਖਾਈ ਨਹੀਂ ਦੇਣਗੀਆਂ।\n\nਧਿਆਨ ਵਿੱਚ ਰੱਖੋ ਕਿ, ਫ਼ੋਨ ਸਰਗਰਮੀ ਅਤੇ ਸਥਿਤੀ ਦੀਆਂ ਗੰਭੀਰ ਸੂਚਨਾਵਾਂ ਹਾਲੇ ਵੀ ਦਿਖਾਈ ਦੇਣਗੀਆਂ।"</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ਵਿਉਂਤਿਆ"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ਵਿਉਂਤੀ ਸੈਟਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ਵਿਉਂਤੀ ਸੈਟਿੰਗ ਹਟਾਓ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ਦਿਖਾਈ ਦੇਵੇਗਾ"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ਅਧੂਰੇ ਤੌਰ \'ਤੇ ਲੁਕਾਓ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ਲੁਕਾਇਆ ਹੋਇਆ"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ਵਿਉਂਤਬੱਧ ਪਾਬੰਦੀਆਂ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਚਾਲੂ ਹੋਵੇ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਵੇ"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟ ਮਿਊਟ ਕਰੋ"</string>
@@ -3151,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ਨਿਯਮ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦਾ ਹੈ</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਨਿਯਮ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੇ ਹਨ</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ਠੀਕ ਹੈ"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ਵਰਤਾਅ"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ਅਪਵਾਦ"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"ਸਮਾਂ-ਸੂਚੀ"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟ"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟ ਨੂੰ ਮਿਊਟ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ਇਸਤੋਂ ਇਲਾਵਾ ਸਭ ਮਿਊਟ ਕਰੋ"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ਮਿਊਟ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ਮਿਊਟ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ <xliff:g id="SOUND_TYPE">%1$s</xliff:g> ਵੱਜਣ ਦਿਓ"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ਅਤੇ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ਚੱਲਣ ਦਿਓ"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ਅਤੇ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> ਚੱਲਣ ਦਿਓ"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ਸੁਨੇਹੇ, ਇਵੈਂਟ ਅਤੇ ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਸੁਨੇਹੇ, ਯਾਦ-ਸੂਚਨਾਵਾਂ ਅਤੇ ਇਵੈਂਟ ਮਿਊਟ ਕੀਤੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੁਨੇਹੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"ਅੱਪਡੇਟ ਕਰੋ"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"ਅੱਪਡੇਟ ਨਾ ਕਰੋ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"ਕਿਸੇ ਕੰਮ \'ਤੇ ਧਿਆਨ ਕੇਂਦਰਿਤ ਕਰਨ ਵਿੱਚ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੀ ਵਧੇਰੇ ਮਦਦ ਕਰ ਸਕਦਾ ਹੈ।\n\nਸੈਟਿੰਗਾਂ ਨੂੰ ਇਸ \'ਤੇ ਅੱਪਡੇਟ ਕਰੋ:\n\n- ਸੂਚਨਾਵਾਂ ਨੂੰ ਪੂਰੀ ਤਰ੍ਹਾਂ ਲੁਕਾਓ\n\n- ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਅਤੇ ਵਾਰ-ਵਾਰ ਕਾਲ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਦੀਆਂ ਕਾਲਾਂ ਹੀ ਆਉਣ ਦਿਓ"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"ਕੀ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਅੱਪਡੇਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਇਸ ਨੂੰ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"ਸਕ੍ਰੀਨ ਚਾਲੂ ਹੋਣ \'ਤੇ ਬਲਾਕ ਕਰੋ"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ \'ਤੇ ਬਲਾਕ ਕਰੋ"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਅਣਚਾਹੀਆਂ ਧੁਨੀਆਂ ਬਲਾਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ ਵੀ ਹੋਰ ਬਹੁਤ ਕੁਝ ਕਰ ਸਕਦਾ ਹੈ - ਇਹ ਦ੍ਰਿਸ਼ ਨੂੰ ਵੀ ਬਲਾਕ ਕਰ ਸਕਦਾ ਹੈ। ਇਹ ਤੁਹਾਡੇ ਸੌਣ, ਧਿਆਨ ਲਗਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਜਾਂ ਆਪਣੇ ਫ਼ੋਨ \'ਤੇ ਘੱਟ ਤਵੱਜੋ ਦੇਣ ਵੇਲੇ ਮਦਦਗਾਰ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ਧੁਨੀਆਂ ਅਤੇ ਦ੍ਰਿਸ਼ ਬਲਾਕ ਕਰੋ"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"ਸਕ੍ਰੀਨ ਚਾਲੂ ਨਾ ਕਰੋ ਜਾਂ ਸੂਚਨਾਵਾਂ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਾ ਕਰੋ"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ਆਮ ਫ਼ੋਨ ਸਰਗਰਮੀ ਅਤੇ ਸਥਿਤੀ ਤੋਂ ਬਿਨਾਂ ਕੋਈ ਵੀ ਸੂਚਨਾਵਾਂ ਨੂੰ ਨਾ ਦਿਖਾਓ"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ"</string>
@@ -3328,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ਤੋਂ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ਕਾਲਾਂ"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਇਨਕਮਿੰਗ ਕਾਲਾਂ ਬਲਾਕ ਹੁੰਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ਸੁਨੇਹੇ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"ਸਾਰੇ ਸੁਨੇਹੇ"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ਚੁਣੇ ਗਏ ਸੁਨੇਹੇ"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"ਸੁਨੇਹੇ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ਕੁਝ ਸੁਨੇਹੇ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ਕਿਸੇ ਵੀ ਵਿਅਕਤੀ ਤੋਂ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ਸਿਰਫ਼ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ਸਿਰਫ਼ ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਅਤੇ ਵਾਰ-ਵਾਰ ਕਾਲ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਵੱਲੋਂ"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"ਸੰਪਰਕਾਂ ਅਤੇ ਵਾਰ-ਵਾਰ ਕਾਲ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਵੱਲੋਂ"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ਸਿਰਫ਼ ਵਾਰ-ਵਾਰ ਕਾਲ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਵੱਲੋਂ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ਕਿਸੇ ਤੋਂ ਵੀ ਨਹੀਂ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ਅਲਾਰਮ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"ਮੀਡੀਆ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ਸਪੱਰਸ਼ ਧੁਨੀਆਂ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ਇਵੈਂਟ"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"ਸਾਰੇ ਕਾਲਰ"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ਚੁਣੇ ਗਏ ਕਾਲਰ"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ਕੋਈ ਵੀ"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ਸੰਪਰਕ"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਵਾਲੇ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"ਸਿਰਫ਼ <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ਵੱਲੋਂ"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ਅਤੇ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> ਵੱਲੋਂ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ਜੇਕਰ ਇੱਕੋ ਵਿਅਕਤੀ <xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ ਵਿੱਚ ਦੂਜੀ ਵਾਰ ਕਾਲ ਕਰੇ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ਵਿਉਂਤੀ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ਆਟੋਮੈਟਿਕਲੀ ਚਾਲੂ ਕਰੋ"</string>
@@ -3612,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ਇਸ ਐਪ ਵੱਲੋਂ ਬਣਾਏ ਸਾਰੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨਿਯਮ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ਅਨੁਕੂਲਿਤ ਨਾ ਕਰੋ"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ਸੁਯੋਗ ਬਣਾਓ"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ਤੁਹਾਡੀ ਬੈਟਰੀ ਨੂੰ ਹੋਰ ਵੀ ਛੇਤੀ ਖ਼ਤਮ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ਬਿਹਤਰ ਬੈਟਰੀ ਸਮਰੱਥਾ ਲਈ ਸਿਫ਼ਾਰਿਸ਼ ਕੀਤਾ"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ਕੀ <xliff:g id="APP">%s</xliff:g> ਨੂੰ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਦੀ ਉਪੇਖਿਆ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ਕੋਈ ਨਹੀਂ"</string>
@@ -3688,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ਬੈਕ ਅੱਪ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"ਅੱਪਡੇਟ ਕਰਕੇ Android <xliff:g id="VERSION">%1$s</xliff:g> ਕੀਤਾ ਗਿਆ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੈ"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ਇਹ ਸੈਟਿੰਗ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ਕਾਰਵਾਈ ਦੀ ਆਗਿਆ ਨਹੀਂ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ਤੁਸੀਂ ਅਵਾਜ਼ ਨੂੰ ਬਦਲ ਨਹੀਂ ਸਕਦੇ"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ਕਾਲ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
@@ -3878,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">" ਲਾਕ  ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣਕਾਰੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਦਿਖਾਓ ਜਾਂ ਲੁਕਾਓ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ਸਭ"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"ਸਹਾਇਤਾ ਅਤੇ ਨੁਕਤੇ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ਨੁਕਤੇ ਅਤੇ ਸਹਾਇਤਾ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ਸਭ ਤੋਂ ਘੱਟ ਚੁੜਾਈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪ ਨੇ ਪ੍ਰੀਮੀਅਮ SMS ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ਪ੍ਰੀਮੀਅਮ SMS ਦਾ ਤੁਹਾਡੇ ਤੋਂ ਖਰਚਾ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਬਿੱਲਾਂ ਵਿੱਚ ਵਾਧਾ ਹੋ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਲਈ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਉਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਾਲ ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜਣ ਦੇ ਯੋਗ ਹੋ ਜਾਵੋਗੇ।"</string>
@@ -4071,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"ਫ਼ਿਲਮਾਂ ਅਤੇ ਟੀਵੀ ਐਪਾਂ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਜਾਣਕਾਰੀ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਨੂੰ ਤੂਲ ਦਿਓ"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ਕੀ ਕੁਝ ਨਵਾਂ ਅਤੇ ਦਿਲਚਸਪ ਹੈ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ਆਪਣਾ ਨਵਾਂ ਟੈਬਲੈੱਟ ਵਰਤਣ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b2fddb5..57a7bdb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Prośba o dostęp do karty SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce uzyskać dostęp do Twojej karty SIM. Jeśli na to zezwolisz, na czas tego połączenia na urządzeniu zostanie wyłączone połączenie transmisji danych. Przyznaj dostęp do urządzenia <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Widoczne dla innych urządzeń jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Twoje urządzenia"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sparuj nowe urządzenie"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Zezwól tabletowi na komunikowanie się z urządzeniami Bluetooth w pobliżu"</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Nie można zresetować kart eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Nie można zresetować kart eSIM z powodu błędu."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"W tej chwili używasz kont:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="other">Bardzo długie opóźnienie (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Bardzo długie opóźnienie (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Wyłączono wibracje przy dzwonku i powiadomieniach"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Ustawiono niską intensywność wibracji przy dzwonku i powiadomieniach"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Ustawiono średnią intensywność wibracji przy dzwonku i powiadomieniach"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Wykorzystanie przez ekran od ostatniego naładowania"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Zużycie przez ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Zużycie przez aplikacje od pełnego naładowania (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Zużycie przez urządzenie od pełnego naładowania (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Wybudza urządzenie w tle"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Często prosi o informację o lokalizacji"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Liczba aplikacji działających nieprawidłowo: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateria jest w dobrym stanie"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikacje działają normalnie"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Niski poziom naładowania baterii"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria nie zapewnia długiego czasu pracy"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Wydłuż czas pracy telefonu na baterii"</string>
@@ -2197,9 +2209,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet używany intensywniej niż zwykle"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Urządzenie używane intensywniej niż zwykle"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Bateria może się wkrótce wyczerpać"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon był wykorzystywany intensywniej niż zwykle. Bateria może wyładować się szybciej.\n\nNajbardziej intensywnie używane aplikacje (<xliff:g id="NUMBER">%1$d</xliff:g>) od ostatniego ładowania (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablet był wykorzystywany intensywniej niż zwykle. Bateria może wyładować się szybciej.\n\nNajbardziej intensywnie używane aplikacje (<xliff:g id="NUMBER">%1$d</xliff:g>) od ostatniego ładowania (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Urządzenie było wykorzystywane intensywniej niż zwykle. Bateria może wyładować się szybciej.\n\nNajbardziej intensywnie używane aplikacje (<xliff:g id="NUMBER">%1$d</xliff:g>) od ostatniego ładowania (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="few">Wprowadź ograniczenia dla %1$d aplikacji</item>
       <item quantity="many">Wprowadź ograniczenia dla %1$d aplikacji</item>
@@ -2238,8 +2253,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ta aplikacja może wykorzystywać baterię, działając w tle. Może to powodować szybsze wyczerpywanie baterii."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Usuń"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Anuluj"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Przy Twoim sposobie użytkowania bateria zwykle wystarcza na <xliff:g id="TIME_DURATION">%1$s</xliff:g> od pełnego naładowania.\n\nJeśli chcesz wydłużyć czas pracy na baterii, włącz Oszczędzanie baterii."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Jeśli chcesz wydłużyć czas pracy na baterii, włącz Oszczędzanie baterii"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Menedżer baterii"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Automatycznie zarządzaj aplikacjami"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ogranicz zużycie energii przez aplikacje, z których rzadko korzystasz"</string>
@@ -3145,38 +3164,21 @@
     <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">"Blokuj wyświetlanie"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Zezwól na sygnały wizualne"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Po włączeniu trybu Nie przeszkadzać"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Powiadomienia"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Pokazuj powiadomienia bez dźwięku"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Powiadomienia będą wyciszone"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon nie będzie sygnalizował powiadomień dźwiękiem ani wibracjami."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ukryj powiadomienia"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nowe i dotychczasowe powiadomienia nie będą wyświetlane"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon nie będzie wyświetlać ani sygnalizować dźwiękiem oraz wibracjami nowych i dotychczasowych powiadomień. Powiadomienia nie pojawią się, gdy przesuniesz palcami w dół ekranu.\n\nPamiętaj, że powiadomienia o znaczeniu krytycznym dotyczące aktywności i stanu telefonu będą się pojawiały."</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Niestandardowe"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Włącz ustawienia niestandardowe"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Usuń ustawienia niestandardowe"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Będą się pojawiać"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Częściowo ukryte"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ukryte"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Niestandardowe ograniczenia"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Gdy ekran jest włączony"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Gdy ekran jest wyłączony"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"Wycisz dźwięk i wibracje"</string>
@@ -3225,13 +3227,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reguły może być włączane automatycznie</item>
       <item quantity="one">Jedna reguła może być włączana automatycznie</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Działanie"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Wyjątki"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Harmonogram"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Dźwięk i wibracje"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Gdy włączysz tryb Nie przeszkadzać, sygnalizowanie dźwiękiem i wibracjami będzie wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Wycisz wszystko oprócz:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Wyciszone"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Niewyciszone"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Wyciszone, ale zezwól na: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Wyciszone, ale zezwól na: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> i <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Wyciszone, ale zezwól na: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Wiadomości, wydarzenia i przypomnienia"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Gdy włączysz tryb Nie przeszkadzać, wiadomości, przypomnienia i wydarzenia będą wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej. Możesz dostosować ustawienia wiadomości, by znajomi, rodzina i inne osoby mogli do Ciebie zadzwonić."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Zmień"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Nie zmieniaj"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Twój telefon może ułatwić Ci skoncentrowanie się na tym, co robisz.\n\nW ustawieniach:\n\n- włącz zupełne ukrywanie powiadomień,\n\n- zezwól na połączenia od kontaktów oznaczonych gwiazdką i dzwoniących powtórnie."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Zmienić ustawienia trybu Nie przeszkadzać?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ustawienia"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Możesz to bardziej dostosować w Ustawieniach."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokuj, gdy ekran jest włączony"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokuj, gdy ekran jest wyłączony"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Oprócz niechcianych dźwięków tryb Nie przeszkadzać może też blokować treści wizualne – na przykład gdy próbujesz zasnąć lub skupić się bądź ograniczasz czas korzystania z telefonu."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokowanie dźwięków i treści wizualnych"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Nie włączaj ekranu i nie wybudzaj w przypadku powiadomień"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Nie pokazuj żadnych powiadomień poza podstawową aktywnością i stanem telefonu"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Dźwięki w profilu do pracy"</string>
@@ -3410,21 +3426,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od: <xliff:g id="START">%1$s</xliff:g> do: <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Połączenia"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Gdy tryb Nie przeszkadzać jest włączony, połączenia przychodzące są zablokowane. Możesz dostosować ustawienia, by znajomi, rodzina i inne osoby z kontaktów mogli do Ciebie zadzwonić."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Wszystkie wiadomości"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Zaznaczone wiadomości"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Wiadomości"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Niektóre wiadomości"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od każdej osoby"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Tylko od kontaktów"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tylko od kontaktów z gwiazdką"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Od kontaktów oznaczonych gwiazdką i dzwoniących powtórnie"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Od kontaktów i dzwoniących powtórnie"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Tylko od dzwoniących powtórnie"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Żadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmy"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Multimedia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Dźwięki przy dotknięciu"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Przypomnienia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Wydarzenia"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Wszyscy rozmówcy"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wybrani rozmówcy"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"każdy"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakty"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakty oznaczone gwiazdką"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Dzwoniący powtórnie"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Tylko od dzwoniących typu <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Tylko od dzwoniących typu <xliff:g id="CALLER_TYPE">%1$s</xliff:g> i <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jeśli ta sama osoba dzwoni po raz drugi w ciągu <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Niestandardowe"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Włącz automatycznie"</string>
@@ -3714,7 +3740,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Wszystkie zasady Nie przeszkadzać utworzone przez tę aplikację zostaną usunięte."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Nie optymalizuj"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optymalizuj"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Może powodować szybsze wyczerpywanie się baterii"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Zalecane, by wydłużyć czas pracy baterii"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Zezwolić aplikacji <xliff:g id="APP">%s</xliff:g> na ignorowanie optymalizacji baterii?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Brak"</string>
@@ -3792,7 +3819,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Kopia zapasowa wyłączona"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Zaktualizowano do Androida <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostępna aktualizacja"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Nie można tego zmienić"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Niedozwolona czynność"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Nie można zmienić głośności"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Brak uprawnień do wybierania numerów"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Brak uprawnień do wysyłania SMS-ów"</string>
@@ -3906,7 +3933,7 @@
     <string name="data_used" msgid="5116389957228457203">"Wykorzystano: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="data_used_formatted" msgid="2989129931961311051">"Wykorzystano <xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g>"</string>
     <string name="data_overusage" msgid="1134445012475270295">"<xliff:g id="ID_1">^1</xliff:g> ponad limit"</string>
-    <string name="data_remaining" msgid="8998091725895502181">"Pozostało: <xliff:g id="ID_1">^1</xliff:g>"</string>
+    <string name="data_remaining" msgid="8998091725895502181">"Pozost.: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="456503215317213651">
       <item quantity="few">%d dni do końca</item>
       <item quantity="many">%d dni do końca</item>
@@ -3994,7 +4021,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Zarządzaj informacjami wyświetlanymi na ekranie blokady"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaż lub ukryj informacje w powiadomieniach"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Wszystkie"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Wsparcie i wskazówki"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Wsparcie i wskazówki"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmniejsza szerokość"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do SMS-ów specjalnych"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Za SMS-y specjalne może być pobierana dodatkowa, wyższa opłata, która pojawi się na Twoim rachunku telefonicznym. Po włączeniu tego uprawnienia możliwe będzie wysyłanie SMS-ów specjalnych z wybranej aplikacji."</string>
@@ -4207,6 +4234,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacje do obsługi filmów i TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacje o obsłudze administracyjnej operatora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Uruchom obsługę administracyjną operatora"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co nowego i fajnego?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Poznaj swój nowy telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Poznaj swój nowy tablet"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 2251c00..d478f6f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permita que seu tablet se comunique com dispositivos Bluetooth nas proximidades"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Não é possível redefinir os eSIMs"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Não é possível redefinir os eSIMs devido a um erro."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Toque e notificação desativados"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Toque e notificação definidos para um nível baixo"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Toque e notificação definidos para um nível médio"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de apps desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso do dispositivo desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria está em boas condições"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Os apps estão sendo executados normalmente"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Os apps estão sendo executados normalmente"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"O smartphone tem um consumo normal de bateria em segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"O tablet tem um consumo normal de bateria em segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"O dispositivo tem um consumo normal de bateria em segundo plano"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Baixa capacidade de bateria"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A bateria não pode oferecer uma boa duração"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Melhore a duração da bateria do seu smartphone"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet usado além do normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Dispositivo usado além do normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"A bateria pode acabar em breve"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Seu smartphone foi usado além do normal. É possível que sua bateria acabe antes do esperado.\n\nOs <xliff:g id="NUMBER">%1$d</xliff:g> principais apps desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) são:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Seu tablet foi usado além do normal. É possível que sua bateria acabe antes do esperado.\n\nOs <xliff:g id="NUMBER">%1$d</xliff:g> principais apps desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) são:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Seu dispositivo foi usado além do normal. É possível que sua bateria acabe antes do esperado.\n\nOs <xliff:g id="NUMBER">%1$d</xliff:g> principais apps desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) são:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Restrição ativada para %1$d app</item>
       <item quantity="other">Restrição ativada para %1$d apps</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esse app poderá usar a bateria em segundo plano. É possível que sua bateria acabe antes do esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remover"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Com base no seu uso, sua bateria geralmente dura cerca de <xliff:g id="TIME_DURATION">%1$s</xliff:g> quando está totalmente carregada.\n\nSe você precisar aumentar a duração da bateria, ative a Economia de bateria."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Se precisar aumentar a duração da bateria, ative a Economia de bateria"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no smartphone.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no tablet.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no dispositivo.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gerenciador de bateria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gerenciar apps automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitar bateria para os apps que você não usa com frequência"</string>
@@ -3075,15 +3087,14 @@
     <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">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restringir notificações"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando o \"Não perturbe\" estiver ativado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificações"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Quando o modo Não perturbe estiver ativado"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Desativar notificações"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostrar notificações, mas sem som e vibrações"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Quando houver novas notificações, o smartphone não emitirá som nem vibração"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ocultar e silenciar notificações"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"As notificações não serão exibidas"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Quando o modo Não perturbe estiver ativado, não serão exibidas notificações novas nem existentes. No entanto, as notificações necessárias para atividade e status básicos do smartphone ainda serão exibidas."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificações de forma silenciosa"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"As notificações serão silenciadas"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Quando houver notificações, o smartphone não emitirá nenhum som ou vibração."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificações"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Não serão exibidas notificações novas ou existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Não serão exibidas notificações novas ou existentes no seu smartphone, e ele não emitirá nenhum som ou vibração. As notificações não serão exibidas quando você deslizar a tela de cima para baixo.\n\nObservações importantes: as notificações críticas para atividades e status do smartphone ainda serão exibidas."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizado"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ativar configuração personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remover configuração personalizada"</string>
@@ -3123,7 +3134,7 @@
     <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Ativar / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Desativado"</string>
-    <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Ativar"</string>
+    <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Perguntar sempre (exceto quando ativado automaticamente)"</string>
     <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"Até você desativar (exceto quando ativado automaticamente)"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="1060823390336822337">
@@ -3135,13 +3146,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> regra pode ser ativada automaticamente</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras podem ser ativadas automaticamente</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamento"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceções"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Programação"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Som e vibração"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Quando o \"Não perturbe\" estiver ativado, sons e vibrações serão desativados, com exceção dos itens permitidos por você acima."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Desativar todos os sons, exceto"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Som desativado"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Não silenciado"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Atualizar"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Não atualizar"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Seu smartphone pode ajudar você a manter o foco.\n\nAltere as configurações para:\n\n- ocultar completamente as notificações;\n\n- permitir chamadas repetidas e de contatos com estrela."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Atualizar o modo Não perturbe?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configurações"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Personalize ainda mais em Configurações."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquear quando a tela estiver ligada"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquear quando a tela estiver desligada"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"O Não Perturbe pode fazer mais do que bloquear sons indesejados: ele também bloqueia perturbações visuais. Isso poderá ser útil se você estiver tentando dormir, se concentrar ou limitar o tempo gasto no smartphone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquear sons e perturbações visuais"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Notificações não ligam nem ativam a tela"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Não mostrar notificações, exceto a atividade básica do smartphone e o status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando o \"Não perturbe\" estiver ativado, as chamadas recebidas serão bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Todas as mensagens"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mensagens selecionadas"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensagens"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Algumas mensagens"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Apenas de contatos"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contatos marcados com estrela"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De contatos marcados com estrela e autores de chamadas repetidas"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De contatos e autores de chamadas repetidas"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Apenas de autores de chamadas repetidas"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Mídia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sons de toque"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autores de chamadas selecionados"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"qualquer pessoa"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contatos"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contatos marcados com estrela"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Autores de chamadas repetidas"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Apenas de <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De <xliff:g id="CALLER_TYPE">%1$s</xliff:g> e <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se a mesma pessoa ligar uma segunda vez em um período de <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizados"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ativação automática"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Todas as regras \"Não perturbe\" criadas por esse app serão removidas."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Não otimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Otimizar"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Isso pode esgotar sua bateria mais rapidamente"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para maior duração da bateria."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Permitir que <xliff:g id="APP">%s</xliff:g> ignore as otimizações de bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nenhum"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup desativado"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Atualização disponível"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Impossível alterar config."</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Ação não permitida"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Não é possível alterar o volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Chamada não permitida"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS não permitido"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar informações na tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Suporte e dicas"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Dicas e suporte"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O SMS premium pode gerar custos e será adicionado ao faturamento da sua operadora. Se você conceder permissão para um app, será possível enviar SMS premium usando esse app."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filmes e TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index eba925a..51a87ab 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pedido de acesso ao SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pretende aceder ao seu cartão SIM. Ao conceder acesso ao cartão SIM, desativa a conetividade de dados no seu dispositivo durante a ligação. Fornecer acesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincr. novo dispositivo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Autorize o tablet a comunicar com dispositivos Bluetooth próximos."</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Não é possível repor os eSIMs"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Não é possível repor os eSIMs devido a um erro."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Apagar todos os dados (reposição de dados de fábrica)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Toque e notificação definidos como Desativada"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Toque e notificação definidos como Baixa"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Toque e notificação definidos como Média"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilização do ecrã desde carregamento completo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo do ecrã"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilização de aplicações desde o carregamento completo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilização do dispositivo desde o carregamento completo (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativa o dispositivo em segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita frequentemente a localização"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicações que não estão a funcionar corretamente"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria não apresenta problemas"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"As aplicações estão a ser executadas normalmente."</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Bateria fraca"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria com baixa autonomia"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Melhorar a autonomia da bateria do telemóvel"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet utilizado mais do que o habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Dispositivo utilizado mais do que o habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Pode ficar sem bateria em breve."</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"O seu telemóvel foi utilizado mais do que o habitual. Pode ficar sem bateria mais cedo do que o esperado.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> principais aplicações desde o último carregamento completo (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"O seu tablet foi utilizado mais do que o habitual. Pode ficar sem bateria mais cedo do que o esperado.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> principais aplicações desde o último carregamento completo (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"O seu dispositivo foi utilizado mais do que o habitual. Pode ficar sem bateria mais cedo do que o esperado.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> principais aplicações desde o último carregamento completo (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Restringir %1$d aplicações</item>
       <item quantity="one">Restringir %1$d aplicação</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esta aplicação poderá utilizar a bateria em segundo plano e, por conseguinte, pode ficar sem bateria mais cedo do que o esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remover"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Com base na sua utilização, a bateria dura, normalmente, <xliff:g id="TIME_DURATION">%1$s</xliff:g> com uma carga completa.\n\nSe precisar de prolongar a autonomia da bateria, ative a Poupança de bateria."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Se precisar de prolongar a autonomia da bateria, ative a Poupança de bateria."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gerir aplicações automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitar a bateria para as aplicações que não utiliza frequentemente"</string>
@@ -3075,15 +3094,14 @@
     <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">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restringir notificações"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando o modo Não incomodar está ativado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificações"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Quando o modo Não incomodar está ativado"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Desativar o som de notificações"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostrar as notificações, mas desativar os sons e as vibrações."</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"O telemóvel não emite sons nem vibra quando receber novas notificações."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ocultar e desativar o som de notificações"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"As notificações nunca são apresentadas."</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Quando o modo Não incomodar está ativado, não vê notificações novas nem existentes. No entanto, as notificações necessárias para o estado e a atividade básica do telemóvel continuam a ser apresentadas."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificações sem som"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"O som das notificações é desativado."</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"O telemóvel não emite sons nem vibra quando recebe notificações."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificações"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Não verá notificações novas ou existentes."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"O telemóvel não apresenta notificações novas ou existentes e não emite sons nem vibra. As notificações não são apresentadas quando deslizar rapidamente a partir da parte superior do ecrã.\n\nTenha em atenção que as notificações críticas relativas à atividade e ao estado do telemóvel continuam a ser apresentadas."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizadas"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ativar definição personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remover definição personalizada"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras podem ser ativadas automaticamente.</item>
       <item quantity="one">1 regra pode ser ativada automaticamente.</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamento"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceções"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Horário"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Som e vibração"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Quando o modo Não incomodar está ativo, o som e a vibração são desativados, exceto para os itens que permitir acima."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Desativar tudo exceto"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Desativados"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Não desativados"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Desativado, mas permitir <xliff:g id="SOUND_TYPE">%1$s</xliff:g>."</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Desativado, mas permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>."</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Desativado, mas permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando o modo Não incomodar está ativo, o som de mensagens, lembretes e eventos é desativado, exceto para os itens que permitir acima. Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Atualizar"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Não atualizar"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"O seu telemóvel pode fazer mais para o ajudar a concentrar-se.\n\nAtualize as definições para:\n\n- Ocultar completamente as notificações\n\n- Permitir chamadas de contactos marcados com uma estrela e de autores de chamadas repetentes"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Pretende atualizar o modo Não incomodar?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Definições"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Pode personalizar ainda mais nas Definições."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquear quando o ecrã está ligado"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquear quando o ecrã está desligado"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Para além de bloquear sons indesejados, o modo Não incomodar também pode bloquear imagens. Isto pode ser útil se estiver a tentar dormir, a concentrar-se ou a limitar o tempo despendido no telemóvel."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquear sons e imagens"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Não ligar o ecrã nem ativar para notificações"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Não mostrar notificações, exceto o estado e a atividade básica do telemóvel."</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"De <xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando o modo Não incomodar está ativo, as chamadas recebidas são bloqueadas. Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Todas as mensagens"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mensagens selecionadas"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensagens"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Algumas mensagens"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Apenas de contactos"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contactos com estrela"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De contactos marcados com uma estrela ou de autores de chamadas repetentes"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De contactos e autores de chamadas repetentes"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Apenas de autores de chamadas repetentes"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Multimédia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sons de toque"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autores das chamadas selecionados"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"qualquer pessoa"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contactos"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contactos marcados com estrela"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Autores de chamadas repetentes"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Apenas de <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De <xliff:g id="CALLER_TYPE">%1$s</xliff:g> e de <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se a mesma pessoa telefonar uma segunda vez num período de <xliff:g id="MINUTES">%d</xliff:g> minutos"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizado"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ligar autom."</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Serão removidas todas as regras Não incomodar criadas por esta aplicação."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Não otimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Otimizar"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"A bateria pode descarregar mais rapidamente"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para aumentar a duração da bateria"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Permitir que <xliff:g id="APP">%s</xliff:g> ignore as otimizações da bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nenhuma"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Cópia de segurança desativada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Atualização disponível."</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Impossível alterar a definição"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Ação não permitida"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Impossível alterar o volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"As chamadas não são permitidas"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Os SMS não são permitidos"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar as informações no ecrã de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar conteúdo de notificações"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Apoio técnico e sugestões"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Sugestões e apoio técnico"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"A menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhuma aplicação instalada solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O serviço de SMS premium pode custar dinheiro e, nesse caso, será adicionado às faturas do seu operador. Se ativar a autorização para uma aplicação, poderá enviar SMS premium através da mesma."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicações de filmes e TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de fornecimento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar fornecimento do operador"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quais são as grandes novidades?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça uma visita guiada ao seu novo telemóvel"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça uma visita guiada ao seu novo tablet"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2251c00..d478f6f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permita que seu tablet se comunique com dispositivos Bluetooth nas proximidades"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Não é possível redefinir os eSIMs"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Não é possível redefinir os eSIMs devido a um erro."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Limpar todos os dados (redefinição para configuração original)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Toque e notificação desativados"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Toque e notificação definidos para um nível baixo"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Toque e notificação definidos para um nível médio"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Uso de apps desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Uso do dispositivo desde a última carga completa (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria está em boas condições"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Os apps estão sendo executados normalmente"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Os apps estão sendo executados normalmente"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"O smartphone tem um consumo normal de bateria em segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"O tablet tem um consumo normal de bateria em segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"O dispositivo tem um consumo normal de bateria em segundo plano"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Baixa capacidade de bateria"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A bateria não pode oferecer uma boa duração"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Melhore a duração da bateria do seu smartphone"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet usado além do normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Dispositivo usado além do normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"A bateria pode acabar em breve"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Seu smartphone foi usado além do normal. É possível que sua bateria acabe antes do esperado.\n\nOs <xliff:g id="NUMBER">%1$d</xliff:g> principais apps desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) são:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Seu tablet foi usado além do normal. É possível que sua bateria acabe antes do esperado.\n\nOs <xliff:g id="NUMBER">%1$d</xliff:g> principais apps desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) são:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Seu dispositivo foi usado além do normal. É possível que sua bateria acabe antes do esperado.\n\nOs <xliff:g id="NUMBER">%1$d</xliff:g> principais apps desde a última carga completa (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) são:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Restrição ativada para %1$d app</item>
       <item quantity="other">Restrição ativada para %1$d apps</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esse app poderá usar a bateria em segundo plano. É possível que sua bateria acabe antes do esperado."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Remover"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Com base no seu uso, sua bateria geralmente dura cerca de <xliff:g id="TIME_DURATION">%1$s</xliff:g> quando está totalmente carregada.\n\nSe você precisar aumentar a duração da bateria, ative a Economia de bateria."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Se precisar aumentar a duração da bateria, ative a Economia de bateria"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no smartphone.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no tablet.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Seus apps estão consumindo uma quantidade normal de bateria. Se eles consumirem muita bateria, serão sugeridas ações no dispositivo.\n\nSe a bateria estiver acabando, você poderá ativar a Economia de bateria."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Gerenciador de bateria"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gerenciar apps automaticamente"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitar bateria para os apps que você não usa com frequência"</string>
@@ -3075,15 +3087,14 @@
     <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">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restringir notificações"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando o \"Não perturbe\" estiver ativado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificações"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Quando o modo Não perturbe estiver ativado"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Desativar notificações"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Mostrar notificações, mas sem som e vibrações"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Quando houver novas notificações, o smartphone não emitirá som nem vibração"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ocultar e silenciar notificações"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"As notificações não serão exibidas"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Quando o modo Não perturbe estiver ativado, não serão exibidas notificações novas nem existentes. No entanto, as notificações necessárias para atividade e status básicos do smartphone ainda serão exibidas."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificações de forma silenciosa"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"As notificações serão silenciadas"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Quando houver notificações, o smartphone não emitirá nenhum som ou vibração."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificações"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Não serão exibidas notificações novas ou existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Não serão exibidas notificações novas ou existentes no seu smartphone, e ele não emitirá nenhum som ou vibração. As notificações não serão exibidas quando você deslizar a tela de cima para baixo.\n\nObservações importantes: as notificações críticas para atividades e status do smartphone ainda serão exibidas."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizado"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ativar configuração personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remover configuração personalizada"</string>
@@ -3123,7 +3134,7 @@
     <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Ativar / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Desativado"</string>
-    <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Ativar"</string>
+    <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Perguntar sempre (exceto quando ativado automaticamente)"</string>
     <string name="zen_mode_duration_summary_forever" msgid="3144786357459137066">"Até você desativar (exceto quando ativado automaticamente)"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="1060823390336822337">
@@ -3135,13 +3146,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> regra pode ser ativada automaticamente</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras podem ser ativadas automaticamente</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamento"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Exceções"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Programação"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Som e vibração"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Quando o \"Não perturbe\" estiver ativado, sons e vibrações serão desativados, com exceção dos itens permitidos por você acima."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Desativar todos os sons, exceto"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Som desativado"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Não silenciado"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> e <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Atualizar"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Não atualizar"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Seu smartphone pode ajudar você a manter o foco.\n\nAltere as configurações para:\n\n- ocultar completamente as notificações;\n\n- permitir chamadas repetidas e de contatos com estrela."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Atualizar o modo Não perturbe?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configurações"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Personalize ainda mais em Configurações."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Bloquear quando a tela estiver ligada"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Bloquear quando a tela estiver desligada"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"O Não Perturbe pode fazer mais do que bloquear sons indesejados: ele também bloqueia perturbações visuais. Isso poderá ser útil se você estiver tentando dormir, se concentrar ou limitar o tempo gasto no smartphone."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Bloquear sons e perturbações visuais"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Notificações não ligam nem ativam a tela"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Não mostrar notificações, exceto a atividade básica do smartphone e o status"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> a <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chamadas"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando o \"Não perturbe\" estiver ativado, as chamadas recebidas serão bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Todas as mensagens"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mensagens selecionadas"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensagens"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Algumas mensagens"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Apenas de contatos"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contatos marcados com estrela"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De contatos marcados com estrela e autores de chamadas repetidas"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De contatos e autores de chamadas repetidas"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Apenas de autores de chamadas repetidas"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Mídia"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sons de toque"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Autores de chamadas selecionados"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"qualquer pessoa"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"contatos"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"contatos marcados com estrela"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Autores de chamadas repetidas"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Apenas de <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De <xliff:g id="CALLER_TYPE">%1$s</xliff:g> e <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Se a mesma pessoa ligar uma segunda vez em um período de <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizados"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ativação automática"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Todas as regras \"Não perturbe\" criadas por esse app serão removidas."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Não otimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Otimizar"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Isso pode esgotar sua bateria mais rapidamente"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para maior duração da bateria."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Permitir que <xliff:g id="APP">%s</xliff:g> ignore as otimizações de bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nenhum"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backup desativado"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Atualização disponível"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Impossível alterar config."</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Ação não permitida"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Não é possível alterar o volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Chamada não permitida"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS não permitido"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Controlar informações na tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Suporte e dicas"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Dicas e suporte"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O SMS premium pode gerar custos e será adicionado ao faturamento da sua operadora. Se você conceder permissão para um app, será possível enviar SMS premium usando esse app."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filmes e TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1ae3c72..cef0697 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -168,6 +168,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitare de acces la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dorește să acceseze cardul SIM. Dacă acordați accesul la cardul SIM, conexiunea de date de pe dispozitiv va fi dezactivată pe durata conectării. Acordați accesul pentru <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Vizibil ca „<xliff:g id="DEVICE_NAME">^1</xliff:g>” pentru alte dispozitive"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dispozitivele dvs."</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Asociați un nou dispozitiv"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permiteți tabletei să comunice cu dispozitivele Bluetooth din apropiere"</string>
@@ -1466,6 +1468,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Cardurile eSIM nu se pot reseta"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Cardurile eSIM nu pot fi resetate din cauza unei erori."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteți conectat(ă) la următoarele conturi:\n"</string>
@@ -2018,6 +2022,8 @@
       <item quantity="other">Întârziere foarte lungă (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Întârziere foarte lungă (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Vibrații dezactivate pentru sonerie și notificări"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Vibrații scăzute setate pentru sonerie și notificări"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Vibrații medii setate pentru sonerie și notificări"</string>
@@ -2127,8 +2133,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilizarea ecranului de la încărcare"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumul ecranului"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanarea rețelei mobile"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Utilizarea de către aplicații de la ultima încărcare (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Utilizarea dispozitivului de la ultima încărcare completă (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2159,8 +2165,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Se activează dispozitivul în fundal"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se solicită frecvent locația"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicații funcționează incorect"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateria este în stare bună"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplicațiile rulează normal"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Aplicațiile rulează normal"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonul determină o utilizare normală a bateriei în fundal"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tableta determină o utilizare normală a bateriei în fundal"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Dispozitivul determină o utilizare normală a bateriei în fundal"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacitate redusă a bateriei"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria nu poate asigura o autonomie bună"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Îmbunătățiți autonomia bateriei telefonului"</string>
@@ -2175,9 +2183,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tabletă folosită mai mult decât de obicei"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Dispozitiv folosit mai mult decât de obicei"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Este posibil ca bateria să se descarce în curând"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefonul a fost utilizat mai mult decât de obicei. Este posibil ca bateria să se descarce mai repede decât vă așteptați.\n\nCele mai bune <xliff:g id="NUMBER">%1$d</xliff:g> aplicații de la ultima încărcare completă (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tableta a fost utilizată mai mult decât de obicei. Este posibil ca bateria să se descarce mai repede decât vă așteptați.\n\nCele mai bune <xliff:g id="NUMBER">%1$d</xliff:g> aplicații de la ultima încărcare completă (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Dispozitivul a fost utilizat mai mult decât de obicei. Este posibil ca bateria să se descarce mai repede decât vă așteptați.\n\nCele mai bune <xliff:g id="NUMBER">%1$d</xliff:g> aplicații de la ultima încărcare completă (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="few">Restricționați %1$d aplicații</item>
       <item quantity="other">Restricționați %1$d de aplicații</item>
@@ -2211,8 +2222,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Această aplicație va putea utiliza bateria în fundal. Bateria se poate descărca mai repede decât vă așteptați."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Eliminați"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Anulați"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"În baza utilizării, autonomia bateriei dvs. este de aproximativ <xliff:g id="TIME_DURATION">%1$s</xliff:g> când este încărcată complet.\n\nDacă trebuie să prelungiți durata de viață a bateriei, activați Economisirea bateriei."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Dacă trebuie să prelungiți durata de viață a bateriei, activați Economisirea bateriei"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Aplicațiile consumă un procent normal de baterie. Dacă aplicațiile consumă prea multă baterie, telefonul va sugera acțiuni posibile.\n\nPuteți oricând să activați Economisirea bateriei dacă aceasta se descarcă."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Aplicațiile consumă un procent normal de baterie. Dacă aplicațiile consumă prea multă baterie, tableta va sugera acțiuni posibile.\n\nPuteți oricând să activați Economisirea bateriei dacă aceasta se descarcă."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Aplicațiile consumă un procent normal de baterie. Dacă aplicațiile consumă prea multă baterie, dispozitivul va sugera acțiuni posibile.\n\nPuteți oricând să activați Economisirea bateriei dacă aceasta se descarcă."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Gestionați automat aplicațiile"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitați utilizarea bateriei de către aplicațiile pe care nu le utilizați frecvent"</string>
@@ -3110,15 +3122,14 @@
     <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">"Blocați întreruperile vizuale"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permiteți semnale vizuale"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Restricționați notificările"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Când este activată setarea „Nu deranja”"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificări"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Când este activată setarea „Nu deranja”"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Ignorați notificările"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Afișați notificările, dar ignorați sunetele și vibrațiile"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Când sosesc notificări noi, telefonul nu va scoate niciun sunet și nu va vibra"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ascundeți și ignorați notificările"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Notificările nu vor apărea deloc"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Nu veți vedea notificări noi sau existente atunci când este activată setarea „Nu deranja”. Totuși, notificările necesare pentru activitatea de bază a telefonului și starea acestuia vor apărea în continuare."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Afișați notificările cu sunet dezactivat"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Sunetul pentru notificări va fi dezactivat"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Când sosesc notificările, telefonul nu va scoate niciun sunet și nu va vibra."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ascundeți notificările"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nu veți vedea notificări noi sau existente"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonul nu va afișa notificări noi sau existente, nu va emite niciun sunet și nu va vibra. Nu se vor afișa notificările când glisați în jos din partea de sus a ecranului.\n\nRețineți: se vor afișa totuși notificările foarte importante pentru activitatea și starea telefonului."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizat"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activați setarea personalizată"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Eliminați setarea personalizată"</string>
@@ -3172,13 +3183,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> de reguli se pot activa automat</item>
       <item quantity="one">O regulă se poate activa automat</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportament"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Excepții"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Program"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Sunete și vibrații"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Când este activată funcția Nu deranja, sunetele și vibrațiile vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Dezactivați sunetul pentru toate, cu excepția"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Sunet dezactivat"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Sunetul nu este dezactivat"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Sunetul este dezactivat, dar permiteți <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Sunetul este dezactivat, dar permiteți <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> și <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Sunetul este dezactivat, dar permiteți <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> și <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesaje, evenimente și mementouri"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Când este activată funcția Nu deranja, sunetele pentru mesaje, mementouri și evenimente vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus. Puteți să modificați setările pentru mesaje ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Actualizați"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Nu actualizați"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefonul poate face mai multe pentru a vă ajuta să vă concentrați.\n\nActualizați setările ca să:\n\n- ascundeți complet notificările;\n\n- permiteți apelurile de la persoanele de contact marcate cu stea și apelanții care revin."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Actualizați funcția Nu deranja?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Setări"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Puteți personaliza și mai mult această opțiune în Setări."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blocați când ecranul este activat"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blocați când ecranul este dezactivat"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Funcția Nu deranja poate face mai mult decât să blocheze sunetele nedorite - poate bloca și imaginile. Opțiunea se poate dovedi utilă dacă încercați să dormiți, să vă concentrați sau să limitați timpul petrecut pe telefon."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blocați sunetele și imaginile"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Nu porniți ecranul și nu îl activați pentru notificări"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Nu afișați nicio notificare, cu excepția celor privind starea și activitatea de bază a telefonului"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sunetele profilului de serviciu"</string>
@@ -3353,21 +3378,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Între <xliff:g id="START">%1$s</xliff:g> și <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Apeluri"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Când este activată funcția Nu deranja, apelurile primite sunt blocate. Puteți să modificați setările ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesaje"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Toate mesajele"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mesajele selectate"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesaje"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Anumite mesaje"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De la oricine"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Doar de la persoanele de contact"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Doar de la persoanele de contact cu stea"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"De la persoanele de contact marcate cu stea și de la apelanții care revin"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"De la persoanele de contact și apelanții care revin"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Doar de la apelanții care revin"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Niciunul"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarme"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sunete la atingere"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mementouri"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenimente"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Toți apelanții"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Apelanți selectați"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"oricine"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"agendă"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"persoane din agendă marcate cu stea"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Apelanți care revin"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Doar de la <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"De la <xliff:g id="CALLER_TYPE">%1$s</xliff:g> și <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g> minute"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizat"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activați automat"</string>
@@ -3647,7 +3682,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Toate regulile din modul Nu deranja create de această aplicație vor fi eliminate."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Nu se optimizează"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Se optimizează"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Bateria se poate descărca mai repede"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomandată pentru o autonomie mai bună a bateriei"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Permiteți ca <xliff:g id="APP">%s</xliff:g> să ignore optimizările pentru baterie?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Niciuna"</string>
@@ -3724,7 +3760,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Backupul este dezactivat"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualizat la Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualizare disponibilă"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Nu se poate modifica setarea"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Acțiunea nu este permisă"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Nu se poate modifica volumul"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Apelarea nu are permisiune"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-urile nu au permisiune"</string>
@@ -3920,7 +3956,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Controlați informațiile de pe ecranul de blocare"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afișați sau ascundeți conținutul notificării"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Toate"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Asistență și sfaturi"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Sfaturi și asistență"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Cea mai mică lățime"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nicio aplicație instalată nu a solicitat accesul la SMS-urile premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS-urile premium pot genera costuri care se vor adăuga la factura operatorului. Dacă activați permisiunea pentru o aplicație, veți putea trimite SMS-uri premium folosind acea aplicație."</string>
@@ -4123,6 +4159,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicații pentru filme și emisiuni TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informații despre provizionarea operatorului"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Declanșați provizionarea operatorului"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ce este nou și interesant?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faceți un tur al noului dvs. telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faceți un tur al noii dvs. tablete"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3958015..7c7467c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запрос на доступ к SIM-карте"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Устройство \"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" запрашивает доступ к вашей SIM-карте. Если вы его предоставите, будет установлено соединение, на время которого будут отключены все сервисы передачи данных. Открыть доступ устройству \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Название в списке устройств: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши устройства"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Подключение нового устройства"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Разрешить планшету обмениваться данными с другими устройствами Bluetooth."</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Произошла ошибка"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Не удалось сбросить eSIM."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Удалить все данные (сброс к заводским настройкам)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты на этом устройстве:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="many">Очень долгая задержка (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мсек.)</item>
       <item quantity="other">Очень долгая задержка (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мсек.)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Вибрация при входящих вызовах и уведомлениях отключена"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Включена слабая вибрация при входящих вызовах и уведомлениях"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Включена средняя вибрация при входящих вызовах и уведомлениях"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Использование экрана с момента полной зарядки"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потребление энергии экраном"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Использование приложений с момента полной зарядки (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Использование устройства с момента полной зарядки (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Спящий режим отключается в фоновом режиме"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Устройство слишком часто запрашивает данные о местоположении"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Количество неправильно работающих приложений: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарея в хорошем состоянии"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Приложения работают нормально"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Низкая емкость батареи"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Время работы устройства без подзарядки сильно ограничено."</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Продлите время работы батареи"</string>
@@ -2197,9 +2209,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Планшет используется больше, чем обычно"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Устройство используется больше, чем обычно"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Батарея скоро разрядится"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Телефон используется больше, чем обычно. Батарея скоро разрядится.\n\nТоп-<xliff:g id="NUMBER">%1$d</xliff:g> приложений с высоким потреблением энергии (с момента последней зарядки <xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Планшет используется больше, чем обычно. Батарея скоро разрядится.\n\nТоп-<xliff:g id="NUMBER">%1$d</xliff:g> приложений с высоким потреблением энергии (с момента последней зарядки <xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Устройство используется больше, чем обычно. Батарея скоро разрядится.\n\nТоп-<xliff:g id="NUMBER">%1$d</xliff:g> приложений с высоким потреблением энергии (с момента последней зарядки <xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Необходимо ограничить работу %1$d приложения</item>
       <item quantity="few">Необходимо ограничить работу %1$d приложений</item>
@@ -2238,8 +2253,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Это приложение будет расходовать заряд батареи в фоновом режиме. Устройство разрядится быстрее, чем обычно."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Отменить"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Отмена"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"При текущем уровне использования полного заряда обычно хватает на <xliff:g id="TIME_DURATION">%1$s</xliff:g>\n\nЧтобы увеличить время работы от батареи, включите режим энергосбережения."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Чтобы увеличить время работы от батареи, включите режим энергосбережения."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Автоматическое управление приложениями"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ограничить работу редко используемых приложений"</string>
@@ -3145,15 +3164,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Включить визуальное оповещение"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ограничения для уведомлений"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Режим \"Не беспокоить\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Уведомления"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Когда включен режим \"Не беспокоить\""</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Отключить звук уведомлений"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Показывать уведомления, но отключить для них звук и вибрацию."</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Новые уведомления будут приходить без звука и вибрации."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Скрывать уведомления и получать их без звука"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Не показывать уведомления."</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"При включенном режиме \"Не беспокоить\" будут скрываться все уведомления, кроме тех, которые необходимы для работы основных функций телефона."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Показывать без звука"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Уведомления будут приходить без звука."</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Уведомления будут приходить без звука и вибрации."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Скрывать уведомления"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Существующие и новые уведомления показываться не будут."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Существующие и новые уведомления показываться не будут. Звук и вибрация будут отключены. Также уведомления не будут появляться, если вы проводите пальцем по экрану сверху вниз.\n\nОбратите внимание, что вы будете получать важные уведомления, которые необходимы для работы основных функций телефона."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Специальные настройки"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Включить специальные настройки"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Отключить специальные настройки"</string>
@@ -3209,13 +3227,27 @@
       <item quantity="many">Можно автоматически включить <xliff:g id="ON_COUNT">%d</xliff:g> правил.</item>
       <item quantity="other">Можно автоматически включить <xliff:g id="ON_COUNT">%d</xliff:g> правила.</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ОК"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Действия"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Исключения"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Расписание"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Звук и вибрация"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"В режиме \"Не беспокоить\" будут отключены звук и вибрация, за исключением случаев, для которых вы настроите разрешения выше."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Все без звука, кроме"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Без звука"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Со звуком"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Без звука, кроме: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Без звука, кроме: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> и <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Без звука, кроме: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Сообщения, напоминания и уведомления о мероприятиях"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука, за исключением тех, для которых вы задали разрешения выше. Вы можете изменить настройки, чтобы сообщения от друзей, членов семьи и других контактов приходили со звуком."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Включить"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Не включать"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Телефон поможет вам не отвлекаться.\n\nВыберите настройку:\n\n– скрывать все уведомления;\n\n– показывать звонки от избранных контактов и повторные звонки."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Включить режим \"Не беспокоить\"?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Настройки"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Изменить другие параметры этой функции можно в разделе настроек."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"При включенном экране"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"При отключенном экране"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"В режиме \"Не беспокоить\" отключаются не только звуковые, но и текстовые оповещения. Эту функцию удобно использовать, когда вы хотите заснуть, сконцентрироваться на чем-то важном или просто меньше пользоваться телефоном."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Отключить звуковые и текстовые оповещения"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Не включать экран и не показывать уведомления"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Показывать уведомления только для основных функций телефона"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Сигналы в рабочем профиле"</string>
@@ -3394,21 +3426,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"с <xliff:g id="START">%1$s</xliff:g> по <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Вызовы"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"В режиме \"Не беспокоить\" входящие вызовы заблокированы. Вы можете изменить настройки, чтобы принимать вызовы от друзей, членов семьи и других контактов."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Сообщения"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Все сообщения"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Выбранные сообщения"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Сообщения"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Некоторые сообщения"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"От кого угодно"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Только от контактов"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Только от помеченных контактов"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Вызовы от помеченных контактов и от людей, звонящих повторно"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Звонки от контактов и повторные звонки"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Вызовы только от людей, звонящих повторно"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ни от кого"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Мультимедиа"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Звук нажатия на экран"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напоминания"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Мероприятия"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Все абоненты"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбранные абоненты"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"Все"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"контакты"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"помеченные контакты"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторные вызовы"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Вызовы только от этих пользователей: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Вызовы только от этих пользователей: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> и <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Если абонент звонит повторно в течение <xliff:g id="MINUTES">%d</xliff:g> мин."</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Пользовательские"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Включать автоматически"</string>
@@ -3698,7 +3740,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Все правила режима \"Не беспокоить\", созданные этим приложением, будут удалены."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Не экономить"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Экономить"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Батарея может разрядиться быстрее."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Рекомендуется для увеличения времени работы устройства от батареи."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Не ограничивать расход заряда батареи в приложении \"<xliff:g id="APP">%s</xliff:g>\"?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Нет"</string>
@@ -3776,7 +3819,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Резервное копирование отключено"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Обновлено до Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Доступно обновление"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Невозможно изменить настройку"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Действие запрещено"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Невозможно изменить громкость"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Звонки запрещены"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Отправка SMS запрещена"</string>
@@ -3978,7 +4021,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Выберите параметры для информации на заблокированном экране"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Скрыть или показать содержание уведомлений"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Все"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Помощь и советы"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Помощь и советы"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Минимальная ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Установленные приложения не запрашивали доступ к платным SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Обратите внимание, что такие SMS могут оплачиваться дополнительно. Предоставив разрешение приложению, вы сможете отправлять платные SMS с его помощью."</string>
@@ -4191,6 +4234,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Фильмы и сериалы"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Сведения об операторе"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Запустить синхронизацию оператора"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Что нового?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Познакомьтесь со своим новым телефоном"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Познакомьтесь со своим новым планшетом"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 643ca1b..f59f771 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM කාඩ්පත් ප්‍රවේශය ඉල්ලීම"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> හට ඔබේ SIM කාඩ්පත වෙත පිවිසීමට අවශ්‍යයි. SIM කාඩ්පතට ප්‍රවේශය ලබා දිම ඔබේ උපාංගයට සබැඳුම් කාල සීමාව සඳහා දත්ත සබැඳුම් හැකියාව අබල කරනු ඇත. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> වෙත ප්‍රවේශය ලබා දෙන්න"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"වෙනත් උපාංගවලට <xliff:g id="DEVICE_NAME">^1</xliff:g> ලෙස දෘශ්‍යමානයි"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ඔබගේ උපාංග"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"නව උපාංගය යුගල කර."</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ඔබගේ ටැබ්ලට් උපාංගයට අවට බ්ලූටූත් උපාංග සමඟ සන්නිවේදනයට ඉඩ දෙන්න"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM නැවත සැකසිය නොහැකිය"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"දෝෂයක් හේතුවෙන් මෙම eSIM නැවත සැකසිය නොහැකිය."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචනය"</b>", සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"මෙය ඔබගේ දුරකථනයේ "<b>"අභ්‍යන්තර ගබඩාවේ"</b>" සියලු දත්ත මකයි:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත යෙදුම්"</li>" අන්තර්ගතය."</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">ඉතා දිගු ප්‍රමාදය (මිලිතත්පර <xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>)</item>
       <item quantity="other">ඉතා දිගු ප්‍රමාදය (මිලිතත්පර <xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"නාද සහ දැනුම්දීම ක්‍රියාවිරහිත ලෙස සකසා ඇත"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"නාද සහ දැනුම්දීම පහළට සකසා ඇත"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"නාද සහ දැනුම්දීම මධ්‍යම ලෙස සකසා ඇත"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"පූර්ණ ආරෝපණයෙන් පසුව තිර භාවිතය"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"තිර පරිභෝජනය"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ජංගම ජාල පරිලෝකනය කරමින්"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"පූර්ණ ආරෝපණයේ සිට යෙදුම භාවිතය (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"පූර්ණ ආරෝපණයේ සිට උපාංග භාවිතය (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"පසුබිමින් උපාංගය අවදි කරමින්"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"නිතර ස්ථානය ඉල්ලා සිටිමින්"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"යෙදුම් <xliff:g id="NUMBER">%1$d</xliff:g>ක් වැරදි ලෙස හැසිරෙමින්"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"බැටරිය හැඩයෙන් හොඳ තත්ත්වයේ පවතී"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"යෙදුම් සාමාන්‍ය පරිදි ධාවනය වේ"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"යෙදුම් සාමාන්‍ය පරිදි ධාවනය වේ"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"දුරකථනයට දර්ශීය පසුබිම් බැටරි භාවිතයක් ඇත"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ටැබ්ලට් උපාංගයට දර්ශීය පසුබිම් බැටරි භාවිතයක් ඇත"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"උපාංගයට දර්ශීය පසුබිම් බැටරි භාවිතයක් ඇත"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"අඩු බැටරි ධාරිතාව"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"බැටරියට හොඳ බැටරි ආයු කාලයක් ලබා දිය නොහැකිය"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"දුරකථනයේ බැටරි ආයු කාලය වැඩි දියුණු කරන්න"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ටැබ්ලට් උපාංගය සාමාන්‍යයට වඩා වැඩියෙන් භාවිත කර ඇත"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"උපාංගය සාමාන්‍යයට වඩා වැඩියෙන් භාවිත කර ඇත"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"බැටරිය ඉක්මනින් අවසන් විය හැකිය"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"ඔබේ දුරකථනය සාමාන්‍යයට වඩා වැඩියෙන් භාවිත කර ඇත. ඔබගේ බැටරිය බලාපොරොත්තු වූවාට වඩා ඉක්මනින් අවසන් වේ. අවසන් ආරෝපණය කිරීමේ සිට \n\nඉහළම <xliff:g id="NUMBER">%1$d</xliff:g> යෙදුම්(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"ඔබේ ටැබ්ලට් පරිගණකය සාමාන්‍යයට වඩා වැඩියෙන් භාවිත කර ඇත. ඔබගේ බැටරිය බලාපොරොත්තු වූවාට වඩා ඉක්මනින් අවසන් වේ. අවසන් ආරෝපණය කිරීමේ සිට \n\nඉහළම <xliff:g id="NUMBER">%1$d</xliff:g> යෙදුම්(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"ඔබේ උපාංගය සාමාන්‍යයට වඩා වැඩියෙන් භාවිත කර ඇත. ඔබගේ බැටරිය බලාපොරොත්තු වූවාට වඩා ඉක්මනින් අවසන් වේ. අවසන් ආරෝපණය කිරීමේ සිට \n\nඉහළම <xliff:g id="NUMBER">%1$d</xliff:g> යෙදුම්(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">යෙදුම් %1$dක් සීමා කරන්න</item>
       <item quantity="other">යෙදුම් %1$dක් සීමා කරන්න</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"මෙම යෙදුමට පසුබිමින් බැටරිය භාවිත කිරීමට හැකි වනු ඇත. ඔබේ බැටරිය බලාපොරොත්තු වනවාට වඩා ඉක්මනින් අවසන් විය හැකිය."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"ඉවත් කරන්න"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"අවලංගු කරන්න"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ඔබගේ භාවිතය මත පදනම්ව, ඔබේ බැටරිය සම්පූර්ණයෙන්ම ආරෝපණය කළ විට සාමාන්‍යයෙන් <xliff:g id="TIME_DURATION">%1$s</xliff:g>ක් පමණ පවතී. \n\nඔබට ඔබේ බැටරි ආයු කාලය දිගු කිරීමට අවශ්‍ය නම්, බැටරි සුරැකුම ක්‍රියාත්මක කරන්න."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"ඔබට ඔබේ බැටරි ආයු කාලය දිගු කිරීමට අවශ්‍ය නම්, බැටරි සුරැකුම ක්‍රියාත්මක කරන්න."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"ඔබගේ යෙදුම් බැටරිය සාමාන්‍ය ප්‍රමාණයක් භාවිතා කරයි. යෙදුම් බැටරිය ඉතා වැඩියෙන් භාවිතා කරන්නේ නම්, ඔබේ දුරකථනය ඔබට ගත හැකි පියවර යෝජනා කරනු ඇත.\n\nඔබට බැටරිය අඩු වන සෑම විටම බැටරි සුරැකුම ක්‍රියාත්මක කළ හැකිය."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"ඔබගේ යෙදුම් බැටරිය සාමාන්‍ය ප්‍රමාණයක් භාවිතා කරයි. යෙදුම් බැටරිය ඉතා වැඩියෙන් භාවිතා කරන්නේ නම්, ඔබේ ටැබ්ලට් උපාංගය ඔබට ගත හැකි පියවර යෝජනා කරනු ඇත.\n\nඔබට බැටරිය අඩු වන සෑම විටම බැටරි සුරැකුම ක්‍රියාත්මක කළ හැකිය."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"ඔබගේ යෙදුම් බැටරිය සාමාන්‍ය ප්‍රමාණයක් භාවිතා කරයි. යෙදුම් බැටරිය ඉතා වැඩියෙන් භාවිතා කරන්නේ නම්, ඔබේ උපාංගය ඔබට ගත හැකි පියවර යෝජනා කරනු ඇත.\n\nඔබට බැටරිය අඩු වන සෑම විටම බැටරි සුරැකුම ක්‍රියාත්මක කළ හැකිය."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"බැටරි කළමනාකරු"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"යෙදුම් ස්වයංක්‍රියව කළමනාකරණය කරන්න"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ඔබ නිතර භාවිත නොකරන යෙදුම් සඳහා බැටරිය සීමා කරන්න"</string>
@@ -3075,15 +3087,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"දෘශ්‍ය සංඥාවලට ඉඩ දෙන්න"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"දැනුම්දීම් සීමා කරන්න"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"බාධා නොකරන්න ක්‍රියාත්මක විට"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"දැනුම්දීම්"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"බාධා නොකරන්න ක්‍රියාත්මක විට"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"දැනුම්දීම් නිහඬ කරන්න"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"දැනුම්දීම් පෙන්වන්න නමුත් ශබ්ද සහ සහ කම්පනය නිහඬ කරන්න"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"නව දැනුම්දීමක් පැමිණි විට ඔබගේ දුරකථනය ශබ්දයක් හෝ කම්පනයක් ඇති නොකරනු ඇත"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"දැනුම්දීම් සඟවන්න සහ නිහඬ කරන්න"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"දැනුම්දීම් කිසිසේත් දිස් නොවනු ඇත"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"බාධා නොකරන්න ක්‍රියාත්මක විට නව හෝ පවත්නා දැනුම්දීම් ඔබට නොපෙනේ. කෙසේ වෙතත්, මූලික දුරකථන ක්‍රියාකාරකම් සහ තත්ත්වය සඳහා අවශ්‍ය දැනුම්දීම් තවම දිස් වනු ඇත."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"නිශ්ශබ්දව දැනුම්දීම් පෙන්වන්න"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"දැනුම්දීම් නිහඬ කරනු ලැබේ"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"දැනුම්දීම් පැමිණි විට ඔබගේ දුරකථනය ශබ්දයක් හෝ කම්පනයක් ඇති නොකරනු ඇත."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"දැනුම්දීම් සඟවන්න"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"නව හෝ පවත්නා දැනුම් දීම් ඔබ නොදකිනු ඇත"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ඔබගේ දුරකථනය නව හෝ පවතින දැනුම්දීම් නොපෙන්වන අතර, ශබ්ද නැගීම හෝ කම්පනය නොවනු ඇත. ඔබගේ තිරයේ ඉහළ සිට පහළට ස්වයිප් කරන විට දැනුම් දීම් දිස් නොවනු ඇත.\n\n මතක තබා ගන්න, දුරකථන ක්‍රියාකාරකම් සහ තත්ත්වය සඳහා වැදගත් දැනුම්දීම් තවමත් දිස්වනු ඇත."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"අභිරුචි"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"අභිරුචි සැකසීම සබල කරන්න"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"අභිරුචි සැකසීම ඉවත් කරන්න"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="one">රීති <xliff:g id="ON_COUNT">%d</xliff:g>ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය</item>
       <item quantity="other">රීති <xliff:g id="ON_COUNT">%d</xliff:g>ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"හරි"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"හැසිරීම"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ව්‍යතිරේක"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"කාල සටහන"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"ශබ්ද සහ කම්පනය"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"බාධා නොකරන්න ක්‍රියාත්මක විට, ඔබ විසින් අවසර දෙනු ලබන අයිතම සඳහා හැරුණු විට, ශබ්දය සහ කම්පනය නිහඬ වනු ඇත."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"හැර සියල්ල නිහඬ කරන්න"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"නිහඬයි"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"නිහඬ නොවේ"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"නිහඬයි, නමුත් <xliff:g id="SOUND_TYPE">%1$s</xliff:g> හට ඉඩ දෙන්න"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"නිහඬයි, නමුත් <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> සහ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> හට ඉඩ දෙන්න"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"නිහඬයි, නමුත් <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, සහ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> හට ඉඩ දෙන්න"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"පණිවිඩ, සිදුවීම් සහ සිහිැඳවීම්"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"බාධා නොකරන්න ක්‍රියාත්ම විට, ඔබ ඉහත අවසර දෙනු ලබන අයිතම හැරුණු විට, පණිවිඩ, සිහි කැඳවීම් සහ සිදුවීම් අවහිර කරනු ඇත. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ සමග සම්බන්ධ වීමට ඉඩ දීමට පණිවිඩ සැකසීම් සකස් කිරීමට ඔබට හැකිය."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"යාවත්කාලීන කරන්න"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"යාවත්කාලීන නොකරන්න"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"ඔබගේ දුරකථනයට අවධානය යොමු කිරීමට ඔබට වැඩි යමක් කළ හැකිය.\n\nසැකසීම් යාවත්කාලීන කරන්න:\n\n- දැනුම්දීම් මුළුමනින්ම සඟවන්න\n\n- තරු ලකුණු යෙදූ සම්බන්ධතාවලින් සහ නැවත නැවතත් අමතන්නන් වෙතින් වන ඇමතුම්වලට ඉඩ දෙන්න"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"බාධා නොකරන්න යාවත්කාලීන කරන්නද?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"සැකසීම්"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"තවදුරටත් ඔබට මෙය සැකසීම් තුළ අභිරුචි කළ හැකිය."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"තිරය ක්‍රියාත්මක විට අවහිර කරන්න"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"තිරය ක්‍රියාවිරහිත විට අවහිර කරන්න"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"අනවශ්‍ය ශබ්ද අවහිර කිරීමට වඩා වැඩි දෙයක් බාධා නොකරන්නට කළ හැකිය - එය දෘශ්‍යද අවහිර කළ හැකිය. ඔබ දුරකථනයෙහි ගත කරන කාලය නිදා ගැනීමට, අවධානය යොමු කිරීමට හෝ සීමා කිරීමට උත්සාහ කරනවා නම් මෙය ප්‍රයෝජනවත් විය හැකිය."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ශබ්ද සහ දෘශ්‍ය අවහිර කරන්න"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"තිරය ක්‍රියාත්මක නොකරන්න නැතහොත් දැනුම්දීම් සඳහා අවදි නොකරන්න"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"මූලික දුරකථන ක්‍රියාකාරකම් සහ තත්ත්වය හැරුණු විට, දැනුම්දීම් කිසි විටක නොපෙන්වන්න"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"කාර්යාල පැතිකඩ හඬවල්"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> සිට <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ඇමතුම්"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"බාධා නොකරේන ක්‍රියාත්මක විට, එන ඇමතුම් අවහිර වේ. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබව සම්බන්ධ කර ගැනීමට ඔබට සැකසීම් සකස් කළ හැකිය."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"පණිවිඩ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"සියලු පණිවිඩ"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"තෝරාගත් පණිවිඩ"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"පණිවිඩ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"සමහර පණිවිඩ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ඕනෑම අයෙකු වෙතින්"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"සම්බන්ධතා වෙතින් පමණි"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"තරු ලකුණු කළ සම්බන්ධතා වෙතින් පමණි"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"තරු ලකුණු යෙදූ සම්බන්ධතා සහ පුනරාවර්තන ඇමතුම්කරුවන් වෙතින්"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"සම්බන්ධතා සහ පුනරාවර්තන ඇමතුම්කරුවන් වෙතින්"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"පුනරාවර්තන ඇමතුම්කරුවන් වෙතින් පමණි"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"කිසිවක් නැත"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ඇඟවීම්"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"මාධ්‍ය"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ස්පර්ශ ශබ්ද"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"සිහිකැඳවීම්"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"සිදුවීම්"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"සියලු අමතන්නන්"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"තෝරාගත් අමතන්නන්"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ඕනෑම කෙනෙක්"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"සම්බන්ධතා"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"නැවත අමතන්නන්"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> වෙතින් පමණි"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> සහ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> වෙතින් පමණි"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"එකම පුද්ගලයා විනාඩි <xliff:g id="MINUTES">%d</xliff:g>ක කාල සීමාවක් තුළ දෙවන වතාවටත් අමතයි නම්"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"අභිරුචි"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ස්වයන්ක්‍රියව සක්‍රිය කරන්න"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"මෙම යෙදුම විසින් සාදන ලද සියලු බාධා නොකරන්න රීති ඉවත් කරනු ඇත."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ප්‍රශස්තකරණය නොකරන්න"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ප්‍රශස්තකරණය"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ඔබේ බැටරිය වඩාත් ඉක්මනින් අඩු කළ හැකිය"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"වඩා හොඳ බැටරි ආයු කාලයක් සඳහා නිර්දේශිතයි"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> හට බැටරි ප්‍රශස්තකරණ මඟ හැරීමට ඉඩ දෙන්නද?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"කිසිවක් නැත"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"උපස්ථ කිරීම අබලයි"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> වෙත යාවත්කාලීන කරන ලදි"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"යාවත්කාලීනයක් ඇත"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"මෙම සැකසීම වෙනස් කළ නොහැකිය"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ක්‍රියාවට ඉඩ නොදේ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"හඬ පරිමාව වෙනස් කළ නොහැකිය"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ඇමතීමට ඉඩ නොදේ"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS සඳහා ඉඩ නොදේ"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"අගුලු තිරය මත පාලන තොරතුරු"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"දැනුම්දීම් අන්තර්ගතය පෙන්වන්න නැතහොත් සඟවන්න"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"සියලු"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"සහාය සහ ඉඟි"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ඉඟි සහ සහාය"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"කුඩාම පළල"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"කිසිදු ස්ථාපනය කළ යෙදුමක් වාරික SMS ප්රවේශ ඉල්ලා නැත"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"වාරික SMS ඔබෙන් මුදල් අය කළ හැකි අතර ඔබේ වාහක බිල්පතට එක් කරනු ඇත. ඔබ යෙදුමක් සඳහා අවසර සබල කරන්නේ නම්, ඔබට එම යෙදුම භාවිතයෙන් වාරික SMS යැවීමට හැකි වනු ඇත."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"චිත්‍රපටය සහ TV යෙදුම්"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"වාහක ප්‍රතිපාදන තතු"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"උත්ප්‍රේරක වාහක ප්‍රතිපාදන"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"අලුත් සහ උද්යෝගිමත් දේවල් මොනවාද?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ඔබගේ නව දුරකථනය ගැන දැන ගන්න"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ඔබගේ නව ටැබ්ලට් පරිගණකය ගැන දැන ගන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e8dba00..8809dbe 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žiadosť o prístup k SIM karte"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zariadenie <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce pristupovať k vašej SIM karte. Udelenie prístupu k SIM karte zakáže na vašom zariadení dátové pripojenie po dobu jeho trvania. Udeliť prístup zariadeniu <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Viditeľné pre ostatné zariadenia ako <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zariadenia"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Párovanie nového zariadenia"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Povoľte tabletu komunikovať so zariadeniami Bluetooth nablízku"</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM karty sa nedajú obnoviť"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM karty sa nedajú obnoviť, pretože sa vyskytla chyba."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Vymazať dáta (obnova výr. nastavení)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google"</li>\n<li>"dát a nastavení systému a aplikácií"</li>\n<li>"stiahnutých aplikácií"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" telefónu:\n\n"<li>"Účet Google"</li>\n<li>"Dáta a nastavenia systému a aplikácií"</li>\n<li>"Stiahnuté aplikácie"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásený/-á do nasledujúcich účtov:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="other">Veľmi dlhé oneskorenie (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Veľmi dlhé oneskorenie (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Vibrácie pre vyzváňanie a upozornenia sú vypnuté"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Pre vyzváňanie a upozornenia sú nastavené slabé vibrácie"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Pre vyzváňanie a upozornenia sú nastavené stredné vibrácie"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Využitie obrazovky od úplného nabitia"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotreba obrazovkou"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Využitie aplikácií od úplného nabitia (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Využitie v zariadení od úplného nabitia (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Prebúdza zariadenie na pozadí"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Často vyžaduje polohu"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Aplikácie s problémovým správaním: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batéria je v dobrom stave"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikácie fungujú normálne"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Nízka kapacita batérie"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batéria nie je schopná zaistiť dobrú výdrž"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Predĺženie výdrže batérie telefónu"</string>
@@ -2197,9 +2209,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet bol používaný viac ako obvykle"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Zariadenie bolo používané viac ako obvykle"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Batéria sa môže čoskoro minúť"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefón sa používa viac ako obvykle. Jeho batéria sa môže minúť skôr, ako sa očakávalo.\n\nNajpoužívanejšie aplikácie (<xliff:g id="NUMBER">%1$d</xliff:g>) od posledného nabitia (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablet sa používa viac ako obvykle. Jeho batéria sa môže minúť skôr, ako sa očakávalo.\n\nNajpoužívanejšie aplikácie (<xliff:g id="NUMBER">%1$d</xliff:g>) od posledného nabitia (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Zariadenie sa používa viac ako obvykle. Jeho batéria sa môže minúť skôr, ako sa očakávalo.\n\nNajpoužívanejšie aplikácie (<xliff:g id="NUMBER">%1$d</xliff:g>) od posledného nabitia (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="few">Obmedziť %1$d aplikácie</item>
       <item quantity="many">Obmedziť %1$d aplikácie</item>
@@ -2238,8 +2253,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Aplikácia bude môcť využívať batériu na pozadí. Batéria sa môže minúť skôr, ako sa očakávalo."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Odstrániť"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Zrušiť"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Vaša plne nabitá batéria podľa údajov o využívaní bežne vydrží približne <xliff:g id="TIME_DURATION">%1$s</xliff:g>.\n\nAk potrebujete predĺžiť jej výdrž, zapnite Šetrič batérie."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ak potrebujete predĺžiť výdrž batérie, zapnite šetrič batérie"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Správca batérie"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Spravovať aplikácie automaticky"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Obmedzte využívanie batérie aplikáciami, ktoré nepoužívate často"</string>
@@ -3145,15 +3164,14 @@
     <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">"Blokovať vizuálne vyrušenia"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Povoliť vizuálne signály"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Obmedziť upozornenia"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Keď je zapnutý režim Nerušiť"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Upozornenia"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Keď je zapnutý režim Nerušiť"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Vypnúť zvuk upozornení"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Zobrazovať upozornenia, ale stlmiť zvuky a vibrácie"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Keď do telefónu dostanete nové upozornenia, nevydajú zvuk ani nebudú vibrovať"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Skryť a stlmiť zvuk upozornení"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Upozornenia sa nebudú vôbec zobrazovať"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Keď je zapnutý režim Nerušiť, neuvidíte žiadne nové ani existujúce upozornenia. Avšak upozornenia potrebné pre základné aktivity a stav telefónu sa budú naďalej zobrazovať."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Zobrazovať upozornenia bez zvuku"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Upozornenia nebudú vydávať zvuk"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Keď dostanete nové upozornenia, telefón nevydá zvuk ani nebude vibrovať."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skryť upozornenia"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nebudú sa zobrazovať nové ani existujúce upozornenia"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Váš telefón nebude zobrazovať nové ani existujúce upozornenia, vydávať zvuky ani vibrovať. Keď potiahnete prstom z hornej časti obrazovky smerom nadol, upozornenia sa nezobrazia.\n\nNezabudnite, že závažné upozornenia týkajúce sa aktivity a stavu telefónu sa budú zobrazovať."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Vlastné"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Povoliť vlastné nastavenie"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Odstrániť vlastné nastavenie"</string>
@@ -3209,13 +3227,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravidiel sa môže zapnúť automaticky</item>
       <item quantity="one">1 pravidlo sa môže zapnúť automaticky</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Správanie"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Výnimky"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Plán"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Zvuk a vibrovanie"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Keď je zapnutý stav Nerušiť, zvuky a vibrácie budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Vypnúť všetky zvuky okrem"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Zvuk bol vypnutý"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Zvuk je zapnutý"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Zvuk je vypnutý, ale povoľte <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Zvuk je vypnutý, ale povoľte <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> a <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zvuk je vypnutý, ale povoľte <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> a <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Správy, udalosti a pripomenutia"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Keď je zapnutý režim Nerušiť, zvuky správ, pripomenutí a udalostí budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie. Môžete upraviť nastavenia správ a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Aktualizovať"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Neaktualizovať"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefón vám môže pomôcť sústrediť sa.\n\nAktualizujte nastavenia nasledovne:\n\n– úplne skryte upozornenia,\n\n– povoľte hovory od kontaktov označených hviezdičkou a opakovane volajúcich."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Aktualizovať režim Nerušiť?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nastavenia"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Túto možnosť môžete ďalej prispôsobiť v Nastaveniach."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokovať pri zapnutej obrazovke"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokovať pri vypnutej obrazovke"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Režim Nerušiť dokáže viac než len blokovať nechcené zvuky – blokuje aj vizuálne prvky. Môže to byť užitočné, ak sa pokúšate zaspať, sústrediť alebo obmedziť čas strávený používaním telefónu."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokovať zvuky a vizuálne prvky"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"V prípade upozornení nezapínať obrazovku ani nebudiť"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Nezobrazovať žiadne upozornenia okrem základnej aktivity telefónu a stavu"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuky pracovného profilu"</string>
@@ -3394,21 +3426,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od <xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Hovory"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Keď je zapnutý režim Nerušiť, prichádzajúce hovory sú blokované. Môžete upraviť nastavenia a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Správy"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Všetky správy"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Vybrané správy"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Správy"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Niektoré správy"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od kohokoľvek"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Iba od kontaktov"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Iba od kontaktov s hviezdičkou"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Od kontaktov označených hviezdičkou a opakujúcich sa volajúcich"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Od kontaktov a opakujúcich sa volajúcich"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Iba od opakujúcich sa volajúcich"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žiadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Médiá"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Zvuky klepnutia"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pripomenutia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Udalosti"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Všetci volajúci"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volajúci"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"kohokoľvek"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktov"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontaktov označených hviezdičkou"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Opakované volania"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Iba od <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Od <xliff:g id="CALLER_TYPE">%1$s</xliff:g> a <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Vlastné"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Zapínať automaticky"</string>
@@ -3698,7 +3740,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Všetky pravidlá typu Nerušiť vytvorené touto aplikáciou budú odstránené."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Neoptimalizovať"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimalizovať"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Môžu rýchlejšie vybiť batériu"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Odporúčajú sa na predĺženie výdrže batérie"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Povoliť aplikácii <xliff:g id="APP">%s</xliff:g> ignorovať optimalizácie batérie?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Žiadna"</string>
@@ -3776,7 +3819,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Zálohovanie je zakázané"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aktualizované na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"K dispozícii je aktualizácia"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Toto nastavenie sa nedá zmeniť"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Akcia nie je povolená"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Hlasitosť sa nedá zmeniť"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Hovory sú zakázané"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Správy SMS sú zakázané"</string>
@@ -3978,7 +4021,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Ovládajte informácie na uzamknutej obrazovke"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazujte si obsah upozornení alebo ho skryte"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Všetko"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora a tipy"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Tipy a podpora"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minimálna šírka"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Prístup k prémiovým správam SMS si nevyžiadali žiadne nainštalované aplikácie"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Za prémiové správy SMS sa môžu účtovať poplatky, ktoré sa naúčtujú na faktúru operátora. Ak aktivujete toto povolenie pre aplikáciu, budete môcť pomocou nej posielať prémiové správy SMS."</string>
@@ -4191,6 +4234,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmové a televízne aplikácie"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informácie o poskytovaní služieb operátorom"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustiť poskytovanie služieb operátorom"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Aké sú najaktuálnejšie novinky?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Pozrite si prehliadku nového telefónu"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Pozrite si prehliadku nového tabletu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c859e45..615cc17 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahteva za dostop do kartice SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi dostopati do vaše kartice SIM. Z omogočanjem dostopa do kartice SIM bodo v napravi za čas trajanja povezave onemogočene podatkovne povezave. Omogočite dostop za <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Drugim napravam vidno kot »<xliff:g id="DEVICE_NAME">^1</xliff:g>«"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše naprave"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Seznanitev nove naprave"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Omogočite tabličnemu računalniku, da komunicira z napravami Bluetooth v bližini"</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Kartic e-SIM ni mogoče ponastaviti"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Kartic e-SIM ni mogoče ponastaviti zaradi napake."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Izbriši vse podatke (tovarniška ponastavitev)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="few">Zelo dolga zakasnitev (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Zelo dolga zakasnitev (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Vibriranje za zvonjenje in obvestila je izklopljeno"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Vibriranje za zvonjenje in obvestila je nastavljeno na šibko"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Vibriranje za zvonjenje in obvestila je nastavljeno na srednje"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uporaba zaslona od polne napolnjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Poraba zaslona"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Poraba aplikacij od polne napolnjenosti akumulatorja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Poraba naprave od polne napolnjenosti akumulatorja (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Prebujanje naprave iz ozadja"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Pogosto zahtevanje lokacije"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Nepravilno delovanje več aplikacij (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akumulator je v dobrem stanju"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikacije delujejo normalno"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Akumulator je skoraj prazen"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akumulator ne more zagotoviti dolgega časa delovanja"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Izboljšajte čas delovanja akumulatorja telefona"</string>
@@ -2197,9 +2209,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablični računalnik uporabljate več kot običajno"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Napravo uporabljate več kot običajno"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Akumulator bo morda kmalu izpraznjen"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon ste uporabljali več kot običajno. Akumulator se bo morda izpraznil prej, kot ste pričakovali.\n\nNajpogosteje uporabljene aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) od zadnjega napolnjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tablični računalnik ste uporabljali več kot običajno. Akumulator se bo morda izpraznil prej, kot ste pričakovali.\n\nNajpogosteje uporabljene aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) od zadnjega napolnjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Napravo ste uporabljali več kot običajno. Akumulator se bo morda izpraznil prej, kot ste pričakovali.\n\nNajpogosteje uporabljene aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) od zadnjega napolnjenja (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Omeji %1$d aplikacijo</item>
       <item quantity="two">Omeji %1$d aplikaciji</item>
@@ -2238,8 +2253,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ta aplikacija bo lahko porabljala energijo akumulatorja za izvajanje v ozadju. Akumulator se bo morda izpraznil prej, kot ste pričakovali."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Odstrani"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Prekliči"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Glede na vaš način uporabe je čas delovanja povsem napolnjenega akumulatorja približno <xliff:g id="TIME_DURATION">%1$s</xliff:g>.\n\nČe želite podaljšati čas delovanja akumulatorja, vklopite varčevanje z energijo akumulatorja."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Če želite podaljšati čas delovanja akumulatorja, vklopite varčevanje z energijo akumulatorja"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Varčevanje z energijo akumulatorja"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Samodejno upravljanje aplikacij"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Omejite porabljanje energije akumulatorja za aplikacije, ki jih ne uporabljate pogosto"</string>
@@ -3145,15 +3164,14 @@
     <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">"Blokiranje vizualnih motenj"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dovoli vizualne znake"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Omejitev obvestil"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Ko je vklopljen način »ne moti«"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obvestila"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Ko je vklopljena funkcija »ne moti«"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Izklopi zvok obvestil"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Obvestila bodo prikazana, vendar brez predvajanja zvokov in vibriranja"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Ob prejemu novih obvestil telefon ne bo predvajal zvoka ali vibriral"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Skrij in prezri obvestila"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Obvestila ne bodo prikazana"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Ko je funkcija »ne moti« vklopljena, nova ali obstoječa obvestila ne bodo prikazana, še vedno pa bodo prikazana obvestila, potrebna za osnovno delovanje telefona in obveščanje o njegovem stanju."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Prikaži obvestila brez zvoka"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Obvestila bodo prezrta"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon ob prejemu obvestil ne bo predvajal zvoka ali vibriral."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skrij obvestila"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nova ali obstoječa obvestila ne bodo prikazana"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon ne bo prikazoval novih ali obstoječih obvestil in ne bo predvajal zvoka ali vibriral. Če s prstom povlečete navzdol z vrha zaslona, obvestila ne bodo prikazana.\n\nUpoštevajte, da se bodo nujna obvestila o delovanju in stanju telefona še vedno prikazovala."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Po meri"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogoči nastavitev po meri"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Odstrani nastavitev po meri"</string>
@@ -3209,13 +3227,27 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> pravila se lahko samodejno vklopijo</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> pravil se lahko samodejno vklopi</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"V redu"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Delovanje"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Izjeme"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Urnik"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Zvok in vibriranje"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Pri vklopljenem načinu »ne moti« bosta zvok in vibriranje izklopljena v vseh primerih razen za zgoraj omogočene elemente."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Prezri vse razen"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Prezrto"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ni prezrto"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Prezrto; dovoljeni zvok: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Prezrto; dovoljena zvoka: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> in <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Prezrto; dovoljeni zvoki: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> in <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Sporočila, dogodki in opomniki"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Pri vklopljenem načinu »ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Posodobi"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ne posodobi"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefon vam lahko še dodatno pomaga, da se osredotočite.\n\nPosodobite nastavitve, da:\n\n– popolnoma skrijete obvestila\n\n– omogočite klice od stikov z zvezdico in večkratnih klicateljev"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Želite posodobiti nastavitve načina »ne moti«?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nastavitve"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"To lahko dodatno prilagodite v nastavitvah."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blokiraj, ko je zaslon vklopljen"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blokiraj, ko je zaslon izklopljen"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Način »ne moti« lahko stori več kot samo blokira neželene zvoke, saj lahko blokira tudi vizualne motnje. To vam je lahko v pomoč, če poskušate zaspati, se osredotočiti ali omejiti čas, ki ga namenite telefonu."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blokiranje zvokov in vizualnih motenj"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ne vklopi zaslona in ne preklopi iz stanja pripravljenosti za obvestila"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ne prikazuj obvestil razen za osnovno delovanje telefona in obveščanje o njegovem stanju"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvoki v delovnem profilu"</string>
@@ -3394,21 +3426,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od <xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Klici"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Pri vklopljenem načinu »ne moti« so dohodni klici blokirani. Nastavitve lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sporočila"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Vsa sporočila"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Izbrana sporočila"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Sporočila"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Nekatera sporočila"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od kogar koli"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od stikov"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od stikov, označenih z zvezdico"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Od stikov z zvezdico in večkratnih klicateljev"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Od stikov in večkratnih klicateljev"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Samo od večkratnih klicateljev"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nič"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Predstavnost"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Zvoki dotikov"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Opomniki"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Dogodki"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Vsi klicatelji"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Izbrani klicatelji"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"vseh"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"stikov"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"stikov z zvezdico"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Klicatelji, ki večkrat kličejo"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Samo od <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Od <xliff:g id="CALLER_TYPE">%1$s</xliff:g> in <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Če ista oseba kliče že drugič v <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Po meri"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Samodejni vklop"</string>
@@ -3698,7 +3740,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Vsa pravila za način »ne moti«, ki jih je ustvarila ta aplikacija, bodo odstranjena."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Brez optimizacije"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizacija"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Akumulator se lahko hitreje izprazni"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Priporočljivo za daljši čas delovanja akumulatorja"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Naj bo aplikaciji <xliff:g id="APP">%s</xliff:g> dovoljeno prezreti optimizacije akumulatorja?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nič"</string>
@@ -3776,7 +3819,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Varnostno kopiranje je onemogočeno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Posodobljeno na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Na voljo je posodobljena različica"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Sprememba nastavitve ni mogoča"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Dejanje ni dovoljeno"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Spreminjanje glasnosti ni mogoče"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Klicanje ni omogočeno"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Pošiljanje sporočil SMS ni omogočeno"</string>
@@ -3978,7 +4021,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Upravljanje podatkov na zaklenjenem zaslonu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikaz ali skrivanje vsebine obvestil"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Vse"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora in nasveti"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Nasveti in podpora"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanjša širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nobena nameščena aplikacija ni zahtevala dostopa za plačljiva sporočila SMS."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Plačljiva sporočila SMS vam lahko povzročijo stroške in povečajo račun za mobilno telefonijo. Če za aplikacijo omogočite dovoljenje, boste lahko s tisto aplikacijo pošiljali plačljiva sporočila SMS."</string>
@@ -4191,6 +4234,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filme in TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Podatki o omogočanju uporabe operaterja"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Sproži omogočanje uporabe operaterja"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Odkrijte zanimive novosti"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Oglejte si predstavitev novega telefona"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Oglejte si predstavitev novega tabličnega računalnika"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 206ed63..ceb05a0 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kërkesa për qasje në kartën SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Pajisja <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dëshiron të ketë qasje në kartën tënde SIM. Dhënia e të drejtës për qasje në kartën SIM do të çaktivizojë lidhjen e të dhënave në pajisjen tënde gjatë kohëzgjatjes së lidhjes. Jepi qasje pajisjes <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"E dukshme si \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" për pajisjet e tjera"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Pajisjet e tua"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Çifto pajisjen e re"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Lejo që tableti yt të komunikojë me pajisjet me Bluetooth në afërsi"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Kartat eSIM nuk mund të rivendosen"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Kartat eSIM nuk mund të rivendosen për shkak të një gabimi."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e tabletit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Kjo do t\'i fshijë të gjitha të dhënat nga "<b>"hapësira e brendshme për ruajtje"</b>" e telefonit, përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Vonesë shumë e gjatë (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Vonesë shumë e gjatë (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Zilja dhe njoftimi janë vendosur në \"Joaktiv\""</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Zilja dhe njoftimi janë vendosur në \"I ulët\""</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Zilja dhe njoftimi janë vendosur në \"Mesatar\""</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Përdorimi i ekranit që nga ngarkimi i plotë"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumi i ekranit"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Përdorimi i aplikacionit që nga ngarkimi i plotë (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Përdorimi i pajisjes që nga ngarkimi i plotë (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Po e zgjon pajisjen në sfond"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Po kërkon shpesh vendndodhjen"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikacione kanë sjellje jonormale"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateria është në formë të mirë"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Aplikacionet po funksionojnë normalisht"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Kapacitet i ulët i baterisë"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria nuk mund të ofrojë jetëgjatësi të mirë"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Përmirëso kohëzgjatjen e baterisë së telefonit"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tableti është përdorur më shumë se zakonisht"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Pajisja është përdorur më shumë se zakonisht"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Bateria mund të mbarojë së shpejti"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefoni yt është përdorur më shumë se zakonisht. Bateria mund të mbarojë më shpejt nga sa pritet.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> aplikacionet kryesore nga ngarkimi i fundit i plotë (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tableti yt është përdorur më shumë se zakonisht. Bateria mund të mbarojë më shpejt nga sa pritet.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> aplikacionet kryesore nga ngarkimi i fundit i plotë (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Pajisja jote është përdorur më shumë se zakonisht. Bateria mund të mbarojë më shpejt nga sa pritet.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> aplikacionet kryesore nga ngarkimi i fundit i plotë (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Kufizo %1$d aplikacione</item>
       <item quantity="one">Kufizo %1$d aplikacion</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ky aplikacion do të mund ta përdorë baterinë në sfond. Bateria mund të mbarojë më shpejt nga sa pritet."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Hiq"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Anulo"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Bazuar në përdorimin tënd, bateria jote zakonisht zgjat rreth <xliff:g id="TIME_DURATION">%1$s</xliff:g> kur është e ngarkuar plotësisht.\n\nNëse të nevojitet të zgjatësh jetëgjatësinë e baterisë, aktivizo \"Kursyesin e baterisë\"."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Nëse të nevojitet të zgjatësh jetëgjatësinë e baterisë, aktivizo \"Kursyesin e baterisë\"."</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Menaxheri i baterisë"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Menaxho automatikisht aplikacionet"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Kufizo baterinë për aplikacionet që nuk i përdor shpesh"</string>
@@ -3075,15 +3094,14 @@
     <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">"Blloko shqetësimet vizuale"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Lejo sinjalet vizuale"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Kufizo njoftimet"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kur modaliteti \"Mos shqetëso\" është i aktivizuar"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Njoftimet"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kur modaliteti \"Mos shqetëso\" është i aktivizuar"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Çaktivizo njoftimet"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Shfaq njoftimet, por çaktivizo tingujt dhe dridhjet"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Kur mbërrijnë njoftime të reja, telefoni nuk do të lëshojë tingull apo dridhje"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Fshih dhe çaktivizo njoftimet"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Njoftimet nuk do të shfaqen fare"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Nuk do të shohësh njoftime të reja ose ekzistuese kur modaliteti \"Mos shqetëso\" është aktiv. Megjithatë, do të vazhdojnë të shfaqen njoftimet që nevojiten për statusin dhe aktivitetin bazë të telefonit."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Shfaqi njoftimet në heshtje"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Njoftimet do të jenë në heshtje"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Kur mbërrijnë njoftime, telefoni nuk do të lëshojë tinguj apo dridhje."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Fshih njoftimet"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nuk do të shikosh njoftime të reja ose ekzistuese"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefoni yt nuk do të shfaqë njoftime të reja ose ekzistuese dhe nuk do të lëshojë tinguj ose dridhje. Njoftimet nuk do të shfaqen kur rrëshqet shpejt poshtë nga kreu i ekranit.\n\nKi parasysh se njoftimet e rëndësishme për statusin dhe aktivitetin e telefonit do të shfaqen përsëri."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizo"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivizo cilësimin e personalizuar"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Hiq cilësimin e personalizuar"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rregulla mund të kufizohen automatikisht</item>
       <item quantity="one">1 rregull mund të aktivizohet automatikisht</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Në rregull"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Sjellja"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Përjashtimet"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Orari"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Tingulli dhe dridhja"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Kur modaliteti \"Mos shqetëso\" është aktiv, tingujt dhe dridhjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Çaktivizo audion për të gjitha përveçse për"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Pa zë"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Me zë"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Pa zë, por lejo <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Pa zë, por lejo <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> dhe <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Pa zë, por lejo <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> dhe <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesazhet, ngjarjet dhe alarmet rikujtuese"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kur modaliteti \"Mos shqetëso\" është aktiv, mesazhet, alarmet rikujtuese dhe ngjarjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër. Mund t\'i përshtatësh cilësimet e mesazheve për të lejuar shokët, familjen ose kontakte të tjera që të lidhen me ty."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Përditëso"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Mos e përditëso"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefoni yt mund të bëjë më shumë për të të ndihmuar të fokusohesh.\n\nPërditëso cilësimet për të:\n\n- Fshirë njoftimet plotësisht\n\n- Lejuar telefonatat nga kontaktet me yll dhe telefonuesit e përsëritur"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Dëshiron të përditësosh modalitetin \"Mos shqetëso\"?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Cilësimet"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Këtë mund ta personalizosh më tej te \"Cilësimet\"."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blloko kur ekrani është i ndezur"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blloko kur ekrani është i fikur"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Modaliteti \"Mos shqetëso\" mund të bëjë më shumë sesa të bllokojë tingujt e padëshiruar, ai mund të bllokojë edhe pamjet vizuale. Kjo mund të jetë e dobishme nëse po përpiqesh të flesh, të fokusohesh ose të kufizosh kohën që kalon me telefonin."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blloko tingujt dhe pamjet vizuale"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Mos e aktivizo ekranin ose mos e zgjo për njoftimet"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Mos shfaq asnjë njoftim, përveç aktivitetit dhe statusit bazë të telefonit."</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Tingujt e profilit të punës"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> deri ditën <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Telefonatat"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kur modaliteti \"Mos shqetëso\" është aktiv, telefonatat hyrëse janë të bllokuara. Mund t\'i përshtatësh cilësimet për të lejuar shokët, familjen ose kontakte të tjera të lidhen me ty."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesazhet"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Të gjitha mesazhet"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mesazhet e përzgjedhura"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesazhet"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Disa mesazhe"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Nga të gjithë"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Vetëm nga kontaktet"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vetëm nga kontaktet me yll"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Nga kontaktet me yll dhe telefonuesit e përsëritur"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Nga kontaktet ose telefonuesit e përsëritur"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Vetëm nga telefonuesit e përsëritur"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Asnjë"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmet"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Tingujt e prekjes"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Alarmet rikujtuese"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Ngjarjet"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Të gjithë telefonuesit"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Telefonuesit e zgjedhur"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"çdo person"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktet"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontaktet me yll"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Telefonuesit e përsëritur"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Vetëm nga <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Nga <xliff:g id="CALLER_TYPE">%1$s</xliff:g> dhe <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Nëse telefonon i njëjti person për herë të dytë në një periudhë prej <xliff:g id="MINUTES">%d</xliff:g> minutash, lejoje"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Personalizo"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivizo automatikisht"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Të gjitha rregullat e \"Mos shqetëso\" të krijuara nga ky aplikacion, do të hiqen."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Mos optimizo"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizo"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Mund ta shkarkojë baterinë më shpejt"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Rekomandohet për një jetëgjatësi më të mirë të baterisë"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Lejo që <xliff:g id="APP">%s</xliff:g> t\'i injorojë optimizimet e baterisë?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Asnjë"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Rezervimi u çaktivizua"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Përditësuar në Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ofrohet përditësim"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Ky cilësim nuk mund të ndryshohet"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Veprimi nuk lejohet"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Volumi nuk mund të ndryshohet"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Telefonata nuk lejohet"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Mesazhi SMS nuk lejohet"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Informacioni i kontrollit në ekranin e kyçjes"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Shfaq ose fshih përmbajtjet e njoftimeve"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Të gjitha"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Mbështetja dhe këshillat"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Këshilla dhe mbështetje"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Gjerësia më e vogël"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te mesazhet SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Mesazhet SMS premium mund të kushtojnë dhe do të rritin faturat e operatorit tënd celular. Nëse e aktivizon lejen për një aplikacion, do të mund të dërgosh mesazhe SMS premium me atë aplikacion."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apl. e filmave dhe shfaqjeve televizive"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacionet e përgatitjes së operatorit celular"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizo përgatitjen e operatorit celular"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Çfarë ka të reja dhe emocionuese?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Zhvillo një turne të telefonit tënd të ri"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Zhvillo një turne të tabletit tënd të ri"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fc2ef9c..e8aef4c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -168,6 +168,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Захтев за приступ SIM картици"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> жели да приступа SIM картици. Одобравање приступа SIM картици ће онемогућити везу за пренос података на уређају док траје повезивање. Дајте приступ уређају <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Другим уређајима видљив као „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Уређаји"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Упарите нови уређај"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Омогућите таблету да комуницира са Bluetooth уређајима у близини"</string>
@@ -1466,6 +1468,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Ресетовање eSIM-ова није успело"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Ресетовање eSIM-ова није успело због грешке."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Избриши све податке (ресетовање на фабричка подешавања)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
@@ -2018,6 +2022,8 @@
       <item quantity="few">Веома дуг период (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Веома дуг период (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Звоно и обавештења су искључена"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Звоно и обавештења су подешена на слабо"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Звоно и обавештења су подешена на средње"</string>
@@ -2127,8 +2133,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Коришћење екрана од потпуног пуњења"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошња за екран"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилних мрежа"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Коришћење апликација од потпуног пуњења (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Коришћење уређаја од потпуног пуњења (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2159,8 +2165,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Будимо уређај у позадини"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Често тражи локацију"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Неке апликације (<xliff:g id="NUMBER">%1$d</xliff:g>) се чудно понашају"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батерија је у добром стању"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Апликације раде уобичајено"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Апликације раде уобичајено"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефон троши типичну количину батерије у позадини"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Таблет троши типичну количину батерије у позадини"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Уређај троши типичну количину батерије у позадини"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Капацитет батерије је низак"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батерија ће се ускоро испразнити"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Продужите трајање батерије телефона"</string>
@@ -2175,9 +2183,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Таблет сте користили дуже него обично"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Уређај сте користили дуже него обично"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Батерија ће се можда ускоро испразнити"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Телефон сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\nАпликације (<xliff:g id="NUMBER">%1$d</xliff:g>) које су највише трошиле батерију од последњег потпуног пуњења (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Таблет сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\nАпликације (<xliff:g id="NUMBER">%1$d</xliff:g>) које су највише трошиле батерију од последњег потпуног пуњења (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Уређај сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\n Апликације (<xliff:g id="NUMBER">%1$d</xliff:g>) које су највише трошиле батерију од последњег потпуног пуњења (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Ограничите %1$d апликацију</item>
       <item quantity="few">Ограничите %1$d апликације</item>
@@ -2211,8 +2222,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ова апликација ће моћи да користи батерију у позадини. Батерија може да се испразни раније од очекиваног."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Уклони"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Откажи"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"На основу потрошње, ваша батерија обично траје <xliff:g id="TIME_DURATION">%1$s</xliff:g> када је потпуно напуњена.\n\nАко желите да продужите трајање батерије, укључите Уштеду батерије."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Ако желите да продужите трајање батерије, укључите Уштеду батерије"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, телефон ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако ће се батерија ускоро испразнити."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, таблет ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако ће се батерија ускоро испразнити."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Апликације користе уобичајену количину батерије. Ако апликације користе превише батерије, уређај ће вам предложити радње које можете да предузмете.\n\nУвек можете да укључите Уштеду батерије ако ће се батерија ускоро испразнити."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Менаџер батерије"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Управљајте апликацијама аутоматски"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Ограничите потрошњу батерије за апликације које не користите често"</string>
@@ -3110,15 +3122,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволи визуелне сигнале"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Ограничите обавештења"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Када је укључен режим Не узнемиравај"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Обавештења"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Када је укључена опција Не узнемиравај"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Искључи звук обавештења"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Приказуј обавештења, али искључи звук и вибрације"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Телефон неће емитовати звук ни вибрирати када стигну нова обавештења"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Сакријте обавештења и искључите им звук"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Обавештења се уопште неће приказивати"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Нећете видети нова ни постојећа обавештења када је укључено Не узнемиравај. Али и даље ће се приказивати обавештења потребна за основне активности и статус телефона."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Приказуј обавештења без звука"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Звук обавештења ће бити искључен"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Телефон неће емитовати звук ни вибрирати када стигну обавештења."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Сакриј обавештења"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Нећете видети нова ни постојећа обавештења"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефон неће приказивати нова или постојећа обавештења и неће емитовати звук ни вибрирати. Обавештења се неће приказивати када превучете надоле од врха екрана.\n\nИмајте у виду да ће се важна обавештења о активностима и статусу телефона и даље приказивати."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Прилагођено"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Омогући прилагођено подешавање"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Уклони прилагођено подешавање"</string>
@@ -3155,8 +3166,8 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"Апликација (<xliff:g id="APP_NAME">%s</xliff:g>) је аутоматски укључила режим Не узнемиравај"</string>
     <string name="zen_interruption_level_priority" msgid="2078370238113347720">"Само приоритетни прекиди"</string>
     <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Укључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Искључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"Укључено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"Искључено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"Искључено"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"Укључено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"Питај сваки пут (ако се не укључује аутоматски)"</string>
@@ -3172,13 +3183,27 @@
       <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> правила могу да се аутоматски укључе</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> правила могу да се аутоматски укључе</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Потврди"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Понашање"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Изузеци"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Распоред"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Звук и вибрација"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Када је укључен режим Не узнемиравај, звук и вибрација биће искључени, осим за ставке које сте дозволили изнад."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Искључи звук за све осим за:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Звук је искључен"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Звук није искључен"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Звук је искључен, али дозволи за: <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Звук је искључен, али дозволи за: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> и <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Звук је искључен, али дозволи за: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Поруке, догађаји и подсетници"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Када је укључен режим Не узнемиравај, звукови обавештења за поруке, подсетнике и догађаје ће бити искључени, осим за ставке које сте дозволили изнад. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Ажурирај"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Не ажурирај"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Телефон може још више да вам помогне да се концентришете.\n\nАжурирајте подешавања:\n\n– да бисте потпуно сакрили обавештења\n\n– да бисте омогућили да вас зову контакти са звездицом и поновни позиваоци"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Желите ли да ажурирате режим Не узнемиравај?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Подешавања"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Ово можете додатно да прилагодите у подешавањима."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Блокирај када је екран укључен"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Блокирај када је екран искључен"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Режим Не узнемиравај има много више могућности од обичног блокирања нежељених звукова – може да блокира и визуелни садржај. То може бити корисно када спавате, када треба да будете усредсређени на нешто или када желите да смањите време које проводите на телефону."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Блокирај звукове и визуелни садржај"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Не укључуј екран нити буди због обавештења"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Не приказуј никаква обавештења, осим основних активности и статуса телефона"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуци за профил за Work"</string>
@@ -3353,21 +3378,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"Од <xliff:g id="START">%1$s</xliff:g> до <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Позиви"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Када је укључен режим Не узнемиравај, долазни позиви су блокирани. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Поруке"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Све поруке"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Изабране поруке"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Поруке"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Неке поруке"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Од било кога"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Само од контаката"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само од контаката са звездицом"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Од контаката са звездицом и поновних позивалаца"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Од контаката и поновних позивалаца"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Само од поновних позивалаца"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ни од кога"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Медији"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Звукови при додиру"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Подсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Догађаји"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Сви позиваоци"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Изабрани позиваоци"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"сви"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"контакти"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"контакти са звездицом"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Поновни позиваоци"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Само од: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Од: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> и <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ако иста особа позове по други пут у периоду од <xliff:g id="MINUTES">%d</xliff:g> мин"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Прилагођено"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Аутоматски укључи"</string>
@@ -3647,7 +3682,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Уклонићемо сва правила за режим Не узнемиравај која је ова апликација направила."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Не оптимизуј"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Оптимизуј"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Могу брже да вам испразне батерију"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Препоручено за дуже трајање батерије"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Желите ли да дозволите апликацији <xliff:g id="APP">%s</xliff:g> да игнорише оптимизације батерије?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ништа"</string>
@@ -3724,7 +3760,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Прављење резервне копије је онемогућено"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ажурирано на Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Доступно је ажурирање"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Подешавање је закључано"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Радња није дозвољена"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Не можете да промените јачину звука"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Позивање није дозвољено"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ови нису дозвољени"</string>
@@ -3920,7 +3956,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Контролишите информације на закључаном екрану"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прегледајте или сакријте садржај обавештења"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Све"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Подршка и савети"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Савети и подршка"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Најмања ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ниједна инсталирана апликација није захтевала приступ премијум SMS-овима"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Премијум SMS-ови могу да коштају и повећаће рачуне код мобилног оператера. Ако омогућите дозволу за неку апликацију, моћи ћете да шаљете премијум SMS-ове помоћу те апликације."</string>
@@ -4123,6 +4159,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Апликације за филмове и ТВ"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информације о додели мобилног оператера"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Покретање доделе мобилног оператера"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шта је ново и узбудљиво?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Упознајте нови телефон"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Упознајте нови таблет"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b476521..530f1e7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Begäran om åtkomst till SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill ha åtkomst till ditt SIM-kort. Om du ger den åtkomst till SIM-kortet inaktiveras dataanslutningen på enheten under tiden som anslutningen är upprättad. Ge <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> åtkomst"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Synlig för andra enheter som <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dina enheter"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parkoppla en ny enhet"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tillåt att surfplattan kommunicerar med Bluetooth-enheter i närheten"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Det gick inte att återställa eSIM-korten"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Det gick inte att återställa eSIM-korten på grund av ett fel."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Rensa all data (återställ standardinställningar)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Mycket lång fördröjning (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Mycket lång fördröjning (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Vibrationer har inaktiverats för samtal och aviseringar"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Svag vibration har angetts för samtal och aviseringar"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Medium vibration har angetts för samtal och aviseringar"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skärmanvändning sedan fulladdning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skärmens förbrukning"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Appanvändning sedan fulladdning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Enhetsanvändning sedan fulladdning (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Enheten aktiveras i bakgrunden"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Begär platsinformation för ofta"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> appar beter sig inte som de ska"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batteriet är i bra skick"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Appar körs som vanligt"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Appar körs som vanligt"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Batteriförbrukningen i bakgrunden är normal på mobilen"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Batteriförbrukningen i bakgrunden är normal på surfplattan"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Batteriförbrukningen i bakgrunden är normal på enheten"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Låg batterikapacitet"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batteritiden är dålig"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Förbättra mobilens batteritid"</string>
@@ -2153,9 +2161,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Surfplattan används mer än vanligt"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Enheten används mer än vanligt"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Batteriet kan ta slut snart"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Mobilen har använts mer än vanligt. Batteriet kan ta slut snabbare än beräknat.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> mest använda apparna sedan den senaste fulladdningen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Surfplattan har använts mer än vanligt. Batteriet kan ta slut snabbare än beräknat.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> mest använda apparna sedan den senaste fulladdningen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Enheten har använts mer än vanligt. Batteriet kan ta slut snabbare än beräknat.\n\nDe <xliff:g id="NUMBER">%1$d</xliff:g> mest använda apparna sedan den senaste fulladdningen (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Begränsa %1$d appar</item>
       <item quantity="one">Begränsa %1$d app</item>
@@ -2184,8 +2195,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Den här appen kan dra batteri i bakgrunden. Batteriet kan ta slut snabbare än beräknat."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ta bort"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Avbryt"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Batteriet räcker ungefär <xliff:g id="TIME_DURATION">%1$s</xliff:g> när det är fulladdat utifrån din användning.\n\nAktivera batterisparläget om du behöver förlänga batteritiden."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Aktivera batterisparläget om du behöver förlänga batteritiden"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Batteriförbrukningen för apparna är normal. Om apparnas batteriförbrukning är för hög visas förslag på mobilen om åtgärder du kan vidta.\n\nOm batteriet börjar ta slut kan du aktivera batterisparläget."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Batteriförbrukningen för apparna är normal. Om apparnas batteriförbrukning är för hög visas förslag på surfplattan om åtgärder du kan vidta.\n\nOm batteriet börjar ta slut kan du aktivera batterisparläget."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Batteriförbrukningen för apparna är normal. Om apparnas batteriförbrukning är för hög visas förslag på enheten om åtgärder du kan vidta.\n\nOm batteriet börjar ta slut kan du aktivera batterisparläget."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Hantera appar automatiskt"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Begränsa batteriförbrukning för appar som du använder sällan"</string>
@@ -3075,15 +3087,14 @@
     <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">"Blockera synliga störningar"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillåt synliga signaler"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Begränsa aviseringar"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"När Stör ej har aktiverats"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Aviseringar"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"När Stör ej har aktiverats"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Dölj aviseringar"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Visa aviseringar men stäng av ljud och vibrationer"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Inga ljud eller vibrationer används när du tar emot nya aviseringar på mobilen"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Dölj och stäng av ljudet för aviseringar"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Inga aviseringar visas"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"När Stör ej har aktiverats visas inte nya eller befintliga aviseringar, förutom för grundläggande aktivitet och status för mobilen."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Visa aviseringar utan ljud"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Aviseringar döljs"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Inga ljud eller vibrationer används när du tar emot aviseringar på mobilen."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Dölj aviseringar"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nya eller befintliga aviseringar visas inte"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Nya eller befintliga aviseringar visas inte på mobilen, och inga ljud eller vibrationer används. När du sveper nedåt från skärmens överkant visas inga aviseringar.\n\nDäremot visas viktiga aviseringar för mobilens aktivitet och status."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Anpassa"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivera anpassad inställning"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ta bort anpassad inställning"</string>
@@ -3135,13 +3146,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regler kan aktiveras automatiskt</item>
       <item quantity="one">1 regel kan aktiveras automatiskt</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Beteende"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Undantag"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Schema"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Ljud och vibration"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Ljud och vibrationer stängs av när Stör ej har aktiverats, utom objekten du har tillåtit ovan."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Stäng av ljudet för alla utom"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Ljudet har stängts av"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Inte avstängt"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Stäng av ljudet men tillåt <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Stäng av ljudet men tillåt <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> och <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Stäng av ljudet men tillåt <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> och <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Meddelanden, händelser och påminnelser"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Meddelanden, påminnelser och händelser döljs när Stör ej har aktiverats, utom objekten du har tillåtit ovan. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter ändå kan nå dig."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Uppdatera"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Uppdatera inte"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Gör det lättare att fokusera med hjälp av mobilen.\n\nUppdatera inställningarna för att\n\n– dölja alla aviseringar\n\n– tillåta samtal från stjärnmarkerade kontakter och någon som ringer flera gånger."</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Vill du uppdatera Stör ej?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Inställningar"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Du kan anpassa funktionen mer i inställningarna."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Blockera när skärmen är på"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Blockera när skärmen inte är på"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Med Stör ej kan du göra mer än att bara blockera ovälkomna ljud – du kan även blockera grafik. Det kan vara användbart när du försöker sova, koncentrera dig eller använda mobilen mindre."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Blockera ljud och grafik"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Sätt inte på skärmen eller väck enheten för aviseringar"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Visa inga aviseringar alls, förutom för grundläggande aktivitet och status för mobilen"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Jobbprofilens ljud"</string>
@@ -3312,21 +3337,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g>–<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> till <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Samtal"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Inkommande samtal blockeras när Stör ej har aktiverats. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter ändå kan nå dig."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meddelanden"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Alla meddelanden"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Markerade meddelanden"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Meddelanden"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Vissa meddelanden"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Från alla"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Endast från kontakter"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Endast från stjärnmärkta kontakter"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Från stjärnmärkta kontakter och personer som ringer upp flera gånger"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Från kontakter och personer som ringer upp flera gånger"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Endast från personer som ringer upp flera gånger"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Ljud vid tryck"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Händelser"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Alla ringande"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Valda personer som ringer"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"vem som helst"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontakter"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"stjärnmärkta kontakter"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Återuppringning"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Endast från <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Från <xliff:g id="CALLER_TYPE">%1$s</xliff:g> och <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Om samma person ringer en gång till inom en tidsperiod på <xliff:g id="MINUTES">%d</xliff:g> minuter"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Anpassa"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivera automatiskt"</string>
@@ -3596,7 +3631,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alla Stör ej-regler som skapats med den här appen tas bort."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Optimera inte"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimera"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Det kan hända att batteriet tar slut snabbare"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Rekommenderas för bättre batteritid"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Vill du tillåta att <xliff:g id="APP">%s</xliff:g> ignorerar batterioptimeringar?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ingen"</string>
@@ -3672,7 +3708,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Säkerhetskopiering har inaktiverats"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Uppdaterad till Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Det finns en uppdatering"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Inställningen kan inte ändras"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Åtgärden är inte tillåten"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Det gick inte att ändra volymen"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Utgående samtal har inaktiverats"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS har inaktiverats"</string>
@@ -3862,7 +3898,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolluppgifter på låsskärm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Visa eller dölja innehåll i aviseringar"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alla"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Support och tips"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Support och tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minsta bredd"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Inga installerade appar har begärt åtkomst till premium-sms"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Det kan hända att premium-sms kostar pengar och läggs till på dina fakturor från operatören. Om du ger en app åtkomst kan du skicka premium-sms med den appen."</string>
@@ -4055,6 +4091,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- och TV-appar"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Information om operatörsadministration"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivera operatörsadministration"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Vad är nytt?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ta en rundtur på din nya mobil"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ta en rundtur på din nya surfplatta"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9361d03..a55d8cb 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -78,7 +78,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Ondoa kadi ya SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Futa hifadhi ya USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Futa kadi ya SD"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"Onyesho la kuchungulia"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"Kagua kwanza"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"Onyesho la kuchungulia, ukurasa wa <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> kati ya <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"Kuongeza au kupunguza ukubwa wa maandishi kwenye skrini."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"Punguza"</string>
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Ombi la idhini ya kufikia SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> inataka idhini ya kufikia kadi yako ya SIM. Ukiipa idhini ya kufikia kadi ya SIM, itazima muunganisho wa data kwenye kifaa chako katika kipindi ambacho imeunganishwa. Ipe <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> idhini ya ufikiaji"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Inaonekana kama \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwenye vifaa vingine"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vifaa vyako"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Oanisha kifaa kipya"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Ruhusu kompyuta yako kibao itumie vifaa vya karibu vya Bluetooth"</string>
@@ -959,11 +961,11 @@
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Mtandao pepe wa AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Haipatikani kwa sababu umewasha hali ya ndegeni"</string>
-    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Upigaji simu kwa Wi-Fi"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Kupiga simu kupitia Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"Panua eneo la huduma kwa kupiga simu kupitia Wi‑Fi"</string>
     <string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Washa kupiga simu kupitia Wi‑Fi ili upanue eneo la huduma"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Mapendeleo ya kupiga simu"</string>
-    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Hali ya upigaji simu kwa Wi-Fi"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Hali ya kupiga simu kupitia Wi-Fi"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Mapendeleo ya mitandao ya ng\'ambo"</string>
     <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
     <skip />
@@ -995,7 +997,7 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wakati kipengele cha upigaji simu kwa Wi-Fi kimewashwa, simu yako inaweza kuelekeza simu kupitia mitandao ya Wi-Fi au mtandao wa mtoa huduma wako, kutegemea na mapendeleo yako na ni mawimbi yapi yaliyo thabiti. Kabla ya kuwasha kipengele hiki, angalia ada na maelezo mengine kwa mtoa huduma wako."</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wakati kipengele cha kupiga simu kupitia Wi-Fi kimewashwa, simu yako inaweza kuelekeza simu kupitia mitandao ya Wi-Fi au mtandao wa mtoa huduma wako, kutegemea na mapendeleo yako na ni mawimbi yapi yaliyo thabiti. Kabla ya kuwasha kipengele hiki, angalia ada na maelezo mengine kutoka kwa mtoa huduma wako."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Anwani ya Dharura"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Inatumika kama anwani ya mahali ulipo ikiwa utapiga simu ukitumia Wi‑Fi"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Imeshindwa kufuta data ya eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Hitilafu imetokea wakati wa kufuta data ya eSIM."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Futa data yote (rejesha mipangilio ambayo kifaa kilitoka nayo kiwandani)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Kukawia kwa muda mrefu sana (ms <xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g>)</item>
       <item quantity="one">Kukawia kwa muda mrefu sana (ms <xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g>)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Umezima mtetemo wa arifa na mlio wa simu"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Umeweka kiwango cha chini cha mtetemo wa arifa na mlio wa simu"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Umeweka kiwango cha wastani cha mtetemo wa arifa na mlio wa simu"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Matumizi ya skrini tangu mwisho ilipokuwa imejaa chaji"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Kutumia skrini"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Kutafuta mitandao ya simu"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Programu zilizofunguliwa tangu betri ilipojaa chaji <xliff:g id="RELATIVE_TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Matumizi ya kifaa tangu betri ilipojaa chaji <xliff:g id="RELATIVE_TIME">^1</xliff:g>"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Kuwasha kifaa chini chini"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Inaomba maelezo ya mahali mara kwa mara"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Programu <xliff:g id="NUMBER">%1$d</xliff:g> hazifanyi kazi vizuri"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Betri iko katika hali nzuri"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Programu zinatumia chaji kama kawaida"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Uwezo wa chini wa betri"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Muda wa matumizi ya betri ni mfupi"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Boresha muda wa matumizi ya betri ya simu yako"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Kompyuta kibao imetumika sana kuliko kawaida"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Kifaa kimetumika sana kuliko kawaida"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Huenda chaji ya betri ikaisha baada ya muda mfupi"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Umetumia simu yako zaidi ya kawaida. Huenda chaji ikaisha haraka kuliko unavyotarajia.\n\nProgramu <xliff:g id="NUMBER">%1$d</xliff:g> ulizotumia sana tangu ulipojaza chaji mara ya mwisho (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Umetumia kompyuta yako kibao zaidi ya kawaida. Huenda chaji ikaisha haraka kuliko unavyotarajia.\n\nProgramu <xliff:g id="NUMBER">%1$d</xliff:g> ulizotumia sana tangu ulipojaza chaji mara ya mwisho (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Umetumia kifaa chako zaidi ya kawaida. Huenda chaji ikaisha haraka kuliko unavyotarajia.\n\nProgramu <xliff:g id="NUMBER">%1$d</xliff:g> ulizotumia sana tangu ulipojaza chaji mara ya mwisho (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">Zuia programu %1$d</item>
       <item quantity="one">Zuia programu %1$d</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Programu hii itatumia chaji chinichini. Hali hii inaweza kusababisha chaji ya betri iishe haraka."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ondoa"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Ghairi"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Kulingana na jinsi unavyotumia betri yako, kwa kawaida chaji yake hudumu kwa <xliff:g id="TIME_DURATION">%1$s</xliff:g> wakati imejaa.\n\nKama ungependa kuongeza muda wa matumizi ya betri, washa Kiokoa Betri."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Kama unahitaji kuongeza muda wa matumizi ya betri, washa Kiokoa Betri"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Kidhibiti cha Betri"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Dhibiti programu kiotomatiki"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Dhibiti matumizi ya chaji kwenye programu ambazo hutumii sana"</string>
@@ -3075,15 +3094,14 @@
     <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">"Zuia ukatizaji wa maonyesho"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Ruhusu ishara zinazoonekena"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Dhibiti arifa"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wakati umewasha mipangilio ya Usinisumbue"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Arifa"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Wakati umewasha mipangilio ya Usinisumbue"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Komesha arifa"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Ionyeshe arifa lakini isiteteme wala kutoa mlio"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Unapopokea arifa mpya, simu yako haitatetema wala kutoa mlio"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ficha na uzime sauti za arifa"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Hutaona arifa kamwe"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Hutaona arifa mpya au zilizopo wakati umewasha mipangilio ya Usinisumbue. Hata hivyo, bado utaona arifa zinazohitajika kwa ajili ya hali na shughuli za msingi za simu."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Onyesha arifa bila sauti"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Arifa zitakomeshwa"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Unapopokea arifa mpya, simu yako haitatoa mlio wala mtetemo."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ficha arifa"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Hutaona arifa mpya au zilizopo"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Simu yako haitaonyesha arifa zilizopo au mpya na haitatoa mlio wala mtetemo. Arifa hazitaonekana utakapotelezesha kidole chini kuanzia sehemu ya juu ya skrini.\n\nKumbuka kuwa arifa muhimu zaidi za hali na shughuli za simu zitaonekana."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Maalum"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Washa mipangilio maalum"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ondoa mipangilio maalum"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other">Amri <xliff:g id="ON_COUNT">%d</xliff:g> zinaweza kuwaka kiotomatiki</item>
       <item quantity="one">Amri 1 inaweza kuwaka kiotomatiki</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Sawa"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Hali"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Hali zisizofuata kanuni"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Ratibu"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Milio na mitetemo"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Wakati umewasha mipangilio ya Usinisumbue, milio na mitetemo itazimwa, isipokuwa inayotoka kwenye vipengee ambavyo umeruhusu hapo juu."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Zima zote isipokuwa"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Imezimwa sauti"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Haijazimwa"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Imezimwa, lakini ruhusu <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Imezimwa, lakini ruhusu <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> na <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Imezimwa, lakini ruhusu <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> na <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Ujumbe, matukio na vikumbusho"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Wakati umewasha mipangilio ya Usinisumbue, ujumbe, vikumbusho na matukio yatakomeshwa, isipokuwa yanayotoka kwenye vipengee unavyoruhusu hapo juu. Unaweza kubadilisha mipangilio ya ujumbe ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Sasisha"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Usisasishe"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Simu yako inaweza kufanya zaidi ili kukusaidia kuangazia.\n\nSasisha mipangilio iwe:\n\nFicha arifa kabisa\n\n-Ruhusu simu kutoka kwa watu unaowasiliana nao wenye nyota na wanaokupigia simu mara kwa mara"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Ungependa kusasisha kipengele cha Usinisumbue?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Mipangilio"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Unaweza kubadilisha hali hii katika Mipangilio."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Zuia wakati skrini imewashwa"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Zuia wakati skrini imezimwa"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Kipengele cha Usinisumbue kinaweza kufanya mambo mengi mbali na kuzuia sauti zisizohitajika - kinaweza kuzuia picha pia. Hali hii inaweza kukusaidia ikiwa unajaribu kulala, kumakinikia jambo fulani au kupunguza muda unaotumia kwenye simu yako."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Zuia sauti na picha"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Skrini isiwake arifa zikiingia"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Usionyeshe arifa kabisa, ila kwa shughuli na hali za kawaida za simu"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sauti za wasifu wa kazi"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> hadi <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Simu zilizopigwa"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Ukiwasha mipangilio ya Usinisumbue, itazuia simu zinazoingia. Unaweza kubadilisha mipangilio ili uruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Ujumbe"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Ujumbe wote"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Ujumbe uliochaguliwa"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Ujumbe"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Baadhi ya ujumbe"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Kutoka kwa mtu yeyote"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kutoka kwa anwani zilizobainishwa pekee"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kutoka kwa anwani zenye nyota pekee"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Kutoka kwenye anwani zenye nyota na wanaorudia kupiga simu"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kutoka kwenye anwani na wanaorudia kupiga simu"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Kutoka kwa wanaorudia kupiga simu pekee"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hamna"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Kengele"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Maudhui"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Sauti inapoguswa"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Vikumbusho"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Matukio"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Wapiga simu wote"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wale uliowachagua"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"mtu yeyote"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"anwani"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"anwani zenye nyota"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wanaorudia kupiga simu"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Kutoka <xliff:g id="CALLER_TYPE">%1$s</xliff:g> pekee"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Kutoka <xliff:g id="CALLER_TYPE">%1$s</xliff:g> na <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Mtu yule yule akipiga simu mara ya pili katika kipindi cha dakika <xliff:g id="MINUTES">%d</xliff:g>"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Maalum"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Washa kiotomatiki"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Itaondoa sheria zote za Usinisumbue ambazo zimetengenezwa na programu hii."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Usiboreshe"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Boresha"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Huenda ikamaliza chaji ya betri yako haraka zaidi."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Imependekezwa kwa muda bora wa matumizi ya betri"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Ungetaka kuruhusu <xliff:g id="APP">%s</xliff:g> ipuuze uimarishaji wa betri?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Hamna"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Kipengee cha kuhifadhi nakala kimezimwa"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Imesasishwa na inatumia Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Sasisho linapatikana"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Huwezi kubadilisha mipangilio hii"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Kitendo hakiruhusiwi"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Haiwezi kubadilisha sauti"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Huruhusiwi kupiga simu"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Huruhusiwi kutuma SMS"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Dhibiti maelezo kwenye skrini iliyofungwa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Onyesha au ufiche maudhui ya arifa"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Zote"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Usaidizi na vidokezo"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Vidokezo na usaidizi"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Upana mdogo zaidi"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia huduma ya SMS zinazolipiwa"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Gharama ya huduma ya SMS zinazolipiwa itajumuishwa kwenye bili yako ya mtoa huduma. Ikiwa utatoa ruhusa ya programu fulani, utaweza kutuma SMS zinazolipiwa ukitumia programu hiyo."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Programu za Filamu na TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maelezo ya Utaratibu wa Mtoa Huduma"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Anzisha Utaratibu wa Mtoa Huduma"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nini kipya na cha kusisimua?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kagua simu yako mpya"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kagua kompyuta yako kibao mpya"</string>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index ce07438..36fb72b 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -417,7 +417,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"பயன்பாட்டின் இயல்புகளை பயன்படுத்து"</item>
+    <item msgid="7009918361545506251">"பயன்பாடு இயல்புகளை பயன்படுத்து"</item>
     <item msgid="1770533843436933500">"கருப்பில் வெண்மை"</item>
     <item msgid="758587126802411846">"வெண்மையில் கருப்பு"</item>
     <item msgid="1495307195241623402">"கருப்பில் மஞ்சள்"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 73c0fab..685c161 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM அணுகல் கோரிக்கை"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் தரவு இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"பிற சாதனங்களில் “<xliff:g id="DEVICE_NAME">^1</xliff:g>” எனத் தெரியும்"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"உங்கள் சாதனங்கள்"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"புதிய சாதனத்தை இணை"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"அருகிலுள்ள புளூடூத் சாதனங்களுடன் தொடர்புகொள்ள, உங்கள் டேப்லெட்டை அனுமதிக்கவும்"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMகளை மீட்டமைக்க முடியவில்லை"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"பிழை காரணமாக eSIMகளை மீட்டமைக்க முடியாது."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"எல்லா டேட்டாவையும் அழி (ஆரம்பநிலை மீட்டமைவு)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா டேட்டாவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் டேட்டா, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட பயன்பாடுகள்"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"இது, உங்கள் மொபைலின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள பின்வரும் எல்லா டேட்டாவையும் அழித்துவிடும்:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம், ஆப்ஸ் டேட்டா மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கிய பயன்பாடுகள்"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"தற்போது, பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">மிக அதிக தாமதம் (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> மிவி)</item>
       <item quantity="one">மிக அதிக தாமதம் (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> மிவி)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ஒலி &amp; அறிவிப்பு அதிர்வு ஆஃப் செய்யப்பட்டது"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ஒலி &amp; அறிவிப்பு, குறைவாக அதிரும்படி அமைக்கப்பட்டது"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ஒலி &amp; அறிவிப்பு, நடுத்தரமான அளவில் அதிரும்படி அமைக்கப்பட்டது"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"திரையின் பயன்பாடு (முழு சார்ஜ் ஆன பிறகு)"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"திரை நுகர்வு"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"பேட்டரியைக் கடைசியாக முழு சார்ஜ் செய்ததிலிருந்து, பயன்பாட்டை உபயோகப்படுத்தியது (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"பேட்டரியைக் கடைசியாக முழு சார்ஜ் செய்ததிலிருந்து, சாதனத்தை உபயோகப்படுத்தியது (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"பின்னணியில் சாதனத்தை எழுப்புகிறது"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"இருப்பிடத்தை அடிக்கடிக் கோருகிறது"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> பயன்பாடுகள், வழக்கத்திற்கு மாறாகச் செயல்படுகின்றன"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"பேட்டரி நன்றாக வேலை செய்கிறது"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ஆப்ஸ் வழக்கம்போல் இயங்குகின்றன"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"குறைந்த பேட்டரி திறன்"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"இந்த பேட்டரியால் நீண்ட நேர பேட்டரி ஆயுளை வழங்க முடியாது"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"மொபைலின் பேட்டரி நிலையை மேம்படுத்தவும்"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"டேப்லெட் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"சாதனம் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"பேட்டரி விரைவில் தீர்ந்துவிடக்கூடும்"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"உங்கள் மொபைல் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது. எதிர்பார்த்ததைவிட, உங்கள் பேட்டரி வேகமாகத் தீர்ந்துவிடக்கூடும்.\n\nகடைசியாக (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) முழுச் சார்ஜ் செய்ததிலிருந்து, அதிகளவு பேட்டரியைப் பயன்படுத்தும் <xliff:g id="NUMBER">%1$d</xliff:g> ஆப்ஸ்:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"உங்கள் டேப்லெட் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது. எதிர்பார்த்ததைவிட, உங்கள் பேட்டரி வேகமாகத் தீர்ந்துவிடக்கூடும்.\n\nகடைசியாக (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) முழுச் சார்ஜ் செய்ததிலிருந்து, அதிகளவு பேட்டரியைப் பயன்படுத்தும் <xliff:g id="NUMBER">%1$d</xliff:g> ஆப்ஸ்:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"உங்கள் சாதனம் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது. எதிர்பார்த்ததைவிட, உங்கள் பேட்டரி வேகமாகத் தீர்ந்துவிடக்கூடும்.\n\nகடைசியாக (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) முழுச் சார்ஜ் செய்ததிலிருந்து, அதிகளவு பேட்டரியைப் பயன்படுத்தும் <xliff:g id="NUMBER">%1$d</xliff:g> ஆப்ஸ்:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d ஆப்ஸைக் கட்டுப்படுத்தவும்</item>
       <item quantity="one">%1$d பயன்பாட்டைக் கட்டுப்படுத்தவும்</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"இந்தப் பயன்பாடு, பின்னணியில் இயங்கி பேட்டரியைப் பயன்படுத்த முடியும். இதனால், பேட்டரி வழக்கத்தைவிட வேகமாகத் தீர்ந்துவிடக்கூடும்."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"அகற்று"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"ரத்துசெய்"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"உங்கள் உபயோகத்தின் அடிப்படையில், சாதனம் முழுவதுமாகச் சார்ஜ் செய்யப்பட்டிருக்கும்போது, பொதுவாக <xliff:g id="TIME_DURATION">%1$s</xliff:g> நேரம் பேட்டரியைப் பயன்படுத்த முடியும்.\n\nபேட்டரி இயங்கும் நேரத்தை அதிகரிக்க, பேட்டரி சேமிப்பானை ஆன் செய்யவும்."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"பேட்டரி இயங்கும் நேரத்தை அதிகரிக்க, பேட்டரி சேமிப்பானை ஆன் செய்யவும்"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"பேட்டரி நிர்வாகி"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"தானாகவே ஆப்ஸை நிர்வகித்தல்"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"நீங்கள் அடிக்கடி பயன்படுத்தாத ஆப்ஸிற்கு பேட்டரியைக் கட்டுப்படுத்தும்"</string>
@@ -3075,38 +3094,28 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"விஷுவல் சிக்னல்களை அனுமதி"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
+    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"அறிவிப்புகள்"</string>
+    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"தனிப்பயன்"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"தனிப்பயன் அமைப்பை இயக்கு"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"தனிப்பயன் அமைப்பை அகற்று"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"தோன்றுபவை"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"பகுதியளவு மறைக்கப்பட்டவை"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"மறைக்கப்பட்டவை"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"தனிப்பயன் கட்டுப்பாடுகள்"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"திரை ஆன் செய்யப்பட்டிருக்கும்போது"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"திரை ஆஃப் செய்யப்பட்டிருக்கும்போது"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"ஒலியையும் அதிர்வையும் முடக்கு"</string>
@@ -3151,13 +3160,40 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> விதிகள் தானாகவே ஆன் செய்யப்படலாம்</item>
       <item quantity="one">1 விதி தானாகவே ஆன் செய்யப்படலாம்</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"சரி"</string>
+    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
+    <skip />
+    <!-- no translation found for zen_sound_title (424490228488531372) -->
+    <skip />
+    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
+    <skip />
+    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
+    <skip />
+    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
+    <skip />
+    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
+    <skip />
+    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
+    <skip />
+    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
+    <skip />
+    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
+    <skip />
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"புதுப்பி"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"புதுப்பிக்க வேண்டாம்"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"உங்கள் வேலையில் கவனம் தவறாமல் இருக்க, மொபைல் உங்களுக்கு அதிகமாக உதவும்.\n\nஅமைப்புகளை, கீழே குறிப்பிட்டுள்ளபடி மாற்றவும்:\n\n- அறிவிப்புகளை முழுவதும் மறை\n\n- அடிக்கடி அழைப்பவர்கள் மற்றும் நட்சத்திரமிட்ட தொடர்புகளிடம் இருந்து வரும் அழைப்புகளை அனுமதி"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"தொந்தரவு செய்ய வேண்டாம் அமைப்பைப் புதுப்பிக்கவா?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"அமைப்புகள்"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"இதை அமைப்புகளுக்குச் சென்று, பின்னர் தனிப்பயனாக்கலாம்."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"திரை ஆன் செய்யப்பட்டிருக்கும்போது தடு"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"திரை ஆஃப் செய்யப்பட்டிருக்கும்போது தடு"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"தொந்தரவு செய்ய வேண்டாம் பயன்முறையை ஆன் செய்தால், தேவைப்படாத ஒலிகள் தடுக்கப்படுவதோடு, காட்சிகளும் தடுக்கப்படக்கூடும். உறங்கவோ, பிற வேலைகளில் கவனம் செலுத்தவோ அல்லது உங்கள் மொபைலில் செலவிடும் நேரத்தை வரம்பிடவோ விரும்பும் சமயங்களில், இது உங்களுக்குப் பயன்படலாம்."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ஒலிகளையும் காட்சிகளையும் தடுத்தல்"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"திரையை ஆன் செய்யாது அல்லது அறிவிப்புகள் வரும்போது சாதனத்தை எழுப்பாது"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"அடிப்படை மொபைல் செயல்பாடு மற்றும் நிலையைத் தவிர்த்து, பிற எதற்கும் அறிவிப்புகளைக் காட்டாது"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"பணி விவர ஒலிகள்"</string>
@@ -3328,21 +3364,42 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"அழைப்புகள்"</string>
+    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"மெசேஜஸ்"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"எல்லா செய்திகளும்"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"தேர்ந்தெடுத்த செய்திகள்"</string>
+    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
+    <skip />
+    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
+    <skip />
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"அனைவரிடமிருந்தும்"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"தொடர்புகளிலிருந்து மட்டுமே"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"நட்சத்திரமிட்ட தொடர்புகளிலிருந்து மட்டுமே"</string>
+    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
+    <skip />
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ஏதுமில்லை"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"அலாரங்கள்"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"மீடியா"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"தொடுதலின்போது"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"நினைவூட்டல்கள்"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"நிகழ்வுகள்"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"எல்லா அழைப்பாளர்களும்"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"தேர்ந்தெடுக்கப்பட்ட அழைப்பாளர்கள்"</string>
+    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
+    <skip />
+    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
+    <skip />
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"மீண்டும் மீண்டும் அழைப்பவர்கள்"</string>
+    <!-- no translation found for zen_mode_calls_summary_one (2867689575419791866) -->
+    <skip />
+    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
+    <skip />
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடத்திற்குள் இரண்டாவது முறையாக அதே எண்ணிலிருந்து அழைப்பு வந்தால், அனுமதி"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"தனிப்பயன்"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"தானாகவே இயக்கு"</string>
@@ -3612,7 +3669,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"இந்தப் பயன்பாடு உருவாக்கிய தொந்தரவு செய்ய வேண்டாம் விதிகள் அனைத்தும் அகற்றப்படும்."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"மேம்படுத்த வேண்டாம்"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"மேம்படுத்து"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"பேட்டரியை மிக விரைவாகத் தீர்த்துவிடக்கூடும்"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"பேட்டரி அதிக நேரம் நீடிப்பதற்காகப் பரிந்துரைக்கப்படுகிறது"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"பேட்டரி மேம்படுத்தல்களைத் தவிர்க்க, <xliff:g id="APP">%s</xliff:g>ஐ அனுமதிக்கவா?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ஏதுமில்லை"</string>
@@ -3688,7 +3746,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"காப்புப் பிரதி முடக்கப்பட்டுள்ளது"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> பதிப்புக்குப் புதுப்பிக்கப்பட்டது"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"புதுப்பிப்பு உள்ளது"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"இந்த அமைப்பை மாற்ற முடியாது"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"செயல் அனுமதிக்கப்படவில்லை"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ஒலியளவை மாற்ற முடியாது"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"அழைப்பு அனுமதிக்கப்படவில்லை"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS அனுமதிக்கப்படவில்லை"</string>
@@ -3878,7 +3936,8 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"லாக் ஸ்கிரீனில் தகவலைக் கட்டுப்படுத்தவும்"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"அறிவிப்பு உள்ளடக்கத்தைக் காட்டும் அல்லது மறைக்கும்"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"எல்லாம்"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"ஆதரவு &amp; டிப்ஸ்"</string>
+    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
+    <skip />
     <string name="developer_smallest_width" msgid="7516950434587313360">"மிகக் குறைந்த அகலம்"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"பிரீமிய SMS அணுகலைக் கோரும் பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"பிரீமிய SMSக்குக் கட்டணம் விதிக்கப்படலாம், அது மொபைல் நிறுவன பில்களில் சேர்க்கப்படும். பயன்பாட்டிற்கான அனுமதியை இயக்கினால், அந்தப் பயன்பாட்டைப் பயன்படுத்தி பிரீமிய SMSஐ அனுப்ப முடியும்."</string>
@@ -4071,6 +4130,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"மூவி &amp; டிவி ஆப்ஸ்"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"புதியதாகவும் உற்சாகமூட்டும் விதமாகவும் என்ன உள்ளது?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"உங்கள் புதிய மொபைலைப் பற்றி அறிக"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"உங்கள் புதிய டேப்லெட்டைப் பற்றி அறிக"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 7fd54a5..64db1ea 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM యాక్సెస్ అభ్యర్థన"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ SIM కార్డ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. SIM కార్డ్‌కి యాక్సెస్ మంజూరు చేయడం వలన మీ పరికరంలో కనెక్షన్ కాలంలో డేటా కనెక్టివిటీ నిలిపివేయబడుతుంది. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>కి యాక్సెస్ మంజూరు చేయండి"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"ఇతర పరికరాలకు “<xliff:g id="DEVICE_NAME">^1</xliff:g>” వలె కనిపిస్తుంది"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"మీ పరికరాలు"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"కొత్త పరికరాన్ని జత చేయండి"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"సమీపంలోని బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయడం కోసం మీ టాబ్లెట్‌ని అనుమతించండి"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIMలను రీసెట్ చేయడం సాధ్యం కాదు"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"ఎర్రర్ కారణంగా eSIMలను రీసెట్ చేయడం సాధ్యం కాదు."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ఇందువలన మీ ఫోన్ "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"మీరు ప్రస్తుతం క్రింది ఖాతాలకు సైన్ ఇన్ చేసారు:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">చాలా ఎక్కువ ఆలస్యం (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> మి.సె)</item>
       <item quantity="one">చాలా ఎక్కువ ఆలస్యం (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> మి.సె)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"రింగ్ &amp; నోటిఫికేషన్ ఆఫ్‌కు సెట్ చేయబడింది"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"రింగ్ &amp; నోటిఫికేషన్ తక్కువకు సెట్ చేయబడ్డాయి"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"రింగ్ &amp; నోటిఫికేషన్ మధ్యస్థంకు సెట్ చేయబడ్డాయి"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ వినియోగం"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"స్క్రీన్ ఉపయోగం"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్‌వర్క్ స్కానింగ్"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="RELATIVE_TIME">^1</xliff:g>) తర్వాత యాప్ వినియోగం"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"పూర్తిగా ఛార్జ్ చేసిన తర్వాత పరికర వినియోగం (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"పరికరాన్ని నేపథ్యంలో మేల్కొల్పి ఉంచుతుంది"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"తరచుగా స్థానాన్ని అభ్యర్థిస్తుంది"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> యాప్‌లు సరిగ్గా ప్రవర్తించడం లేదు"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"బ్యాటరీ మంచి స్థితిలో ఉంది"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"యాప్‌లు సాధారణంగా అమలు అవుతున్నాయి"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"తక్కువ బ్యాటరీ సామర్థ్యం"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"బ్యాటరీ మంచి బ్యాటరీ జీవితకాలాన్ని అందించలేదు"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"మీ ఫోన్ బ్యాటరీ జీవితకాలాన్ని మెరుగుపరచండి"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"టాబ్లెట్ సాధారణం కంటే ఎక్కువగా వినియోగించింది"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"పరికరం సాధారణం కంటే ఎక్కువగా వినియోగించింది"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"బ్యాటరీ త్వరలో ఖాళీ అవ్వచ్చు"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"మీ ఫోన్ సాధారణం కంటే అధికంగా వినియోగించబడింది. మీ బ్యాటరీ అనుకున్న దాని కంటే తక్కువ సమయంలో ఖాళీ అవ్వొచ్చు.\n\n<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g> మునుపు ఛార్జ్ చేసినప్పటి నుండి అత్యధికంగా వినియోగించిన మొదటి <xliff:g id="NUMBER">%1$d</xliff:g> యాప్‌లు:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"మీ ట్యాబ్లెట్ సాధారణం కంటే అధికంగా వినియోగించబడింది. మీ బ్యాటరీ అనుకున్న దాని కంటే తక్కువ సమయంలో ఖాళీ అవ్వొచ్చు.\n\n<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g> మునుపు ఛార్జ్ చేసినప్పటి నుండి అత్యధికంగా వినియోగించిన మొదటి <xliff:g id="NUMBER">%1$d</xliff:g> యాప్‌లు:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"మీ పరికరం సాధారణం కంటే అధికంగా వినియోగించబడింది. మీ బ్యాటరీ అనుకున్న దాని కంటే తక్కువ సమయంలో ఖాళీ అవ్వొచ్చు.\n\n<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g> మునుపు ఛార్జ్ చేసినప్పటి నుండి అత్యధికంగా వినియోగించిన మొదటి <xliff:g id="NUMBER">%1$d</xliff:g> యాప్‌లు:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d యాప్‌‌లను పరిమితం చేయండి</item>
       <item quantity="one">%1$d యాప్‌ను పరిమితం చేయండి</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"ఈ యాప్ నేపథ్యంలో బ్యాటరీని ఉపయోగించగలదు. మీ బ్యాటరీ ఛార్జింగ్ త్వరగా ఖాళీ అవ్వొచ్చు."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"తీసివేయి"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"రద్దు చేయి"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"మీ వినియోగం ఆధారంగా చూస్తే, పూర్తిగా ఛార్జ్ చేయబడిన మీ బ్యాటరీ సాధారణంగా <xliff:g id="TIME_DURATION">%1$s</xliff:g>లో అయిపోతుంది.\n\nమీరు మీ బ్యాటరీ జీవితకాలాన్ని పెంచుకోవాలనుకుంటే, బ్యాటరీ సేవర్‌ను ఆన్ చేయండి."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"మీరు మీ బ్యాటరీ జీవితకాలాన్ని పెంచుకోవాలనుకుంటే, బ్యాటరీ సేవర్‌ను ఆన్ చేయండి"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"బ్యాటరీ మేనేజర్"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"యాప్‌లను ఆటోమేటిక్‌గా నిర్వహించండి"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"మీరు తరచుగా ఉపయోగించని యాప్‌ల కోసం బ్యాటరీని పరిమితం చేయండి"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"దృశ్యమానత సంకేతాలను అనుమతించండి"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"నోటిఫికేషన్‌లను పరిమితం చేయండి"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"అంతరాయం కలిగించవద్దు అనే ఎంపిక ఆన్‌లో ఉన్నప్పుడు"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"నోటిఫికేషన్‌లు"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"అంతరాయం కలిగించవద్దు అనే ఎంపిక ఆన్‌లో ఉన్నప్పుడు"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"నోటిఫికేషన్‌లను మ్యూట్ చేయండి"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"నోటిఫికేషన్‌లను చూపిస్తుంది, కానీ ధ్వనులు &amp; వైబ్రేషన్‌లను మ్యూట్ చేస్తుంది"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"కొత్త నోటిఫికేషన్‌లు వచ్చినప్పుడు మీ ఫోన్ ధ్వని లేదా వైబ్రేషన్ చేయదు"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"నోటిఫికేషన్‌లను దాచండి &amp; మ్యూట్ చేయండి"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"నోటిఫికేషన్‌లు ఎంత మాత్రమూ కనిపించవు"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"అంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు మీరు కొత్త లేదా ఇప్పటికే ఉన్న నోటిఫికేషన్‌లను చూడరు. అయినప్పటికీ, ప్రాథమిక ఫోన్ కార్యకలాపం కోసం నోటిఫికేషన్‌లు అవసరమవుతాయి మరియు స్థితి ఇప్పటికీ కనిపిస్తుంది."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"నోటిఫికేషన్‌లను శబ్దం లేకుండా చూపు"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"నోటిఫికేషన్‌లు మ్యూట్ చేయబడతాయి"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"నోటిఫికేషన్‌లు వచ్చినప్పుడు మీ ఫోన్ శబ్దం చేయదు లేదా వైబ్రేషన్ అవదు"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"నోటిఫికేషన్‌లను దాచు"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"మీరు కొత్త లేదా ఇప్పటికే ఉన్న నోటిఫికేషన్‌లను చూడలేరు"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"మీ ఫోన్, కొత్త లేదా ఇప్పటికే ఉన్న నోటిఫికేషన్‌లను చూపదు మరియు శబ్దం చేయదు లేదా వైబ్రేట్ అవదు. మీ స్క్రీన్ ఎగువ నుండి మీరు దిగువకు స్వైప్ చేసినప్పుడు నోటిఫికేషన్‌లు కనిపించవు. \n\nఫోన్ కార్యకలాపం మరియు స్థితికి సంబంధించిన క్లిష్టమైన నోటిఫికేషన్‌లు ఇప్పటికీ కనిపిస్తాయి అని గుర్తుంచుకోండి."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"అనుకూలం"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"అనుకూల సెట్టింగ్‌ని ప్రారంభించండి"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"అనుకూల సెట్టింగ్‌ని తీసివేయండి"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> నియమాలు స్వయంచాలకంగా ఆన్ కావచ్చు</item>
       <item quantity="one">1 నియమం స్వయంచాలకంగా ఆన్ కావచ్చు</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"సరే"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ప్రవర్తన"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"మినహాయింపులు"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"షెడ్యూల్"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"శబ్దం &amp; వైబ్రేషన్"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"అంఅంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించే అంశాలు మినహా, శబ్దం మరియు వైబ్రేషన్ మ్యూట్ చేయబడతాయి."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"కొన్ని మినహా అన్ని మ్యూట్ చేయండి"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"మ్యూట్ చేయబడినవి"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"మ్యూట్ చేయబడలేదు"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"మ్యూట్ చేయబడింది, కాని <xliff:g id="SOUND_TYPE">%1$s</xliff:g>ను అనుమతించు"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"మ్యూట్ చేయబడింది, కాని <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> మరియు <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ను అనుమతించు"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"మ్యూట్ చేయబడింది, కాని <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> మరియు <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ను అనుమతించు"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"సందేశాలు, ఈవెంట్‌లు &amp; రిమైండర్‌లు"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"అంఅంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించే అంశాలు మినహా, సందేశాలు, రిమైండర్‌లు మరియు ఈవెంట్‌లు మ్యూట్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబం లేదా ఇతర పరిచయాలు మిమ్మల్ని చేరుకోవడానికి అనుమతించడానికి సందేశాలు అమర్పులను మీరు సర్దుబాటు చేయవచ్చు."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"అప్‌డేట్ చేయి"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"అప్‌డేట్ చేయవద్దు"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"మీరు దృష్టి సారించడంలో సహాయపడడానికి మీ ఫోన్ చాలా చేయగలదు.\n\nఇలా సెట్టింగ్‌లను అప్‌డేట్ చేయండి:\n\n- నోటిఫికేషన్‌లను పూర్తిగా దాచండి\n\n- నక్షత్రం ఉంచిన పరిచయాలు మరియు పునరావృత కాలర్‌ల నుండి కాల్‌లను అనుమతించండి"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"అంతరాయం కలిగించవద్దును అప్‌డేట్ చేయాలా?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"సెట్టింగ్‌లు"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"మీరు దీన్ని సెట్టింగ్‌లలో మరింత అనుకూలీకరించవచ్చు."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"స్క్రీన్ ఆన్‌లో ఉన్నప్పుడు బ్లాక్ చేయండి"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"స్క్రీన్ ఆఫ్‌లో ఉన్నప్పుడు బ్లాక్ చేయండి"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"అవాంఛిత ధ్వనులు బ్లాక్ చేయలేనంత ఎక్కువగా అంతరాయం కలిగించవద్దు చేస్తుంది - ఇది దృశ్యలు కూడా బ్లాక్ చేయగలదు. మీరు మీ ఫోన్‌లో నిద్ర, దృష్టి కేంద్రీకరణ లేదా సమయ పరిమితిని ప్రయత్నిస్తున్నట్లయితే ఇది మీకు సహాయం చేయవచ్చు."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"ధ్వనులు మరియు దృశ్యాలను బ్లాక్ చేయండి"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"నోటిఫికేషన్‌ల కోసం స్క్రీన్‌ను లేదా సక్రియపరుచును ఆన్ చేయవద్దు"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"నోటిఫికేషన్‌లను ఎట్టి పరిస్థితుల్లోనూ చూపవద్దు, ప్రాథమిక ఫోన్ కార్యాకలాపం మరియు స్థితి తప్ప"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"కార్యాలయ ప్రొఫైల్ శబ్దాలు"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> నుండి <xliff:g id="END">%2$s</xliff:g> వరకు"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"కాల్‌లు"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"అంఅంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబం లేదా ఇతర పరిచయాలు మిమ్మల్ని చేరుకునేందుకు అనుమతించడానికి మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"సందేశాలు"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"అన్ని సందేశాలు"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"సందేశాలు ఎంచుకోబడ్డాయి"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"సందేశాలు"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"కొన్ని సందేశాలు"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ఎవరి నుండైనా"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"పరిచయాల నుండి మాత్రమే"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"నక్షత్రం గల పరిచయాల నుండి మాత్రమే"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"నక్షత్రం గుర్తు ఉన్న పరిచయాల మరియు రిపీట్ కాలర్‌ల నుండి"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"పరిచయాలు మరియు రిపీట్ కాలర్‌ల నుండి"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"రిపీట్ కాలర్‌ల నుండి మాత్రమే"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ఏవీ వద్దు"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"అలారాలు"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"మీడియా"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"తాకినప్పుడు ధ్వనులు"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"రిమైండర్‌లు"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ఈవెంట్‌లు"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"అందరు కాలర్‌లు"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ఎంచుకున్న కాలర్‌లు"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ఎవరైనా"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"పరిచయాలు"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"నక్షత్రం గుర్తు ఉన్న పరిచయాలు"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"పునరావృత కాలర్‌లను అనుమతించు"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> నుండి మాత్రమే"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> మరియు <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> నుండి మాత్రమే"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> నిమిషాల వ్యవధిలో అదే వ్యక్తి రెండో సారి కాల్ చేస్తే"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"అనుకూలం"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"స్వయంచాలకంగా ఆన్ చేయి"</string>
@@ -3597,7 +3639,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ఈ యాప్ ద్వారా రూపొందించిన అన్ని అంతరాయం కలిగించవద్దు నిబంధనలు తీసివేయబడతాయి."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"అనుకూలీకరించవద్దు"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"అనుకూలీకరించు"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"మీ బ్యాటరీ మరింత శీఘ్రంగా వినియోగించబడవచ్చు"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"మెరుగైన బ్యాటరీ సామర్థ్యం కోసం సిఫార్సు చేయబడింది"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"బ్యాటరీ అనుకూలీకరణలను విస్మరించడానికి <xliff:g id="APP">%s</xliff:g>ని అనుమతించాలా?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ఏదీ వద్దు"</string>
@@ -3673,7 +3716,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"బ్యాకప్ నిలిపివేయబడింది"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g>కి అప్‌డేట్ చేయబడింది"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"అప్‌డేట్ అందుబాటులో ఉంది"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"ఈ సెట్టింగ్‌ని మార్చలేరు"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"చర్య అనుమతించబడదు"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"వాల్యూమ్‌ని మార్చలేరు"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"కాల్ చేయడానికి అనుమతి లేదు"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS పంపడానికి అనుమతి లేదు"</string>
@@ -3863,7 +3906,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"లాక్ స్క్రీన్‌పై నియంత్రణ సమాచారం"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"నోటిఫికేషన్ కంటెంట్‌ను చూపు లేదా దాచు"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"అన్నీ"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"మద్దతు &amp; చిట్కాలు"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"చిట్కాలు &amp; మద్దతు"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"అతితక్కువ వెడల్పు"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలు ఏవీ ప్రీమియం SMS ప్రాప్యతను అభ్యర్థించలేదు"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ప్రీమియం SMSతో మీకు డబ్బు ఖర్చు కావచ్చు, ఈ ఛార్జీ మీ క్యారియర్ బిల్లుల్లో విధించబడుతుంది. మీరు ఒక అనువర్తనానికి అనుమతిని అందిస్తే, ఆ అనువర్తనాన్ని ఉపయోగించి ప్రీమియం SMSను పంపగలరు."</string>
@@ -4056,6 +4099,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"చలన చిత్రం &amp; టీవీ యాప్‌లు"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"క్యారియర్ కేటాయింపు సమాచారం"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"కొత్తవి మరియు అద్భుతమైనవి ఏమిటి?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"మీ కొత్త ఫోన్ గురించి తెలుసుకోండి"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"మీ కొత్త టాబ్లెట్ గురించి తెలుసుకోండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 13239ac..9bcb2f5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ส่งคำขอการเข้าถึงซิม"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ต้องการเข้าถึงซิมการ์ด การให้สิทธิ์เข้าถึงซิมการ์ดจะปิดการเชื่อมต่อข้อมูลบนอุปกรณ์ในระหว่างที่มีการเชื่อมต่อ โปรดให้สิทธิ์เข้าถึงแก่ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"อุปกรณ์อื่นๆ จะเห็นเป็นชื่อ “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"อุปกรณ์ของคุณ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"จับคู่อุปกรณ์ใหม่"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"อนุญาตให้แท็บเล็ตสื่อสารกับอุปกรณ์บลูทูธใกล้เคียง"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"รีเซ็ต eSIM ไม่ได้"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"รีเซ็ต eSIM ไม่ได้เพราะมีข้อผิดพลาด"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของโทรศัพท์ของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">เวลาหน่วงยาวมาก (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> มิลลิวินาที)</item>
       <item quantity="one">เวลาหน่วงยาวมาก (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> มิลลิวินาที)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"ตั้งค่าเมื่อมีเสียงเรียกเข้าและการแจ้งเตือนเป็นปิด"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"ตั้งค่าเมื่อมีเสียงเรียกเข้าและการแจ้งเตือนเป็นต่ำ"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"ตั้งค่าเมื่อมีเสียงเรียกเข้าและการแจ้งเตือนเป็นปานกลาง"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"การใช้งานหน้าจอตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"การใช้งานหน้าจอ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"การใช้งานแอปตั้งแต่ชาร์จจนเต็ม (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"การใช้งานอุปกรณ์ตั้งแต่ชาร์จจนเต็ม (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ปลุกให้อุปกรณ์ตื่นในพื้นหลัง"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ขอตำแหน่งบ่อย"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"แอป <xliff:g id="NUMBER">%1$d</xliff:g> แอปทำงานผิดปกติ"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"แบตเตอรี่ใช้งานได้ปกติ"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"แอปทำงานตามปกติ"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ความจุแบตเตอรี่ต่ำ"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"แบตเตอรี่มีอายุการใช้งานไม่ยาวนาน"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"เพิ่มอายุการใช้งานแบตเตอรี่ของโทรศัพท์"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ใช้งานแท็บเล็ตมากกว่าปกติ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ใช้งานอุปกรณ์มากกว่าปกติ"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"แบตเตอรี่อาจหมดเร็วๆ นี้"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"มีการใช้งานโทรศัพท์มากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่คุณใช้มากที่สุด <xliff:g id="NUMBER">%1$d</xliff:g> แอปนับตั้งแต่การชาร์จจนเต็มครั้งล่าสุด (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"มีการใช้งานแท็บเล็ตมากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่คุณใช้มากที่สุด <xliff:g id="NUMBER">%1$d</xliff:g> แอปนับตั้งแต่การชาร์จจนเต็มครั้งล่าสุด (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"มีการใช้งานอุปกรณ์มากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่คุณใช้มากที่สุด <xliff:g id="NUMBER">%1$d</xliff:g> แอปนับตั้งแต่การชาร์จจนเต็มครั้งล่าสุด (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>)"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">จำกัดแอป %1$d แอป</item>
       <item quantity="one">จำกัดแอป %1$d แอป</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"แอปนี้จะใช้แบตเตอรี่ในเบื้องหลังได้ แบตเตอรี่จึงอาจจะหมดเร็วกว่าที่คาดไว้"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"นำออก"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"ยกเลิก"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"ตามการใช้งานของคุณ โดยทั่วไปแบตเตอรี่จะใช้งานได้ประมาณ <xliff:g id="TIME_DURATION">%1$s</xliff:g> เมื่อชาร์จจนเต็ม\n\nหากคุณต้องการยืดอายุการใช้งานแบตเตอรี่ ให้เปิดโหมดประหยัดแบตเตอรี่"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"หากคุณต้องการยืดอายุการใช้งานแบตเตอรี่ ให้เปิดโหมดประหยัดแบตเตอรี่"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"ตัวจัดการแบตเตอรี่"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"จัดการแอปโดยอัตโนมัติ"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"จำกัดแบตเตอรี่สำหรับแอปที่คุณใช้ไม่บ่อย"</string>
@@ -3075,15 +3094,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"อนุญาตสัญญาณที่มองเห็น"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"จำกัดการแจ้งเตือน"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"เมื่อเปิด \"ห้ามรบกวน\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"การแจ้งเตือน"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"เมื่อเปิด \"ห้ามรบกวน\""</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"ปิดเสียงการแจ้งเตือน"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"แสดงการแจ้งเตือนแต่ปิดเสียงและการสั่น"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"โทรศัพท์จะไม่ส่งเสียงหรือสั่นเมื่อมีการแจ้งเตือนใหม่เข้ามา"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"ซ่อนและปิดเสียงการแจ้งเตือน"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"การแจ้งเตือนจะไม่ปรากฏเลย"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"คุณจะไม่เห็นการแจ้งเตือนใหม่หรือการแจ้งเตือนที่มีอยู่เมื่อเปิด \"ห้ามรบกวน\" แต่การแจ้งเตือนที่จำเป็นสำหรับกิจกรรมและสถานะเบื้องต้นของโทรศัพท์จะยังคงปรากฏ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"แสดงการแจ้งเตือนโดยไม่ส่งเสียง"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"การแจ้งเตือนจะถูกปิดเสียง"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"เมื่อมีการแจ้งเตือนเข้ามา โทรศัพท์จะไม่ส่งเสียงหรือสั่น"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ซ่อนการแจ้งเตือน"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"คุณจะไม่เห็นการแจ้งเตือนใหม่หรือการแจ้งเตือนที่มีอยู่"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"โทรศัพท์จะไม่แสดงการแจ้งเตือนใหม่หรือการแจ้งเตือนที่มีอยู่รวมถึงไม่ส่งเสียงหรือสั่น การแจ้งเตือนจะไม่ปรากฏขึ้นเมื่อคุณเลื่อนลงจากด้านบนของหน้าจอ\n\nแต่การแจ้งเตือนที่สำคัญสำหรับกิจกรรมและสถานะของโทรศัพท์จะยังคงแสดงขึ้น"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"กำหนดเอง"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"เปิดใช้การตั้งค่าที่กำหนดเอง"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"นำการตั้งค่าที่กำหนดเองออก"</string>
@@ -3120,8 +3138,8 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="1721179577382915270">"แอป (<xliff:g id="APP_NAME">%s</xliff:g>) เปิดโหมดห้ามรบกวนโดยอัตโนมัติ"</string>
     <string name="zen_interruption_level_priority" msgid="2078370238113347720">"เฉพาะเรื่องสำคัญ"</string>
     <string name="zen_mode_and_condition" msgid="4927230238450354412">"<xliff:g id="ZEN_MODE">%1$s</xliff:g> <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"เปิด/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"ปิด/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="1202632669798211342">"เปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="2348629457144123849">"ปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="4375814717589425561">"ปิด"</string>
     <string name="zen_mode_sound_summary_on" msgid="7718273231309882914">"เปิด"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="5976427426278136178">"ถามทุกครั้ง (ยกเว้นที่เปิดโดยอัตโนมัติ)"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other">กฎ <xliff:g id="ON_COUNT">%d</xliff:g> ข้อจะเปิดโดยอัตโนมัติ</item>
       <item quantity="one">กฎ 1 ข้อจะเปิดโดยอัตโนมัติ</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ตกลง"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"ลักษณะการทำงาน"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ข้อยกเว้น"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"กำหนดการ"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"เสียงและการสั่น"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"เมื่อเปิด \"ห้ามรบกวน\" ระบบเสียงและการสั่นจะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"ปิดเสียงทั้งหมดยกเว้น"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"ปิดเสียงอยู่"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"ไม่ได้ปิดเสียง"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"ปิดเสียงแล้ว แต่อนุญาตให้ <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"ปิดเสียงแล้ว แต่อนุญาตให้ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> และ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ปิดเสียงแล้ว แต่อนุญาตให้ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> และ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ข้อความ เหตุการณ์ และการช่วยเตือน"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"อัปเดต"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"ไม่ต้องอัปเดต"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"โทรศัพท์มีตัวเลือกที่ช่วยให้คุณจดจ่อกับสิ่งที่ทำอยู่ได้\n\nอัปเดตการตั้งค่าให้เป็นตัวเลือกต่อไปนี้\n\n- ซ่อนการแจ้งเตือนทั้งหมด\n\n- อนุญาตการโทรเข้าจากรายชื่อติดต่อที่ติดดาวและผู้ที่โทรซ้ำหลายครั้ง"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"อัปเดตโหมดห้ามรบกวนไหม"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"การตั้งค่า"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"คุณปรับแต่งค่านี้ได้ในการตั้งค่า"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"บล็อกเมื่อหน้าจอเปิดอยู่"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"บล็อกเมื่อหน้าจอดับ"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"โหมดห้ามรบกวนไม่เพียงบล็อกเสียงที่ไม่ต้องการ แต่ยังบล็อกภาพได้อีกด้วย ซึ่งอาจมีประโยชน์เมื่อคุณพยายามที่จะนอนหลับ ใช้สมาธิ หรือจำกัดเวลาการใช้โทรศัพท์ของคุณ"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"บล็อกเสียงและภาพ"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"ไม่ต้องเปิดหน้าจอหรือปลุกระบบเพื่อแสดงการแจ้งเตือน"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"ไม่ต้องแสดงการแจ้งเตือนเลย เว้นแต่กิจกรรมและสถานะโทรศัพท์พื้นฐาน"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"เสียงในโปรไฟล์งาน"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ถึง <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"การโทร"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"เมื่อเปิด \"ห้ามรบกวน\" สายเรียกเข้าจะถูกบล็อก คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ข้อความ"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"ข้อความทั้งหมด"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ข้อความที่เลือก"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"ข้อความ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"บางข้อความ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"จากทุกคน"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"จากรายชื่อติดต่อเท่านั้น"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"จากรายชื่อติดต่อที่ติดดาวเท่านั้น"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"จากรายชื่อติดต่อที่ติดดาวและผู้โทรซ้ำ"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"จากรายชื่อติดต่อและผู้โทรซ้ำ"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"จากผู้โทรซ้ำเท่านั้น"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ไม่มี"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"การปลุก"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"สื่อ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"เสียงแตะ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"การช่วยเตือน"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"กิจกรรม"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"ผู้โทรทั้งหมด"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ผู้โทรที่เลือกไว้"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"ทุกคน"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"รายชื่อติดต่อ"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"รายชื่อติดต่อที่ติดดาว"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ผู้โทรซ้ำ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"จาก <xliff:g id="CALLER_TYPE">%1$s</xliff:g> เท่านั้น"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"จาก <xliff:g id="CALLER_TYPE">%1$s</xliff:g> และ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ถ้าผู้โทรคนเดิมโทรเป็นครั้งที่ 2 ภายใน <xliff:g id="MINUTES">%d</xliff:g> นาที"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"กำหนดเอง"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"เปิดโดยอัตโนมัติ"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ระบบจะนำกฎ \"ห้ามรบกวน\" ทั้งหมดที่แอปนี้สร้างขึ้นออก"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ไม่เพิ่มประสิทธิภาพ"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"เพิ่มประสิทธิภาพ"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"อาจทำให้แบตเตอรี่หมดอย่างรวดเร็ว"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"แนะนำเพื่ออายุการใช้งานแบตเตอรี่ที่นานขึ้น"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ให้ <xliff:g id="APP">%s</xliff:g> ละเว้นการเพิ่มประสิทธิภาพแบตเตอรี่"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ไม่มี"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"ปิดใช้การสำรองข้อมูลอยู่"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"อัปเดตเป็น Android <xliff:g id="VERSION">%1$s</xliff:g> แล้ว"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"มีเวอร์ชันอัปเดต"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"เปลี่ยนการตั้งค่านี้ไม่ได้"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ไม่อนุญาตให้ดำเนินการนี้"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"ปรับระดับเสียงไม่ได้"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ไม่อนุญาตให้โทรออก"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ไม่อนุญาตให้ส่ง SMS"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"ควบคุมข้อมูลในหน้าจอล็อก"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"แสดงหรือซ่อนเนื้อหาการแจ้งเตือน"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ทั้งหมด"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"การสนับสนุนและเคล็ดลับ"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"เคล็ดลับและการสนับสนุน"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ความกว้างที่เล็กที่สุด"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ไม่มีแอปใดที่ติดตั้งไว้ขอเข้าถึง SMS แบบพรีเมียม"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS แบบพรีเมียมอาจมีค่าใช้จ่ายและจะเพิ่มเข้าไปในใบเรียกเก็บเงินจากผู้ให้บริการ หากคุณให้สิทธิ์แอปหนึ่งๆ คุณจะใช้แอปนั้นส่ง SMS แบบพรีเมียมได้"</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"แอปภาพยนตร์และทีวี"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"ข้อมูลการจัดสรรผู้ให้บริการ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"มีอะไรใหม่และน่าสนใจบ้าง"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ทัวร์ชมโทรศัพท์เครื่องใหม่"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ทัวร์ชมแท็บเล็ตเครื่องใหม่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c67c826..30b4d3a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kahilingan sa pag-access sa SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Gustong i-access ng <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ang iyong SIM card. Idi-disable ng pagbibigay ng access sa SIM ang connectivity ng data sa iyong device habang nakakonekta. Bigyan ng access ang <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Nakikita bilang “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sa iba pang device"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ang iyong mga device"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Magpares ng bagong device"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Pinapayagan ang iyong tablet na makipag-ugnayan sa mga kalapit na Bluetooth device"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Hindi ma-reset ang mga eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Hindi ma-reset ang mga eSIM dahil nagkaroon ng error."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Burahin ang lahat ng data (factory reset)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Buburahin nito ang lahat ng data mula sa "<b>"internal storage"</b>" ng iyong tablet, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Buburahin nito ang lahat ng data mula sa "<b>"internal storage"</b>" ng iyong telepono, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"Data at mga setting ng system at app"</li>\n<li>"Na-download na mga app"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="one">Sobrang tagal na pagkaantala (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Sobrang tagal na pagkaantala (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> na ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Naka-off ang pag-ring at notification"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Nakatakda sa mahina ang pag-ring at notification"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Nakatakda sa katamtaman ang pag-ring at notification"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Paggamit ng screen mula noong napuno ang baterya"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pagkonsumo ng screen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Paggamit ng app mula noong napuno ang baterya (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Paggamit ng device mula noong napuno ang baterya (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Pinapagana ang device sa background"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Madalas humiling ng lokasyon"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> (na) app na hindi normal na gumagana"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Nasa magandang kundisyon ang baterya"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Tumatakbo nang normal ang mga app"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Paubos na ang baterya"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Hindi na magtatagal ang baterya"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Patagalin ang baterya ng iyong telepono"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Nagamit ang tablet nang higit sa karaniwan"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Nagamit ang device nang higit sa karaniwan"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Malapit nang maubos ang baterya"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Nagamit ang iyong telepono nang higit sa karaniwan. Maaaring maubos ang iyong baterya nang mas mabilis kaysa sa inaasahan.\n\nNangungunang <xliff:g id="NUMBER">%1$d</xliff:g> (na) app mula noong huling kumpletong pag-charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Nagamit ang iyong tablet nang higit sa karaniwan. Maaaring maubos ang iyong baterya nang mas mabilis kaysa sa inaasahan.\n\nNangungunang <xliff:g id="NUMBER">%1$d</xliff:g> (na) app mula noong huling kumpletong pag-charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Nagamit ang iyong device nang higit sa karaniwan. Maaaring maubos ang iyong baterya nang mas mabilis kaysa sa inaasahan.\n\nNangungunang <xliff:g id="NUMBER">%1$d</xliff:g> (na) app mula noong huling kumpletong pag-charge(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Paghigpitan ang %1$d app</item>
       <item quantity="other">Paghigpitan ang %1$d na app</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Makakagamit ang app na ito ng baterya sa background. Maaaring maubos ang iyong baterya nang mas maaga kaysa sa inaasahan."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Alisin"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Kanselahin"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Batay sa iyong paggamit, karaniwang tumatagal ang baterya mo nang humigit-kumulang <xliff:g id="TIME_DURATION">%1$s</xliff:g> kapag ganap na na-charge.\n\nKung kailangan mong patagalin ang iyong baterya, i-on ang Pangtipid sa Baterya."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Kung kailangan mong patagalin ang iyong baterya, i-on ang Pangtipid sa Baterya"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Awtomatikong pamahalaan ang mga app"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Limitahan ang baterya para sa mga app na hindi mo madalas gamitin"</string>
@@ -3075,15 +3094,14 @@
     <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">"I-block ang visual na abala"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Payagan ang visual na signal"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Paghigpitan ang mga notification"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kapag naka-on ang Huwag Istorbohin"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Mga Notification"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Kapag naka-on ang Huwag Istorbohin"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"I-mute ang mga notification"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Magpakita ng mga notification ngunit i-mute ang mga tunog at pag-vibrate"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Kapag may mga darating na bagong notification, hindi tutunog o magva-vibrate ang iyong telepono"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Itago at i-mute ang mga notification"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Walang lalabas na anumang notification"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Hindi ka makakakita ng mga bago o kasalukuyang notification kapag naka-on ang Huwag Istorbohin. Gayunpaman, lalabas pa rin ang mga notification na kinakailangan para sa pangunahing aktibidad at status ng telepono."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tahimik na ipakita ang mga notification"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Imu-mute ang mga notification"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Kapag may dumating na mga notification, hindi tutunog o magva-vibrate ang iyong telepono."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Itago ang mga notification"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Hindi mo makikita ang mga bago o dati nang notification"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Hindi magpapakita ng mga bago o dati nang notification ang iyong telepono, at hindi tutunog o magva-vibrate. Hindi lalabas ang mga notification kapag nag-swipe ka pababa mula sa itaas ng iyong screen.\n\nTandaan, lalabas pa rin ang mahahalagang notification para sa aktibidad at status ng telepono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"I-enable ang custom na setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Alisin ang custom na setting"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> panuntunan ang maaaring awtomatikong mag-on</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> na panuntunan ang maaaring awtomatikong mag-on</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Gawi"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Mga Exception"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Iskedyul"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Tunog at pag-vibrate"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Kapag naka-on ang Huwag Istorbohin, mamu-mute ang tunog at pag-vibrate, maliban sa mga item na pinapayagan mo sa itaas."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"I-mute lahat maliban sa"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Na-mute"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Hindi naka-mute"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Naka-mute, pero payagan ang <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Naka-mute, pero payagan ang <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> at <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Naka-mute, pero payagan ang <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, at <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mga mensahe, event, at paalala"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kapag naka-on ang Huwag Istorbohin, mamu-mute ang mga mensahe, paalala, at event, maliban sa mga item na pinapayagan mo sa itaas. Maaari mong isaayos ang mga setting ng mensahe para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"I-update"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Huwag i-update"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Marami ang magagawa ng iyong telepono para matulungan kang makatuon.\n\nI-update ang mga setting para:\n\n- Itago ang mga notification nang tuluyan\n\n- Payagan ang mga tawag mula sa mga naka-star na contact at umulit na tumatawag"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"I-update ang Huwag Istorbohin?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Mga Setting"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Mas mako-customize mo pa ito sa Mga Setting."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"I-block kapag naka-on ang screen"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"I-block kapag naka-off ang screen"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Maraming nagagawa ang Huwag Istorbohin na higit pa sa pag-block ng mga hindi gustong tunog - naba-block din nito ang mga visual. Maaari itong makatulong kung sinusubukan mong matulog, mag-focus, o limitahan ang oras sa paggamit ng iyong telepono."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"I-block ang mga tunog at visual"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Huwag i-on ang screen o i-wake para sa mga notification"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Huwag nang ipakita ang mga notification, maliban sa pangunahing aktibidad at status ng telepono"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Mga tunog sa profile sa trabaho"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> hanggang <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Mga Tawag"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kapag naka-on ang Huwag Istorbohin, bina-block ang mga papasok na tawag. Maaari mong isaayos ang mga setting para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mga Mensahe"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Lahat ng mensahe"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Mga napiling mensahe"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mga Mensahe"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Ilang mensahe"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Mula sa sinuman"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Mula sa mga contact lang"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Mula sa mga contact na may star lang"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Mula sa mga naka-star na contact at umuulit na tumatawag"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Mula sa mga contact at umuulit na tumatawag"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Mula sa mga umuulit na tumatawag lang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Wala"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Mga Alarm"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Mga tunog sa pagpindot"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mga Paalala"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Mga Event"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Lahat ng tumatawag"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Mga napiling tumatawag"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"kahit sino"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"mga contact"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"mga naka-star na contact"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Mga umulit na tumatawag"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Mula sa <xliff:g id="CALLER_TYPE">%1$s</xliff:g> lang"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Mula sa <xliff:g id="CALLER_TYPE">%1$s</xliff:g> at <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Kung muling tumawag ang isang tao sa loob ng <xliff:g id="MINUTES">%d</xliff:g> (na) minuto"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Custom"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Awtomatikong i-on"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Aalisin ang lahat ng panuntunang Huwag Istorbohin na ginawa ng app na ito."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Huwag i-optimize"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"I-optimize"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Maaaring mas mabilis maubos ang iyong baterya."</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Inirerekomenda para sa mas matagal na baterya"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Payagan ang <xliff:g id="APP">%s</xliff:g> na balewalain ang mga pag-optimize sa baterya?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Wala"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Na-disable ang pag-back up"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Na-update sa Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"May available na update"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Hindi mababago ang setting"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Hindi pinapayagan ang pagkilos"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Hindi mababago ang volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Hindi pinapayagan ang pagtawag"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Hindi pinapayagan ang SMS"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolin ang impormasyon sa lock screen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ipakita o itago ang content ng notification"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Lahat"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Suporta at mga tip"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Mga tip at suporta"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Pinakamaliit na lapad"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Walang mga naka-install na app ang humiling ng access sa Premium SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Maaaring kailanganin mong magbayad para sa Premium SMS at isasama ito sa mga singilin ng iyong carrier. Kung ie-enable mo ang pahintulot para sa isang app, magagawa mong magpadala ng premium SMS gamit ang app na iyon."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Mga app sa Pelikula at TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Impormasyon sa Provisioning ng Carrier"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"I-trigger ang Provisioning ng Carrier"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ano ang bago at kapana-panabik?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Maglibot sa iyong bagong telepono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Maglibot sa iyong bagong tablet"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ed1df28..6e08896 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM\'e erişim isteği"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, SIM kartınıza erişmek istiyor. SIM karta erişim vermek, bağlantı süresince cihazınızın veri bağlantısını devre dışı bırakır. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> adlı cihaza bağlantı verin"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Diğer cihazlar tarafından \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" olarak görülür"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihaz eşle"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tabletinizin yakındaki Bluetooth cihazlarıyla iletişim kurmasına izin verin"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM\'ler sıfırlanamıyor"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM\'ler bir hata nedeniyle sıfırlanamıyor."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Çok uzun gecikme süresi (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Çok uzun gecikme süresi (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Zil ve titreşim kapatıldı"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Zil ve titreşim düşük olarak ayarlandı"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Zil ve titreşim orta düzeye ayarlandı"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam şarj sonrası ekran kullanımı"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın pil tüketimi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Tam şarj sonrası uygulama kullanımı (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Tam şarjdan beri cihaz kullanımı (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Cihazı arka planda uyku modundan çıkarıyor"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Sık sık konum bilgisi istiyor"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> uygulama hatalı çalışıyor"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Pil iyi durumda"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Uygulamalar normal şekilde çalışıyor"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Düşük pil kapasitesi"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Pil yeterli pil ömrü sağlayamıyor"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Telefonunuzun pil ömrünü uzatın"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet normalden daha fazla kullanıldı"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Cihaz normalden daha fazla kullanıldı"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Pil kısa süre sonra bitebilir"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefonunuz normalden fazla kullanıldı. Piliniz beklenenden daha erken bitebilir.\n\nSon şarjdan beri (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) en çok pil tüketen <xliff:g id="NUMBER">%1$d</xliff:g> uygulama:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Tabletiniz normalden fazla kullanıldı. Piliniz beklenenden daha erken bitebilir.\n\nSon şarjdan beri (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) en çok pil tüketen <xliff:g id="NUMBER">%1$d</xliff:g> uygulama:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Cihazınız normalden fazla kullanıldı. Piliniz beklenenden daha erken bitebilir.\n\nSon şarjdan beri (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) en çok pil tüketen <xliff:g id="NUMBER">%1$d</xliff:g> uygulama:"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d uygulamayı kısıtla</item>
       <item quantity="one">%1$d uygulamayı kısıtla</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Bu uygulama arka planda pil gücünü kullanabilecek. Piliniz beklenenden daha erken bitebilir."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Kaldır"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"İptal"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Kullanımınıza dayalı olarak piliniz tam olarak şarj edildiğinde genellikle <xliff:g id="TIME_DURATION">%1$s</xliff:g> süreyle enerji sağlar.\n\nPil ömrünüzü uzatmanız gerekiyorsa Pil Tasarrufu özelliğini açın."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Pil ömrünüzü uzatmanız gerekiyorsa Pil Tasarrufu özelliğini açın"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Pil Yöneticisi"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Uygulamaları otomatik olarak yönet"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Sık kullanmadığınız uygulamalar için pil tüketimini sınırlayın"</string>
@@ -3075,15 +3094,14 @@
     <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">"Görsel bildirimleri engelle"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Görsel sinyallere izin ver"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Bildirimleri kısıtla"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Rahatsız etmeyin ayarı açık olduğunda"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Bildirimler"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Rahatsız etmeyin ayarı açık olduğunda"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Bildirimleri yoksay"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Bildirimleri göster, ama sesleri ve titreşimleri yoksay"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Yeni bildirim geldiğinde telefonunuz ses çıkartmaz veya titreşmez"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Bildirimleri gizle ve yoksay"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Bildirimler hiç görünmez"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Rahatsız Etmeyin ayarı açık olduğunda yeni veya mevcut bildirimleri görmezsiniz. Ancak, temel telefon işlemleri ve durumu için gereken bildirimleri görmeye devam edersiniz."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bildirimleri sessizce göster"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Bildirimlerin sesi kapatılır"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Bildirim geldiğinde telefonunuz ses çıkartmaz veya titreşmez."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Bildirimleri gizle"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Yeni veya mevcut bildirimleri görmezsiniz"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonunuz yeni veya mevcut bildirimleri göstermez, ses çıkartmaz ve titreşmez. Parmağınızı ekranınızın üst kısmından aşağı doğru kaydırdığınızda bildirimler görünmez.\n\nTelefon işlemleri ve durumu ile ilgili önemli bildirimlerin gösterilmeye devam edeceğini unutmayın."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Özel"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Özel ayarı etkinleştir"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Özel ayarı kaldır"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> kural otomatik olarak açılamıyor</item>
       <item quantity="one">1 kural otomatik olarak açılamıyor</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Tamam"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Davranış"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"İstisnalar"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Program"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Ses ve titreşim"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Rahatsız Etmeyin ayarı açık olduğunda ses ve titreşim kapatılır (yukarıda izin verdiğiniz öğeler hariç)."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Şu öğe hariç hepsinin sesini kapat:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Ses kapatıldı"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ses kapatılmadı"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Ses kapatıldı, ancak <xliff:g id="SOUND_TYPE">%1$s</xliff:g> seslerine izin ver"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Ses kapatıldı, ancak <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ve <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> seslerine izin ver"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ses kapatıldı, ancak <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ve <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> seslerine izin ver"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesajlar, etkinlikler ve hatırlatıcılar"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Rahatsız Etmeyin ayarı açık olduğunda mesajların, hatırlatıcıların ve etkinliklerin sesi kapatılır (yukarıda izin verdiğiniz öğeler hariç). Mesaj ayarlarını arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Güncelle"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Güncelleme"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefonunuz odaklanmanıza yardımcı olmak için daha fazlasını yapabilir.\n\nŞunları yapmak için ayarları güncelleyin:\n\n- Bildirimleri tamamen gizleme\n\n- Yıldız işaretli kişilerden ve tekrar arayan kişilerden gelen aramalara izin verme"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Rahatsız Etmeyin özelliği güncellensin mi?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ayarlar"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Bunu Ayarlar\'da daha fazla özelleştirebilirsiniz."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Ekran açıkken engelle"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Ekran kapalıyken engelle"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Rahatsız Etmeyin ayarı istenmeyen sesleri engellemekten fazlasını yapabilir ve görselleri de engelleyebilir. Bu seçenek, uyumaya veya konsantre olmaya çalışıyorsanız ya da telefonunuzda harcadığınız süreyi sınırlamak istiyorsanız size yardımcı olabilir."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Sesleri ve görselleri engelle"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Bildirimler için ekranı açma veya uyandırma"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Temel telefon etkinliği ve durumu hariç bildirimleri hiç gösterme"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"İş profili sesleri"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ile <xliff:g id="END">%2$s</xliff:g> arası"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Çağrılar"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Rahatsız Etmeyin ayarı açık olduğunda gelen aramalar engellenir. Ayarları arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"İletiler"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tüm iletiler"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Seçili iletiler"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesajlar"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Bazı mesajlar"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Herhangi birinden"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Yalnızca kayıtlı kişilerden"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Yalnızca yıldızlı kişilerden"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Yıldız işaretli kişilerden ve tekrar arayanlardan"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kişilerden ve tekrar arayanlardan"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Yalnızca tekrar arayanlardan"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hiçbiri"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmlar"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Medya"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Dokunma sesleri"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Hatırlatıcılar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Etkinlikler"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Tüm arayanlar"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Seçili arayanlar"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"herkes"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kişiler"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"yıldız işaretli kişiler"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Tekrar arayanlar"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Yalnızca şu kaynaktan: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Şu kaynaklardan: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> ve <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Aynı kişi <xliff:g id="MINUTES">%d</xliff:g> dakika içinde ikinci defa ararsa"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Özel"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Otomatik olarak aç"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Bu uygulama tarafından oluşturulmuş tüm Rahatsız Etmeyin kuralları kaldırılacak."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Optimize etme"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimize et"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Pilinizi daha hızlı tüketebilir"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Daha uzun pil ömrü için önerilir"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> adlı uygulamaya pil optimizasyonlarını yoksayma izni verilsin mi?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Yok"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Yedekleme devre dışı"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> sürümüne güncellendi"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Uygulama güncellendi"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Bu ayar değiştirilemez"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"İşleme izin verilmedi"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Ses düzeyi değiştirilemez"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Telefon etmeye izin verilmiyor"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS\'e izin verilmiyor"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kilit ekranınızdaki bilgileri kontrol edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirim içeriğini gösterin veya gizleyin"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tümü"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Destek ve ipuçları"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"İpuçları ve destek"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"En küçük genişlik"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Yüklü hiçbir uygulama, Premium SMS erişimi isteğinde bulunmadı"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS kullanımı, para ödemenizi gerektirebilir ve bu ücret operatör faturanıza eklenir. Bir uygulamaya bu izni verdiğinizde söz konusu uygulamayı kullanarak ücretli SMS gönderebilirsiniz."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film ve TV uygulamaları"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatör Temel Hazırlık Bilgileri"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Tetikleyici Operatör Temel Hazırlığı"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni ve heyecan verici neler var?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuzu tanıyın"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni tabletinizi tanıyın"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 09911fb..51c4f55 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запит на доступ до SIM-карти"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Пристрою <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> потрібен доступ до вашої SIM-карти. Коли він використовуватиме SIM-карту, ви не зможете передавати дані. Надати доступ пристрою <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Видно як \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" для інших пристроїв"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваші пристрої"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Підключити новий пристрій"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Дозвольте планшету обмінюватися даними з пристроями Bluetooth поруч"</string>
@@ -1479,6 +1481,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Не вдається скинути eSIM-карти"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Не вдається скинути eSIM-карти через помилку."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Стерти всі дані (відновити заводські налаштування)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшета, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та додатків"</li>\n<li>"завантажені додатки"</li>"."</string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого телефона, зокрема:\n\n"<li>"Ваш обліковий запис Google"</li>\n<li>"Дані й налаштування системи та додатків"</li>\n<li>"Завантажені додатки"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
@@ -2038,6 +2042,8 @@
       <item quantity="many">Дуже довга затримка (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
       <item quantity="other">Дуже довга затримка (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Вібрацію для дзвінків і сповіщень вимкнено"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Низька інтенсивність для дзвінків і сповіщень"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Середня інтенсивність для дзвінків і сповіщень"</string>
@@ -2149,8 +2155,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Використання екрана після повного заряджання"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Споживання заряду екраном"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканування мобільної мережі"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Використання додатками після повного заряджання (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Використання пристроєм після повного заряджання (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2181,8 +2187,10 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Виводить пристрій із режиму сну у фоновому режимі"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Часто запитує геодані"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Кількість додатків, які працюють неналежним чином: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Акумулятор заряджено"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Додатки працюють нормально"</string>
+    <string name="battery_tip_summary_title" msgid="368729969313047399">"Додатки працюють звичайно"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефон використовує звичайний обсяг заряду акумулятора у фоновому режимі"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Планшет використовує звичайний обсяг заряду акумулятора у фоновому режимі"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Пристрій використовує звичайний обсяг заряду акумулятора у фоновому режимі"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Низький заряд акумулятора"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Акумулятор працюватиме недовго"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Подовжте час роботи акумулятора телефона"</string>
@@ -2197,9 +2205,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Планшет використовується більше, ніж зазвичай"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Пристрій використовується більше, ніж зазвичай"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Акумулятор невдовзі розрядиться"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Телефон використовувався більше, ніж зазвичай. Акумулятор може розрядитися швидше.\n\nНайактивніші додатки (<xliff:g id="NUMBER">%1$d</xliff:g>) з часу останнього заряджання (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Планшет використовувався більше, ніж зазвичай. Акумулятор може розрядитися швидше.\n\nНайактивніші додатки (<xliff:g id="NUMBER">%1$d</xliff:g>) з часу останнього заряджання (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Пристрій використовувався більше, ніж зазвичай. Акумулятор може розрядитися швидше.\n\nНайактивніші додатки (<xliff:g id="NUMBER">%1$d</xliff:g>) з часу останнього заряджання (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Обмежити %1$d додаток</item>
       <item quantity="few">Обмежити %1$d додатки</item>
@@ -2238,8 +2249,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Цей додаток зможе споживати заряд акумулятора у фоновому режимі. Акумулятор може розрядитися швидше."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Скасувати"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Скасувати"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Згідно з даними про використання, повністю зарядженого акумулятора зазвичай вистачає на <xliff:g id="TIME_DURATION">%1$s</xliff:g>. \n\nЩоб пристрій працював довше, увімкніть режим економії заряду акумулятора."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Щоб пристрій працював довше, увімкніть режим економії заряду акумулятора"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Додатки використовують звичайний обсяг заряду акумулятора. Якщо вони споживатимуть забагато енергії, телефон запропонує відповідні дії.\n\nВи завжди можете ввімкнути режим економії заряду акумулятора."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Додатки використовують звичайний обсяг заряду акумулятора. Якщо вони споживатимуть забагато енергії, планшет запропонує відповідні дії.\n\nВи завжди можете ввімкнути режим економії заряду акумулятора."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Додатки використовують звичайний обсяг заряду акумулятора. Якщо вони споживатимуть забагато енергії, пристрій запропонує відповідні дії.\n\nВи завжди можете ввімкнути режим економії заряду акумулятора."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Диспетчер заряду акумулятора"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Керувати додатками автоматично"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Обмежте споживання заряду акумулятора для додатків, які рідко використовуються"</string>
@@ -3145,15 +3157,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволити візуальні сигнали"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Обмежити сповіщення"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Коли ввімкнено режим \"Не турбувати\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Сповіщення"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Коли ввімкнено режим \"Не турбувати\""</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Вимкнути сповіщення"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Показувати сповіщення, але вимкнути звук і вібрацію"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Коли надходитимуть нові сповіщення, телефон не дзвонитиме й не вібруватиме"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Сховати й вимкнути сповіщення"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Сповіщення не з’являтимуться"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Якщо ввімкнено режим \"Не турбувати\", нові чи наявні сповіщення не з’являтимуться (крім тих, які стосуються основних функцій і статусу телефона)."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Показувати сповіщення без звуку"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Звук для сповіщень буде вимкнено"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Коли надходитимуть сповіщення, телефон не подаватиме сигнал і не вібруватиме."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Сховати сповіщення"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Нові чи наявні сповіщення не з’являтимуться"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефон не показуватиме нові чи наявні сповіщення, не подаватиме сигнал і не вібруватиме. Сповіщення не з’являтимуться, коли ви проводитимете пальцем від верху екрана.\n\nПам’ятайте: ви бачитимете важливі сповіщення про активність і статус телефона."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Власні налаштування"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Увімкнути власне налаштування"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Видалити власне налаштування"</string>
@@ -3209,13 +3220,27 @@
       <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> правил можуть вмикатись автоматично</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> правила можуть вмикатись автоматично</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Поведінка"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Винятки"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Графік"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Звук і вібрація"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"У режимі \"Не турбувати\" звук і вібрація вимикатиметься для всіх елементів, окрім дозволених вище."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Вимкнути звук для всього, винятки:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Без звуку"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Звук увімкнено"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Звук вимкнено. Дозволити лише <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Звук вимкнено. Дозволити лише <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> та <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Звук вимкнено. Дозволити лише <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> та <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Повідомлення, події й нагадування"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"У режимі \"Не турбувати\" звук для повідомлень, нагадувань і подій вимикатиметься (окрім дозволених елементів вище). Можна змінити налаштування повідомлень, щоб ваші друзі, члени сім’ї та інші контакти могли зв’язатися з вами."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Оновити"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Не оновлювати"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Телефон може допомогти вам зосередитись.\n\nОновіть налаштування, щоб:\n\n- ховати всі сповіщення\n\n- дозволити виклики від контактів із зірочкою й постійних абонентів"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Оновити режим \"Не турбувати\"?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Налаштування"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Це можна змінити в налаштуваннях."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Блокувати, коли екран увімкнено"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Блокувати, коли екран вимкнено"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"У режимі \"Не турбувати\" можна блокувати не лише звукові, а й візуальні сповіщення. Це зручно, якщо ви хочете заснути, зосередитися або менше користуватись телефоном."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Блокувати звукові та візуальні сповіщення"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Не вмикати екран і не виводити з режиму сну, коли надходять сповіщення"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Узагалі не показувати сповіщення, окрім щодо основних функцій телефона та статусу"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуки робочого профілю"</string>
@@ -3394,21 +3419,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Дзвінки"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Коли режим \"Не турбувати\" ввімкнено, вхідні дзвінки блокуються. Можна змінити налаштування, щоб ваші друзі, члени сім’ї та інші контакти могли зв’язатися з вами."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Повідомлення"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Усі повідомлення"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Вибрані повідомлення"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Повідомлення"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Деякі повідомлення"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Від усіх"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Лише від контактів"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Лише від позначених контактів"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Від контактів із зірочкою та постійних абонентів"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Від контактів і постійних абонентів"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Лише від постійних абонентів"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ні від кого"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Медіа-вміст"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Звуки під час дотику"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Нагадування"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Події"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Усі абоненти"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Вибрані абоненти"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"усі"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"контакти"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"контакти із зірочкою"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Повторні вхідні виклики"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Лише від таких абонентів: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Лише від таких абонентів: <xliff:g id="CALLER_TYPE">%1$s</xliff:g> та <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Якщо та сама людина телефонує вдруге протягом <xliff:g id="MINUTES">%d</xliff:g> хв"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Спеціальні звуки"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Вмикати автоматично"</string>
@@ -3698,7 +3733,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Усі правила режиму \"Не турбувати\", які створив цей додаток, буде видалено."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Не оптимізувати"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Оптимізувати"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Акумулятор може розряджатися швидше"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Рекомендується для економії заряду акумулятора"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Дозволити додатку <xliff:g id="APP">%s</xliff:g> ігнорувати оптимізацію використання заряду акумулятора?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Немає"</string>
@@ -3776,7 +3812,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Резервне копіювання вимкнено"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Оновлено до Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Доступне оновлення"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Налаштування не можна змінити"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Дію не дозволено"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Гучність не можна змінити"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Телефонувати заборонено"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Надсилати SMS заборонено"</string>
@@ -3978,7 +4014,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Керуйте інформацією на заблокованому екрані"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показуйте або приховуйте вміст сповіщень"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Усі"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Підтримка та поради"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Поради та підтримка"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменша ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Установлені додатки не запитували доступу до платних SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Кошти за платні SMS стягує оператор. Ви зможете надсилати платні SMS через додаток, якому надасте такий дозвіл."</string>
@@ -4191,6 +4227,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Фільми й серіали"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інформація про ініціалізацію оператора"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активатор ініціалізації оператора"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Що нового та цікавого?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ознайомтеся зі своїм новим телефоном"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ознайомтеся зі своїм новим планшетом"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 35c0e39..7ec859f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏SIM تک رسائی کی درخواست"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> آپ کے SIM کارڈ تک رسائی حاصل کرنا چاہتا ہے۔ SIM کارڈ تک رسائی دینے سے کنکشن کے دورانیہ تک کیلئے آپ کے آلہ پر ڈیٹا کنیکٹیوٹی غیر فعال ہو جائے گی۔ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> تک رسائی دیں"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"دیگر آلات کیلئے بطور ’<xliff:g id="DEVICE_NAME">^1</xliff:g>‘ مرئی ہے"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"آپ کے آلات"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"نئے آلہ کا جوڑا بنائیں"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"اپنے ٹیبلیٹ کو قریبی بلوٹوتھ آلات سے مواصلت کرنے کی اجازت دیں"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"‏eSIMs کو دوبارہ ترتیب نہیں دے سکتے"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"‏ایک خرابی کی وجہ سے eSIMs کو دوبارہ ترتیب نہیں دیا جا سکتا۔"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"تمام ڈیٹا حذف کریں (فیکٹری ری سیٹ)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏یہ آپ کے ٹیبلٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو حذف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">بہت طویل توقف (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ملی سیکنڈ)</item>
       <item quantity="one">بہت طویل توقف (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ملی سیکنڈ)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"گھنٹی بجنا اور اطلاعات آف پر سیٹ ہیں"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"گھنٹی بجنا اور اطلاعات کم پر سیٹ ہیں"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"گھنٹی بجنا اور اطلاعات متوسط پر سیٹ ہیں"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"مکمل چارج کے بعد سے اسکرین کا استعمال"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"اسکرین کی کھپت"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"مکمل چارج کے بعد سے ایپ کا استعمال (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"مکمل چارج کے بعد سے آلہ کا استعمال (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"پس منظر مییں آلہ چل رہا ہے"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"کثرت سے مقام کی درخواست کی جا رہی ہے"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ایپس صحیح سے کام نہیں کر رہی ہیں"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"بیٹری اچھی حالت میں ہے"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"ایپس حسب معمول چل رہی ہیں"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"بیٹری کی صلاحیت کم ہے"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"بیٹری زیادہ دیر تک نہیں چل سکتی"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"اپنے فون کی بیٹری لائف کو بہتر بنائیں"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ٹیبلیٹ معمول سے زیادہ استعمال کیا گیا ہے"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"آلہ معمول سے زیادہ استعمال کیا گیا ہے"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"بیٹری جلد ہی ختم ہو سکتی ہے"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"آپ کا فون معمول سے زیادہ استعمال کیا گيا ہے۔ آپ کی بیٹری توقع سے پہلے ختم ہو سکتی ہے۔ \n\nآخری بار چارج کئے جانے کے بعد سے زیادہ بیٹری استعمال کرنے والی سرفہرست <xliff:g id="NUMBER">%1$d</xliff:g> ایپس(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"آپ کا ٹیبلیٹ معمول سے زیادہ استعمال کیا گيا ہے۔ آپ کی بیٹری توقع سے پہلے ختم ہو سکتی ہے۔\n\nآخری بار چارج کیے جانے کے بعد سے زیادہ بیٹری استعمال کرنے والی سرفہرست <xliff:g id="NUMBER">%1$d</xliff:g> ایپس(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"آپ کا آلہ معمول سے زیادہ استعمال کیا گيا ہے۔ آپ کی بیٹری توقع سے پہلے ختم ہو سکتی ہے۔ \n\nآخری بار چارج کیے جانے کے بعد سے زیادہ بیٹری استعمال کرنے والی سرفہرست <xliff:g id="NUMBER">%1$d</xliff:g> ایپس(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">‏%1$d ایپس کو محدود کریں</item>
       <item quantity="one">‏%1$d ایپ کو محدود کریں</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"یہ ایپ پس منظر میں بیٹری استعمال کر سکے گی۔ آپ کی بیٹری توقع سے پہلے ختم ہو سکتی ہے۔"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"ہٹائیں"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"منسوخ کریں"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"آپ کے استعمال کی بنیاد پر، آپ کی بیٹری عام طور پر فُل چارج ہونے پر تقریبًا <xliff:g id="TIME_DURATION">%1$s</xliff:g> چلتی ہے۔\n\nاگر آپ کو اپنی بیٹری لائف بڑھانے کی ضرورت ہے، تو \'بیٹری سیور\' آن کریں۔"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"اگر آپ کو اپنی بیٹری لائف بڑھانے کی ضرورت ہے، تو \'بیٹری سیور\' آن کریں"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"بیٹری مینیجر"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"خودکار طور پر ایپس کا نظم کریں"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"ان ایپس کیلئے بیٹری کو محدود کریں جنہیں آپ اکثر استعمال نہیں کرتے ہیں"</string>
@@ -3073,38 +3092,28 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"بصری سگنلز کی اجازت دیں"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
+    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"اطلاعات"</string>
+    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
+    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
+    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
     <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"حسب ضرورت"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"حسب ضرورت ترتیب فعال کریں"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"حسب ضرورت ترتیب ہٹائیں"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"نظر آئیں گی"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"جزوی طور پر پوشیدہ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"پوشیدہ"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"حسب ضرورت پابندیاں"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"اسکرین کے آن ہونے پر"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"اسکرین کے آف ہونے پر"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"آواز اور وائبریشن کو خاموش کریں"</string>
@@ -3149,13 +3158,40 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> اصول خود بخود آن ہو جائیں گے</item>
       <item quantity="one">1 اصول خود بخود آن ہو جائے گا</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"ٹھیک ہے"</string>
+    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
+    <skip />
+    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
+    <skip />
+    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
+    <skip />
+    <!-- no translation found for zen_sound_title (424490228488531372) -->
+    <skip />
+    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
+    <skip />
+    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
+    <skip />
+    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
+    <skip />
+    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
+    <skip />
+    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
+    <skip />
+    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
+    <skip />
+    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
+    <skip />
+    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
+    <skip />
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"اپ ڈیٹ کریں"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"اپ ڈیٹ نہ کریں"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"آپ کا فون توجہ مرکوز کرنے میں آپ کی مدد کرنے کے لیے مزید کچھ کر سکتا ہے۔\n\nذیل میں ترتیبات کو اپ ڈیٹ کریں:\n\n- مکمل طور پر اطلاعات کو چھپائیں\n\n- ستارے کے نشان والے رابطوں اور بار بار کال کرنے والوں سے کالز کی اجازت دیں"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"\'ڈسٹرب نہ کریں\' کو اپ ڈیٹ کریں؟"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ترتیبات"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"آپ اسے ترتیبات میں مزید حسب ضرورت بنا سکتے ہیں۔"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"اسکرین آن ہونے پر، مسدود کریں"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"اسکرین آف ہونے پر، مسدود کریں"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"\'ڈسٹرب نہ کریں\' غیر مطلوب آوازوں کو مسدود کرنے کے علاوہ اور بہت کچھ کر سکتا ہے - یہ ویژوئلز کو بھی مسدود کر سکتا ہے۔ اگر آپ سونے، فوکس کرنے یا اپنے فون پر گزرے وقت کو محدود کرنے کی کوشش کر رہے ہیں تو یہ مددگار ثابت ہو سکتا ہے۔"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"آوازوں اور ویژوئلز کو مسدود کریں"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"اسکرین آن نہ کریں یا اطلاعات کے لیے نہ جگائیں"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"اطلاعات بالکل بھی نہ دکھائیں، مگر فون کی بنیادی سرگرمی اور اسٹیٹس کیلئے"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"دفتری پروفائل کی آوازیں"</string>
@@ -3326,21 +3362,42 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> تا <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"کالز"</string>
+    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیغامات"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"سبھی پیغامات"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"منتخب کردہ پیغامات"</string>
+    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
+    <skip />
+    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
+    <skip />
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"کسی سے بھی"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"صرف رابطوں سے"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"صرف ستارہ کے نشان والے رابطوں سے"</string>
+    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
+    <skip />
+    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
+    <skip />
     <string name="zen_mode_from_none" msgid="8219706639954614136">"کوئی نہیں"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"الارمز"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"میڈیا"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ٹچ کی آوازیں"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یاد دہانیاں"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ایونٹس"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"تمام کال کرنے والے"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"منتخب کردہ کالرز"</string>
+    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
+    <skip />
+    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
+    <skip />
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"بار بار کال کرنے والے"</string>
+    <!-- no translation found for zen_mode_calls_summary_one (2867689575419791866) -->
+    <skip />
+    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
+    <skip />
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ایک ہی شخص کے <xliff:g id="MINUTES">%d</xliff:g> منٹ کے اندر دوسری بار کال کرنے پر"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"حسب ضرورت"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"خود کار طور پر آن کریں"</string>
@@ -3610,7 +3667,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"اس ایپ کی جانب سے تخلیق کردہ تمام \'ڈسٹرب نہ کریں\' اصول ہٹا دیے جائیں گے۔"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"بہترین مت بنائیں"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"بہترین بنائیں"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ممکن ہے یہ آپ کی بیٹری مزید تیزی سے ختم کر دے"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"بیٹری کی بہتر زندگی کیلئے مجوزہ"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> کو بیٹری کی بہتریاں نظر انداز کرنے کی اجازت دیں؟"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"کوئی نہیں"</string>
@@ -3686,7 +3744,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"بیک اپ غیر فعال ہے"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏Android <xliff:g id="VERSION">%1$s</xliff:g> پر اپ ڈیٹ کردہ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"اپ ڈیٹ دستیاب ہے"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"یہ ترتیب تبدیل نہیں کی جا سکتی"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"کارروائی کی اجازت نہیں ہے"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"والیوم تبدیل نہیں کر سکتے"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"کال کرنے کی اجازت نہیں ہے"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"‏SMS کی اجازت نہیں ہے"</string>
@@ -3876,7 +3934,8 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"مقفل اسکرین پر معلومات کنٹرول کریں"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"اطلاعی مواد دکھائیں یا چھپائیں"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"تمام"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"سپورٹ اور تجاویز"</string>
+    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
+    <skip />
     <string name="developer_smallest_width" msgid="7516950434587313360">"سب سے چھوٹی چوڑائی"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏کسی انسٹال کردہ ایپ نے پریمیم SMS تک رسائی کی درخواست نہیں کی"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"‏ہو سکتا ہے آپ کو پریمیم SMS کے پیسے ادا کرنا پڑیں اور یہ آپ کے کیرئیر بلز میں شامل ہو جائیں گے۔ اگر آپ ایک ایپ کیلئے اجازت فعال کرتے ہیں تو آپ اس ایپ کو استعمال کرکے آپ پریمیم SMS بھیج پائیں گے۔"</string>
@@ -4069,6 +4128,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"‏مووی اور TV ایپس"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"کیرئیر فراہمی معلومات"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ٹرگر کیرئیر فراہمی"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"نیا اور دلچسپ کیا ہے؟"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"اپنے نئے فون کا ایک ٹؤر لیں"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"اپنے نئے ٹیبلیٹ کا ایک ٹؤر لیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 877e7d6..3df0c06 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM karta ma’lumotlariga kirish so‘rovi"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM karta ma’lumotlarini ko‘rmoqchi. SIM karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Boshqa qurilmalarga “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sifatida ko‘rinadi"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Qurilmalaringiz"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yangi qurilmani ulash"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Planshetga yaqin-atrofdagi Bluetooth qurilmalar bilan ma’lumotlarni almashishi uchun ruxsat berish"</string>
@@ -1392,7 +1394,7 @@
     <string name="storage_wizard_slow_v2_start_over" msgid="4126873669723115805">"Boshidan boshlash"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="49399942893518218">"Keyingisi"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="11937346870534608">"Kontentni <xliff:g id="NAME">^1</xliff:g> qurilmasiga ko‘chirish mumkin"</string>
-    <string name="storage_wizard_ready_v2_internal_body" msgid="4658433206901211269">"Kontentni <xliff:g id="NAME">^1</xliff:g> qurilmasiga ko‘chirish uchun "<b>"Sozlamalar &gt; Xotira"</b>" sahifasiga o‘ting"</string>
+    <string name="storage_wizard_ready_v2_internal_body" msgid="4658433206901211269">"Kontentni <xliff:g id="NAME">^1</xliff:g> qurilmasiga ko‘chirish uchun "<b>"Sozlamalar &gt; Xotira"</b>" sahifasiga kiring"</string>
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="6239886818487538806">"Kontent <xliff:g id="NAME_0">^1</xliff:g> qurilmasiga ko‘chirildi.\n\nMazkur <xliff:g id="NAME_1">^2</xliff:g> qurilmasini boshqarish uchun "<b>"Sozlamalar &gt; Xotira"</b>" sahifasini oching."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batareya holati"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batareya quvvati darajasi"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Xatolik yuz berdi"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"eSIM asliga qaytarilmadi."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Barcha ma’lumotlarni o‘chirish (zavod sozlamalarini tiklash)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Planshetning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonning "<b>"ichki xotirasidagi"</b>" barcha ma’lumotlar o‘chib ketadi, jumladan:\n\n"<li>" Google hisobingiz"</li>\n<li>"Tizim va ilovalarning ma’lumotlari/sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Juda uzoq kechikish bilan (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Juda uzoq kechikish bilan (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Jiringlash va bildirishnoma: tebranmaydi"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Jiringlash va bildirishnoma: ohista tebranish"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Jiringlash va bildirishnoma: o‘rtacha tebranish"</string>
@@ -2107,11 +2113,7 @@
     <skip />
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekran sarfi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil tarmoqni tekshirish"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_usage_list_summary (6393929085382334341) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_usage_list_summary_device (4461926045610455423) -->
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
     <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>
@@ -2143,8 +2145,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Qurilmani fonda uyg‘otmoqda"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Joylashuv axborotini tez-tez so‘ramoqda"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ta ilova xato ishlayapti"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batareya quvvati joyida"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Ilovalar odatdagidek ishlamoqda"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Batareya sig‘imi kichik"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batareya uzoq muddat ishlay olmaydi"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Telefon batareyasi quvvatini yaxshilang"</string>
@@ -2159,9 +2167,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Planshet odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Qurilma odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Batareya tez orada tugaydi"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Telefon odatdagidan ko‘proq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nOxirgi quvvatlangandan keyin eng ko‘p ishlatilgan <xliff:g id="NUMBER">%1$d</xliff:g> ta ilova (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Planshet odatdagidan ko‘proq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nOxirgi quvvatlangandan keyin eng ko‘p ishlatilgan <xliff:g id="NUMBER">%1$d</xliff:g> ta ilova (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Qurilma odatdagidan ko‘proq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nOxirgi quvvatlangandan keyin eng ko‘p ishlatilgan <xliff:g id="NUMBER">%1$d</xliff:g> ta ilova (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d ta ilovani cheklash</item>
       <item quantity="one">%1$d ta ilovani cheklash</item>
@@ -2190,10 +2201,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Bu ilova fonda batareya quvvatini ishlata oladi. Batareya quvvati kutilgandan tezroq tugashi mumkin."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Ha"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Bekor qilish"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_tip_dialog_summary_message (3483708973495692333) -->
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
     <skip />
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Batareya quvvatini tejash uchun Quvvat tejash rejimini yoqing"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Batareya boshqaruvi"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Ilovalarni avtomatik boshqarish"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Kam ishlatiladigan ilovalar uchun batareyani cheklash"</string>
@@ -2209,7 +2222,7 @@
     <string name="battery_auto_restriction_title" msgid="6553271897488963709">"Battery Manager ishlatish"</string>
     <string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Ilovalar batareyani ortiqcha sarflayotganini aniqlash"</string>
     <string name="battery_manager_on" msgid="8643310865054362396">"Yoniq / Ilovalar batareyani ortiqcha sarflayotgani aniqlanmoqda"</string>
-    <string name="battery_manager_off" msgid="5473135235710343576">"O‘chiq"</string>
+    <string name="battery_manager_off" msgid="5473135235710343576">"Yoqilmagan"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="1026141135861471129">
       <item quantity="other">%1$d ta ilova cheklandi</item>
       <item quantity="one">%1$d ta ilova cheklandi</item>
@@ -3075,7 +3088,7 @@
     <string name="zen_mode_behavior_settings_title" msgid="5453115212674008032">"Istisnolar"</string>
     <string name="zen_mode_duration_settings_title" msgid="229547412251222757">"Davomiyligi"</string>
     <string name="zen_mode_behavior_allow_title" msgid="3845615648136218141">"Ovoz va tebranishlarga ruxsat:"</string>
-    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Ovozsiz"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="1219626004723208056">"Tovushsiz"</string>
     <string name="zen_mode_behavior_total_silence" msgid="2229976744274214528">"Jimjitlik"</string>
     <string name="zen_mode_behavior_no_sound_except" msgid="4968477585788243114">"Ovozsiz (istisno: <xliff:g id="CATEGORIES">%1$s</xliff:g>)"</string>
     <string name="zen_mode_behavior_alarms_only" msgid="6455884547877702466">"Signallar va media ovozlaridan boshqasi ovozsiz qilinadi"</string>
@@ -3091,15 +3104,14 @@
     <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">"Vizual bildirishnomalarni bloklash"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizual signallarga ruxsat"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Bildirishnomalar uchun cheklovlar"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Bezovta qilinmasin rejimi yoniqligida"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Bildirishnomalar"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Bezovta qilinmasin rejimi yoniqligida"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Bildirishnomalar ovozsiz qilinsin"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Bildirishnomalarni ovozsiz va tebranish bilan chiqarish"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Yangi bildirishnomalar ovozsiz va tebranish bilan keladi"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Bildirishnomalarni berkitish va ularni ovozsiz olish"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Bildirishnomalar chiqarilmaydi"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Bezovta qilinmasin rejimi yoniqligida barcha bildirishnomalar berkitiladi, faqat asosiy telefon faoliyati uchun zarur bildirishnomalar va holati berkitilmaydi."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bildirishnomalar ovozsiz chiqsin"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Bildirishnomalar ovozsiz keladi"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Yangi bildirishnomalar tovushsiz va tebranishsiz keladi."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Bildirishnomalar berkitilsin"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Barcha bildirishnomalar berkitiladi"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefoningizda barcha bildirishnomalar berkitiladi, ovozi chiqmaydi va tebranmaydi. Ekranni pastdan tepaga surganingizda bildirishnomalar chiqmaydi.\n\nYodda tuting, telefoningiz harakati va holatiga oid eng muhim bildirishnomalar ko‘rsatiladi."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Maxsus"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Maxsus sozlamalarni yoqish"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Maxsus sozlamalarni olib tashlash"</string>
@@ -3151,13 +3163,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ta qoidani avtomatik yoqish mumkin</item>
       <item quantity="one">1 ta qoidani avtomatik yoqish mumkin</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"OK"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Xatti-harakatlar"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Istisnolar"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Jadval"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Tovush va tebranish"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Bezovta qilinmasin rejimi yoniqligida yuqorida ruxsat berilganlardan tashqari tovush va tebranish ovozsiz qilinadi."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Hammasini ovozsiz qilish, faqat bular mustasno:"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Ovozsiz"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Ovozsiz qilinmagan"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Ovozsiz, lekin <xliff:g id="SOUND_TYPE">%1$s</xliff:g> uchun ruxsat berilgan"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Ovozsiz, lekin <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> va <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> uchun ruxsat berilgan"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ovozsiz, lekin <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> va <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> uchun ruxsat berilgan"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Xabarlar, tadbirlar va eslatmalar"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Bezovta qilinmasin rejimi yoniqligida yuqorida ruxsat berilganlardan tashqari xabarlar, eslatmalar va tadbirlar ovozsiz qilinadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Yangilash"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Yangilanmasin"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Telefoningiz diqqatni jamlashga yordam bera oladi.\n\nSozlamalarni bunga o‘zgartiring:\n\n– Bildirishnomalarni butunlay berkiting\n\n– Tanlangan kontaktlardan chaqiruvlar va qayta chaqiruvlarga ruxsat bering"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Bezovta qilinmasin rejimi yoqilsinmi?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Sozlamalar"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Buni keyinchalik Sozlamalar orqali moslashtirish mumkin"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Ekran yoniqligida"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Ekran yoniq emasligida"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Bezovta qilinmasin rejimi keraksiz ovozlarni bloklashga nisbatan imkoniyati keng – vizuallarni ham bloklay oladi. Agar uxlamoqchi, diqqatni jamlamoqchi yoki telefoningizda ishlash vaqtingizni cheklamoqchi bo‘lsangiz, buning foydasi tegishi mumkin."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Ovoz va vizuallarni bloklash"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Bildirishnomalar uchun ekran yoqilmasin yoki faollashtirilmasin"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Asosiy telefon faoliyati va holatidan boshqa bildirishnomalar chiqmaydi"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ishchi profil ovozlari"</string>
@@ -3193,7 +3219,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Qurilmangiz qulflanganda, profil bildirishnomalari qanday ko‘rsatilsin?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profil bildirishnomalari"</string>
     <string name="notifications_title" msgid="8086372779371204971">"Bildirishnomalar"</string>
-    <string name="app_notifications_title" msgid="5810577805218003760">"Ilova bildirishnomalari"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Ilovalar bildirishnomalari"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirishnomalar turkumi"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Bildirishnomalar turkumi guruhi"</string>
     <string name="notification_importance_title" msgid="4368578960344731828">"Xatti-harakatlar"</string>
@@ -3201,8 +3227,8 @@
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
     <string name="notification_importance_min" msgid="9054819132085066824">"Ovozsiz ko‘rsatish va kichraytirish"</string>
     <string name="notification_importance_low" msgid="2445139943005315690">"Ovozsiz"</string>
-    <string name="notification_importance_default" msgid="5958338024601957516">"Ovozli"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"Ovoz va qalqib chiquvchi oyna"</string>
+    <string name="notification_importance_default" msgid="5958338024601957516">"Tovush bilan"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"Tovush va qalqib chiquvchi oyna"</string>
     <string name="notification_importance_high_silent" msgid="2667033773703765252">"Ekranga qalqib chiqish"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Past"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"O‘rtacha"</string>
@@ -3258,7 +3284,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta turkum</item>
     </plurals>
     <string name="no_channels" msgid="3077375508177744586">"Bu ilova hech qanday bildirishnoma joylamagan"</string>
-    <string name="app_settings_link" msgid="8894946007543660906">"Ilova ichidagi qo‘shimcha sozlamalar"</string>
+    <string name="app_settings_link" msgid="8894946007543660906">"Boshqa sozlamalar ilovada"</string>
     <string name="app_notification_listing_summary_zero" msgid="8046168435207424440">"Barcha ilovalar uchun yoniq"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="6709582776823665660">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta ilova uchun yoqilmagan</item>
@@ -3274,7 +3300,7 @@
     <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="6370122441168519809">"Bildirishnoma belgisini ko‘rsatish"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Nuqtali bildirishnoma belgisi"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirishnoma belgisini ko‘rsatish"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bezovta qilinmasin rejimi ustidan yozish"</string>
     <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Bezovta qilinmasin rejimi yoniqligida mazkur bildirishnomalarning qalqib chiqishiga ruxsat berish"</string>
@@ -3328,21 +3354,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Chaqiruvlar"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Bezovta qilinmasin rejimi yoniqligida kiruvchi chaqiruvlar bloklanadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Xabarlar"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Barcha xabarlar"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Tanlangan xabarlar"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Xabarlar"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Ayrim xabarlar"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Har kimdan"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Faqat kontaktlardan"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Faqat yulduzchali kontaktlardan"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Yulduzchali kontaktlardan chaqiruvlar va qayta chaqiruvlar"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kontaktlardan chaqiruvlar va qayta chaqiruvlar"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Faqat qayta chaqiruvlar"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hech kimdan"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signallar"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Ekranga bosilgandagi ovoz"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Eslatmalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tadbirlar"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Barcha abonentlar"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Saralangan abonentlar"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"hamma"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktlar"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"saralangan kontaktlar"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Qayta chaqiruvlar"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Faqat <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> va <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Agar abonent <xliff:g id="MINUTES">%d</xliff:g> daqiqa ichida qayta qo‘ng‘iroq qilsa, qo‘ng‘iroq haqida xabar qilinsin"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Maxsus"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Avtomatik yoqish"</string>
@@ -3612,7 +3648,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Ushbu ilova tomonidan yaratilgan barcha “Bezovta qilinmasin” rejimi qoidalari o‘chirib tashlanadi."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Cheklov o‘rnatilmasin"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Cheklov o‘rnatish"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Batareya quvvati nisbatan tezroq sarflanishi mumkin"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Batareya quvvatini uzoqroq vaqtga yetkazish uchun tavsiya etiladi"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> ilovasiga batareya quvvatidan foydalanish uchun hech qanday cheklov o‘rnatilmasinmi?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Hech qanday"</string>
@@ -3688,7 +3725,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Zaxiralash o‘chirilgan"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> versiyasiga yangilandi"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Yangilanish chiqdi"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Bu parametrni o‘zgartirish imkonsiz"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Bu amalga ruxsat berilmagan"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Tovush balandligini o‘zgartirib bo‘lmaydi"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Chaqiruvga ruxsat berilmagan"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS yuborishga ruxsat berilmagan"</string>
@@ -3878,7 +3915,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Ekran qulfidagi ma’lumotlarni boshqaring"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirishnomani ko‘rsatish yoki berkitish"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Hammasi"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Yordam va maslahatlar"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Yordam va maslahatlar"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Eng kichik eni"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"O‘rnatilgan ilovalardan hech biri SMSdan foydalanish uchun ruxsat so‘ramagan."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS uchun sizdan haq olinishi va operatorga qo‘shimcha to‘lov amalga oshirilishi mumkin. Agar ilova uchun ruxsatnoma taqdim etsangiz, o‘sha ilovadan SMS yuborishingiz mumkin bo‘ladi."</string>
@@ -4071,6 +4108,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film va TV ilovalari"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator haqida"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator ta’minotini yoqish/o‘chirish"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nima yangi va qiziqarli narsalar bor?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yangi telefoningiz bilan tanishib chiqing"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yangi planshetingiz bilan tanishib chiqing"</string>
@@ -4104,9 +4145,9 @@
     <string name="media_out_summary_ongoing_call_state" msgid="3533731701018680693">"Chaqiruv paytida ishlamaydi"</string>
     <string name="media_output_summary_unavailable" msgid="7970304720507697019">"Mavjud emas"</string>
     <string name="take_call_on_title" msgid="6066362463436122655">"Chaqiruv qabul qilish"</string>
-    <string name="battery_suggestion_title" product="tablet" msgid="752439050748267917">"Planshet batareyasi quvvatini yaxshilang"</string>
-    <string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Qurilma batareyasi quvvatini yaxshilang"</string>
-    <string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Telefon batareyasi quvvatini yaxshilang"</string>
+    <string name="battery_suggestion_title" product="tablet" msgid="752439050748267917">"Batareya quvvatini uzoqroq vaqtga yetkazing"</string>
+    <string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Batareya quvvatini uzoqroq vaqtga yetkazing"</string>
+    <string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Batareya quvvatini uzoqroq vaqtga yetkazing"</string>
     <string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Ovozsiz qilish"</string>
     <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Bir vaqtda quvvat va tovushni balandlatish tugmalarini bosing"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2ddcd7f..db5e0b8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Yêu cầu truy cập SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào thẻ SIM của bạn. Cấp quyền truy cập vào thẻ SIM sẽ vô hiệu hóa khả năng kết nối dữ liệu trên thiết bị của bạn trong suốt thời gian kết nối. Cấp quyền truy cập vào <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Hiển thị là <xliff:g id="DEVICE_NAME">^1</xliff:g> với các thiết bị khác"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Thiết bị của bạn"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Ghép nối thiết bị mới"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Cho phép máy tính bảng kết nối với các thiết bị Bluetooth ở gần"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Không thể đặt lại eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Không thể đặt lại eSIM do lỗi."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Việc này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt của hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Việc này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt của hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">Độ trễ rất dài (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> mili giây)</item>
       <item quantity="one">Độ trễ rất dài (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> mili giây)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Đổ chuông và thông báo được đặt thành tắt"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Đổ chuông và thông báo được đặt thành thấp"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Đổ chuông và thông báo được đặt thành trung bình"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Mức tiêu thụ của màn hình"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Mức sử dụng ứng dụng kể từ khi sạc đầy (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Sử dụng thiết bị kể từ khi sạc đầy (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Đánh thức thiết bị trong nền"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Thường xuyên yêu cầu vị trí"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng hoạt động sai"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Pin đang hoạt động bình thường"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Các ứng dụng đang chạy bình thường"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Dung lượng pin thấp"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Pin không có tuổi thọ tốt"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Tăng tuổi thọ pin của điện thoại"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Máy tính bảng được sử dụng nhiều hơn thường lệ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Thiết bị được sử dụng nhiều hơn thường lệ"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Có thể sắp hết pin"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Điện thoại của bạn được sử dụng nhiều hơn thường lệ. Pin có thể hết sớm hơn dự kiến.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng sử dụng pin nhiều nhất kể từ lần sạc đầy gần đây nhất(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Máy tính bảng của bạn được sử dụng nhiều hơn thường lệ. Pin có thể hết sớm hơn dự kiến.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng sử dụng pin nhiều nhất kể từ lần sạc đầy gần đây nhất(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Thiết bị của bạn được sử dụng nhiều hơn thường lệ. Pin có thể hết sớm hơn dự kiến.\n\n<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng sử dụng pin nhiều nhất kể từ lần sạc đầy gần đây nhất(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other"> Hạn chế %1$d ứng dụng</item>
       <item quantity="one"> Hạn chế %1$d ứng dụng</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Ứng dụng này có thể sử dụng pin trong nền. Pin có thể hết sớm hơn dự kiến."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Xóa"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Hủy"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Dựa trên mức sử dụng của bạn, pin thường hết sau khoảng <xliff:g id="TIME_DURATION">%1$s</xliff:g> khi được sạc đầy.\n\nNếu bạn cần kéo dài thời lượng pin, hãy bật Trình tiết kiệm pin."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Nếu bạn cần kéo dài thời lượng pin, hãy bật Trình tiết kiệm pin"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Trình quản lý pin"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Tự động quản lý ứng dụng"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Giới hạn mức sử dụng pin đối với các ứng dụng mà bạn ít dùng"</string>
@@ -3075,15 +3094,14 @@
     <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">"Ngăn gián đoạn hình ảnh"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Cho phép tín hiệu hình ảnh"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Hạn chế thông báo"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Khi chế độ Không làm phiền đang bật"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Thông báo"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Khi đang bật chế độ Không làm phiền"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Tắt tiếng thông báo"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Hiển thị thông báo nhưng tắt tiếng và chế độ rung"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Khi có thông báo mới, điện thoại sẽ không phát ra âm thanh hoặc rung"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Ẩn và tắt tiếng thông báo"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Thông báo sẽ hoàn toàn không hiển thị"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Bạn sẽ không thấy thông báo mới hoặc hiện có khi đang bật chế độ Không làm phiền. Tuy nhiên, những thông báo cần thiết cho hoạt động và trạng thái cơ bản của điện thoại vẫn sẽ hiển thị."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Hiển thị im lặng các thông báo"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Thông báo sẽ bị ẩn"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Khi có thông báo, điện thoại của bạn sẽ không phát ra âm thanh hoặc rung."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ẩn thông báo"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Bạn sẽ không thấy thông báo mới hoặc hiện có"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Điện thoại của bạn sẽ không hiển thị thông báo mới hoặc hiện có, cũng như không phát ra âm thanh hoặc rung. Thông báo sẽ không xuất hiện khi bạn vuốt xuống từ đầu màn hình.\n\nXin lưu ý các thông báo quan trọng về trạng thái và hoạt động của điện thoại sẽ vẫn xuất hiện."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tùy chỉnh"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Bật cài đặt tùy chỉnh"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Xóa cài đặt tùy chỉnh"</string>
@@ -3135,13 +3153,27 @@
       <item quantity="other"> Có thể tự động bật <xliff:g id="ON_COUNT">%d</xliff:g> quy tắc</item>
       <item quantity="one"> Có thể tự động bật 1 quy tắc</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Ok"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Hành vi"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Ngoại lệ"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Lịch biểu"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Âm thanh và rung"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Khi chế độ Không làm phiền đang bật, âm thanh và rung sẽ bị tắt trừ các mục mà bạn cho phép ở trên."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Tắt tiếng tất cả ngoại trừ"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Đã tắt tiếng"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Chưa bị tắt tiếng"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Đã tắt tiếng nhưng cho phép <xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Đã tắt tiếng nhưng cho phép <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> và <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Đã tắt tiếng nhưng cho phép <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> và <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Tin nhắn, sự kiện và lời nhắc"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Khi chế độ Không làm phiền đang bật, tin nhắn, lời nhắc và sự kiện sẽ bị ẩn trừ các mục mà bạn cho phép ở trên. Bạn có thể điều chỉnh mục cài đặt tin nhắn để cho phép bạn bè, gia đình hoặc những người khác liên hệ với bạn."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Cập nhật"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Không cập nhật"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Điện thoại của bạn có thể làm được nhiều việc hơn để giúp bạn tập trung.\n\nCập nhật tùy chọn cài đặt thành:\n\n- Ẩn hoàn toàn thông báo\n\n- Cho phép cuộc gọi từ các liên hệ có gắn dấu sao và người gọi lặp lại"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Cập nhật tùy chọn cài đặt Không làm phiền?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Cài đặt"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Bạn có thể tùy chỉnh thêm chế độ này trong mục Cài đặt."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Chặn khi màn hình đang bật"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Chặn khi màn hình đang tắt"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Chế độ Không làm phiền có thể chặn cả âm thanh và hình ảnh không mong muốn. Tính năng này có thể hữu ích nếu bạn đang cố gắng ngủ, tập trung hoặc hạn chế thời gian sử dụng điện thoại."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Chặn âm thanh và hình ảnh"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Không bật màn hình hoặc đánh thức khi có thông báo"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Không hiển thị thông báo nào, trừ trạng thái và hoạt động cơ bản của điện thoại"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Âm thanh hồ sơ công việc"</string>
@@ -3312,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> đến <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Cuộc gọi"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Khi chế độ Không làm phiền đang bật, các cuộc gọi đến đều bị chặn. Bạn có thể điều chỉnh mục cài đặt này để cho phép bạn bè, gia đình hoặc những người khác liên hệ với bạn."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Tin nhắn"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tất cả thông báo"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Tin nhắn đã chọn"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Tin nhắn"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Một số tin nhắn"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Từ bất cứ ai"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Chỉ từ danh bạ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Chỉ từ các liên hệ có gắn dấu sao"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Từ liên hệ được gắn dấu sao và người gọi lặp lại"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Từ danh bạ và người gọi lặp lại"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Chỉ từ người gọi lặp lại"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Không có"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Báo thức"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Phương tiện"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Âm chạm"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lời nhắc"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sự kiện"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Tất cả người gọi"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Người gọi được chọn"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"bất kỳ ai"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"liên hệ"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"liên hệ được gắn dấu sao"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Người gọi lặp lại"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Chỉ từ <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Từ <xliff:g id="CALLER_TYPE">%1$s</xliff:g> và <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Nếu cùng một người gọi hai lần trong vòng <xliff:g id="MINUTES">%d</xliff:g> phút"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Tùy chỉnh"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Tự động bật"</string>
@@ -3596,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Mọi quy tắc Không làm phiền do ứng dụng này tạo sẽ đều bị xóa."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Không tối ưu hóa"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Tối ưu hóa"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Pin của bạn có thể hết nhanh hơn"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Được khuyến nghị để có thời lượng pin lâu hơn"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Cho phép <xliff:g id="APP">%s</xliff:g> bỏ qua tối ưu hóa pin?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Không có"</string>
@@ -3672,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Đã tắt sao lưu"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Đã cập nhật lên Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Đã có bản cập nhật"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Không thể thay đổi cài đặt này"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Tác vụ này không được cho phép"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Không thể thay đổi âm lượng"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Không cho phép gọi"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Không cho phép SMS"</string>
@@ -3862,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Kiểm soát thông tin trên màn hình khóa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Hiển thị hoặc ẩn nội dung thông báo"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tất cả"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Hỗ trợ và mẹo"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Mẹo và hỗ trợ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Độ rộng nhỏ nhất"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Không có ứng dụng đã cài đặt nào yêu cầu quyền truy cập SMS cao cấp"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS cao cấp có thể làm bạn mất tiền và sẽ tính thêm vào hóa đơn của nhà cung cấp dịch vụ của bạn. Nếu bạn bật quyền cho một ứng dụng, bạn sẽ có thể gửi SMS cao cấp bằng ứng dụng đó."</string>
@@ -4055,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Ứng dụng TV và Phim"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Thông tin cấp phép của nhà cung cấp dịch vụ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kích hoạt cấp phép của nhà cung cấp dịch vụ"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Thông tin mới và thú vị?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tham quan điện thoại mới của bạn"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tham quan máy tính bảng mới của bạn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 28a566f..dd0a2be 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 访问权限请求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>想要访问您的 SIM 卡。如果授权该设备访问 SIM 卡，您设备的数据连接功能在蓝牙连接期间将停用。将访问权限授予<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他设备显示为“<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的设备"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"与新设备配对"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"允许您的平板电脑与附近的蓝牙设备进行通信"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"无法重置 eSIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"出现错误，无法重置 eSIM 卡。"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"清除所有数据（恢复出厂设置）"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐号：\n"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">延迟时间很长（<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> 毫秒）</item>
       <item quantity="one">延迟时间很长（<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> 毫秒）</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"将响铃和通知振动设为关闭"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"将响铃和通知振动设为低"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"将响铃和通知振动设为中"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"上次充满电后的屏幕用电量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"屏幕耗电量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"充满电（<xliff:g id="RELATIVE_TIME">^1</xliff:g>）后的应用用电量"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"充满电（<xliff:g id="RELATIVE_TIME">^1</xliff:g>）后的设备用电量"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在后台唤醒设备"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"请求获取位置信息的频率过高"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 个应用出现异常"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"电池状况良好"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"应用正在正常运行"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"电池电量不足"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"电池的续航时间不理想"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"延长手机的电池续航时间"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"平板电脑的使用强度比平时高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"设备的使用强度比平时高"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"电池电量即将耗尽"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"您的手机使用频率比平时高。电池电量耗尽的速度可能会比预期更快。\n\n自上次充满电（<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>）后，耗电量较高的前 <xliff:g id="NUMBER">%1$d</xliff:g> 个应用为："</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"您的平板电脑使用频率比平时高。电池电量耗尽的速度可能会比预期更快。\n\n自上次充满电（<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>）后，耗电量较高的前 <xliff:g id="NUMBER">%1$d</xliff:g> 个应用为："</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"您的设备使用频率比平时高。电池电量耗尽的速度可能会比预期更快。\n\n自上次充满电（<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>）后，耗电量较高的前 <xliff:g id="NUMBER">%1$d</xliff:g> 个应用为："</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">限制 %1$d 个应用</item>
       <item quantity="one">限制 %1$d 个应用</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"此应用将能够在后台消耗电量。这可能会导致电量耗尽速度比预期更快。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"移除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"取消"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"根据您的使用情况，您的电池充满电后通常可持续大约 <xliff:g id="TIME_DURATION">%1$s</xliff:g>。\n\n如果您需要延长电池续航时间，请开启省电模式。"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"如果您需要延长电池续航时间，请开启省电模式"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"电池管理器"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"自动管理应用"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"限制不常用的应用的用电量"</string>
@@ -3075,38 +3094,21 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"允许视觉信号"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_screen_title (9027437428488279426) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_title (478040192977063582) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_category (1648631487087638037) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute (9210062826172341735) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (285566524371041091) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (8473382758368384982) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (3451553435075518722) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3823881787175376177) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (4224323933073288352) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_custom (7498689167767941034) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_enable_custom (4250962169561739747) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_disable_custom (6676997522330453597) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_muted (4678779044896459009) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_custom (7416121534987213074) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_summary_hidden (7805339105802282234) -->
-    <skip />
-    <!-- no translation found for zen_mode_what_to_block_title (5480903548365697159) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"开启勿扰模式时"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"显示通知但不发出提示音"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"有通知时会静音"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"手机在收到通知时既不会发出提示音也不会振动。"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"隐藏通知"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"您将不会看到任何新通知和现有通知"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"您的手机不会显示任何新通知和现有通知，并且既不会发出提示音也不会振动。当您从屏幕顶部向下滑动时，系统不会显示通知。\n\n请注意，系统仍会显示手机活动和状态的重要通知。"</string>
+    <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"自定义"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"启用自定义设置"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"移除自定义设置"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"显示"</string>
+    <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"隐藏部分通知"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"隐藏"</string>
+    <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"自定义限制"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"屏幕开启时"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"屏幕关闭时"</string>
     <string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"关闭提示音和振动"</string>
@@ -3151,13 +3153,27 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 个规则可以自动开启</item>
       <item quantity="one">1 个规则可以自动开启</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"确定"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"行为"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"例外情况"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"日程"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"提示音和振动"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"开启勿扰模式后，系统既不会发出提示音也不会振动（您在上方允许的项目除外）。"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"全部静音，除了"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"已设为静音"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"未设为静音"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"已设为静音（但<xliff:g id="SOUND_TYPE">%1$s</xliff:g>除外）"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"已设为静音（但<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>和<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>除外）"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"已设为静音（但<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>和<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>除外）"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"信息、活动和提醒"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"开启勿扰模式后，系统会忽略信息、提醒和活动。您可以调整相应信息设置（您在上访允许的项目除外），以便允许您的好友、家人或其他联系人与您联系。"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"更新"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"不更新"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"您的手机可提供更多协助您保持专注的功能。\n\n您可以将设置更新为：\n\n- 完全隐藏通知\n\n- 允许下列对象来电：已加星标的联系人和重复来电者"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"要更新勿扰模式吗？"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"设置"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"您可以在“设置”中进一步自定义这项设置。"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"屏幕开启时屏蔽"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"屏幕关闭时屏蔽"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"勿扰模式不仅可以屏蔽不需要的声音，还可以屏蔽视觉干扰。如果您正打算入睡、集中注意力或限制使用手机的时间，这一功能会很有用。"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"屏蔽声音和视觉干扰"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"不要在收到通知时开启屏幕或唤醒设备"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"不显示任何通知（除了基本手机活动和状态）"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"工作资料提示音"</string>
@@ -3328,21 +3344,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>到<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"来电"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"开启勿扰模式后，系统会屏蔽来电。您可以调整相应设置，以便允许您的好友、家人或其他联系人与您联系。"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"消息"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"所有消息"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"已选消息"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"信息"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"部分信息"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"来自任何人"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"仅限来自联系人"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"仅限来自收藏的联系人"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"来自已加星标的联系人和重复来电者"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"来自联系人和重复来电者"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"仅限来自重复来电者"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"无"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"闹钟"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"媒体"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"触摸提示音"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活动"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"所有来电者"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所选的来电者"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"任何人"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"联系人"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"已加星标的联系人"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重复来电者"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"仅限来自<xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"来自<xliff:g id="CALLER_TYPE">%1$s</xliff:g>和<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"如果同一个人在 <xliff:g id="MINUTES">%d</xliff:g> 分钟内第二次来电"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"自定义"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自动开启"</string>
@@ -3612,7 +3638,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"系统将移除此应用创建的所有勿扰规则。"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"不优化"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"优化"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"电池电量的消耗可能会更快"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"建议选择此项以延长电池续航时间"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"要允许<xliff:g id="APP">%s</xliff:g>忽略电池优化吗？"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"无"</string>
@@ -3688,7 +3715,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"备份功能已停用"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"已更新至 Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"有新版本可用"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"无法更改此设置"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"不允许执行此操作"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"无法调节音量"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"不允许使用通话功能"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"不允许使用短信功能"</string>
@@ -3878,7 +3905,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"控制锁定屏幕上显示的信息"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"显示或隐藏通知内容"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"支持和提示"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"提示和支持"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小宽度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"没有任何已安装的应用申请付费短信权限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"“付费短信”可能会产生费用，而且相关费用将计入您的运营商帐单。如果您为某个应用启用该权限，那么您将能够使用该应用发送付费短信。"</string>
@@ -4071,6 +4098,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"影视应用"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"运营商配置信息"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"触发运营商配置"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新手机功能导览"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新平板电脑功能导览"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index fc4901d..23e306f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 卡存取權要求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> 要存取您的 SIM 卡。如果允許存取 SIM 卡，您裝置上的數據連線將於連線期間停用。允許 <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> 存取"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的裝置"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"允許您的平板電腦與附近的藍牙裝置通訊"</string>
@@ -1454,6 +1456,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"無法重設 eSIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"發生錯誤，因此無法重設 eSIM 卡。"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"清除所有資料 (回復原廠設定)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
@@ -1999,6 +2003,8 @@
       <item quantity="other">很長時間延誤 (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> 微秒)</item>
       <item quantity="one">很長時間延誤 (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> 微秒)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"將鈴聲和通知震動設為「關閉」"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"將鈴聲和通知震動設為「低」"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"將鈴聲和通知震動設為「中」"</string>
@@ -2106,8 +2112,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"充滿電後的螢幕用量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"自上次完全充電後的應用程式使用情況 (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"自上次完全充電後的裝置使用情況 (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2138,8 +2144,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在背景喚醒裝置"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"要求獲取位置資訊的頻率過高"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式運作異常"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"電池狀況良好"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"應用程式正常運作中"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"電池電量不足"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"電池耗電過快"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"延長手機的電池壽命"</string>
@@ -2154,9 +2166,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"平板電腦使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"裝置使用率比平常高"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"電池電量可能即將耗盡"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"您的手機使用率比平常高，電池電量可能會比預期更快耗盡。\n\n自上次完全充電 (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) 後耗電量高的前 <xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式為："</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"您的平板電腦使用率比平常高，電池電量可能會比預期更快耗盡。\n\n自上次完全充電 (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) 後耗電量高的前 <xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式為："</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"您的裝置使用率比平常高，電池電量可能會比預期更快耗盡。\n\n自上次完全充電 (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) 後耗電量高的前 <xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式為："</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">限制 %1$d 個應用程式</item>
       <item quantity="one">限制 %1$d 個應用程式</item>
@@ -2185,8 +2200,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"此應用程式會在背景使用電量。您的電池電量可能會比預期更快耗盡。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"移除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"取消"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"根據您的使用情況，電池在充滿電後通常可使用約 <xliff:g id="TIME_DURATION">%1$s</xliff:g>。\n\n如要延長電池壽命，請開啟省電模式。"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"如要延長電池壽命，請開啟省電模式。"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"電池管理工具"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"自動管理應用程式"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"為不常用的應用程式限制用電量"</string>
@@ -3078,15 +3097,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"允許視覺訊號"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"限制通知"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"開啟「請勿騷擾」模式時"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"開啟「零打擾」模式時"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"忽略通知"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"顯示通知，但關閉音效和震動"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"手機收到新通知時不會發出音效或震動"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"隱藏並忽略通知"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"完全不顯示通知"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"開啟「零打擾」模式後，你不會看到任何新通知或現有通知。不過，系統仍會顯示基本手機活動和狀態所需的通知。"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"顯示通知，但不發出任何音效"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"有通知時會靜音"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"手機收到通知時不會發出音效或震動。"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"隱藏通知"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"您將不會看到新通知或現有通知"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"手機將不會顯示新通知或現有通知，且不會發出音效和震動。當您從螢幕頂部向下滑動時，系統不會顯示通知。\n\n不過，手機活動和狀態的重要通知仍會繼續顯示。"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"自訂"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"啟用自訂設定"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"移除自訂設定"</string>
@@ -3138,13 +3156,27 @@
       <item quantity="other">系統可以自動開啟 <xliff:g id="ON_COUNT">%d</xliff:g> 項規則</item>
       <item quantity="one">系統可以自動開啟 1 項規則</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"確定"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"行為"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"例外情況"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"設定時間"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"音效和震動"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"開啟「請勿騷擾」模式時，除了您在上方允許的項目外，所有音效和震動會設為靜音。"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"全部設為靜音，除了"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"已設為靜音"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"未設為靜音"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"已設為靜音 (<xliff:g id="SOUND_TYPE">%1$s</xliff:g>除外)"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"已設為靜音 (<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>和<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>除外)"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"已設為靜音 (<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>和<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>除外)"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"訊息、活動和提醒"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"開啟「請勿騷擾」模式時，除了您在上方允許的項目外，所有訊息、提醒和活動會設為靜音。您可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡您。"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"更新"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"不要更新"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"您的手機可提供更多協助您集中注意力的功能。\n\n您可以將設定更新為：\n\n- 完全隱藏通知\n\n- 允許下列對象來電：已加星號的聯絡人和重複來電者"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"要更新「請勿騷擾」模式嗎？"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"設定"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"您可以在「設定」中自訂此設定。"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"畫面開啟時封鎖"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"畫面關閉時封鎖"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"除了禁止發出不想聽到的音效外，「請勿騷擾」還能封鎖影像內容。此功能在您要睡覺、專注做事或減少使用手機時非常有效。"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"封鎖音效及影像內容"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"不要在收到通知時開啟螢幕或喚醒裝置"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"完全不顯示通知 (基本手機活動或狀態除外)"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"工作設定檔聲音"</string>
@@ -3315,21 +3347,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>至<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"通話"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"開啟「請勿騷擾」模式時，來電會被封鎖。您可以調整設定，讓好友、家人或其他聯絡人可以聯絡您。"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"所有訊息"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"已選訊息"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"訊息"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"部分訊息"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"任何人"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"只限聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"只限已加星號的聯絡人"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"已加星號的聯絡人和重複來電者"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"聯絡人和重複來電者"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"僅限重複來電者"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"媒體"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"觸控音效"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"所有來電者"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"已選取的來電者"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"任何人"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"聯絡人"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"已加星號的聯絡人"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"僅限<xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>和<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"如果同一人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘內第二次來電"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"自訂"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動開啟"</string>
@@ -3599,7 +3641,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"此應用程式建立的所有「請勿騷擾」規則將會移除。"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"不要優化"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"優化"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"可能會加速耗電"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"建議用於延長電池使用時間"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"允許<xliff:g id="APP">%s</xliff:g>忽略電池優化？"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"無"</string>
@@ -3675,7 +3718,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"已停用備份功能"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"已更新至 Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"有可用的更新"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"無法變更此設定"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"不允許執行此操作"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"無法變更音量"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"不允許撥打電話"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"不允許傳送短訊"</string>
@@ -3865,7 +3908,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"控制上鎖畫面上顯示的資料"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"支援和提示"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"提示和支援"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有已安裝的應用程式要求發送付費短訊的權限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"付費短訊的費用可能高昂，並會增加您流動網絡供應商帳單的款項。如果您為應用程式開放權限，將可以透過該應用程式發送付費短訊。"</string>
@@ -4058,6 +4101,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"電影和電視應用程式"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"流動網絡供應商佈建資料"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發流動網絡供應商佈建程序"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"探索您的新手機"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"探索您的新平板電腦"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 61f3553..14087b3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 存取權請求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」想要存取你的 SIM 卡。如果授權該裝置存取 SIM 卡，你裝置的數據連線功能在藍牙連線期間將暫時停用。將存取權授予「<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>」"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"你的裝置"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"允許你的平板電腦與附近的藍牙裝置進行通訊"</string>
@@ -452,7 +454,7 @@
     <string name="fingerprint_delete_title" msgid="1368196182612202898">"移除「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」"</string>
     <string name="fingerprint_delete_message" msgid="8597787803567398131">"要刪除這個指紋嗎？"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"你將無法使用指紋將手機解鎖、授權購物交易或登入應用程式。"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"你將無法使用指紋將 Work 設定檔解鎖、授權購買交易，或是登入 Work 應用程式。"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"你將無法使用指紋將工作資料夾解鎖、授權購買交易，或是登入工作應用程式。"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"是，移除"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"使用指紋繼續作業。"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
@@ -509,7 +511,7 @@
     <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>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠 <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>後"</string>
-    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Work 設定檔鎖定"</string>
+    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"工作資料夾鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"變更鎖定畫面"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"變更或停用圖案、PIN 或密碼安全性"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"選擇你要鎖定螢幕的方式"</string>
@@ -584,12 +586,12 @@
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"如果下次輸入的解鎖圖案仍不正確，系統將刪除這位使用者"</string>
     <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"如果下次輸入的 PIN 碼仍不正確，系統將刪除這位使用者"</string>
     <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"如果下次輸入的密碼仍不正確，系統將刪除這位使用者"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果下次輸入的解鎖圖案仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
-    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果下次輸入的 PIN 碼仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
-    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果下次輸入的密碼仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果下次輸入的解鎖圖案仍不正確，系統將刪除你的工作資料夾和相關資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果下次輸入的 PIN 碼仍不正確，系統將刪除你的工作資料夾和相關資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果下次輸入的密碼仍不正確，系統將刪除你的工作資料夾和相關資料"</string>
     <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"錯誤次數過多，系統將刪除這個裝置中的資料。"</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"錯誤次數過多，系統將刪除這位使用者。"</string>
-    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"錯誤次數過多，系統將刪除這個 Work 設定檔和相關資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"錯誤次數過多，系統將刪除這個工作資料夾和相關資料。"</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"關閉"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必須包含至少 <xliff:g id="COUNT">%d</xliff:g> 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 碼至少要有 <xliff:g id="COUNT">%d</xliff:g> 位數字"</string>
@@ -1046,7 +1048,7 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"手機插入底座或離開底座時，不要播放音效"</string>
     <string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
-    <string name="accessibility_category_work" msgid="4339262969083355720">"Work 設定檔帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_work" msgid="4339262969083355720">"工作資料夾帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"個人設定檔帳戶"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work 帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"個人帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -1453,6 +1455,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"無法重設 eSIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"發生錯誤，因此無法重設 eSIM 卡。"</string>
     <string name="master_clear_title" msgid="3531267871084279512">"清除所有資料 (恢復原廠設定)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"這會清除你平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"這會清除你手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"你目前已登入下列帳戶：\n"</string>
@@ -1517,7 +1521,7 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連線至網際網路"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Work 設定檔位置資訊"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作資料夾位置資訊"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"應用程式層級權限"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
     <string name="location_recent_location_requests_see_all" msgid="9063541547120162593">"查看全部"</string>
@@ -1634,13 +1638,13 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何畫出解鎖圖案"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"錯誤次數過多，請於 <xliff:g id="NUMBER">%d</xliff:g> 秒後再試。"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"你未在手機上安裝應用程式。"</string>
-    <string name="lock_settings_profile_title" msgid="2121876391814535295">"Work 設定檔安全性"</string>
-    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Work 設定檔螢幕鎖定"</string>
+    <string name="lock_settings_profile_title" msgid="2121876391814535295">"工作資料夾安全性"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"工作資料夾螢幕鎖定"</string>
     <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"使用同一種鎖定方式"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"讓 Work 設定檔和裝置螢幕使用同一種鎖定方式"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"讓工作資料夾和裝置螢幕使用同一種鎖定方式"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"要使用同一種鎖定方式嗎？"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"你的裝置將使用 Work 設定檔螢幕鎖定，Work 政策會套用到這兩種鎖定方式。"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"你的 Work 設定檔鎖定不符合貴機構的安全性標準。你可以設定讓裝置螢幕與 Work 設定檔採用相同的鎖定方式，但是必須遵守所有相關的 Work 鎖定政策。"</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"你的裝置將使用工作資料夾螢幕鎖定，Work 政策會套用到這兩種鎖定方式。"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"你的工作資料夾鎖定不符合貴機構的安全性標準。你可以設定讓裝置螢幕與工作資料夾採用相同的鎖定方式，但是必須遵守所有相關的 Work 鎖定政策。"</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"使用同一種鎖定方式"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"使用同一種鎖定方式"</string>
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"與裝置的螢幕鎖定一致"</string>
@@ -1998,6 +2002,8 @@
       <item quantity="other">延遲時間很長 (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> 毫秒)</item>
       <item quantity="one">延遲時間很長 (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> 毫秒)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"將鈴聲和通知震動設為關閉"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"將鈴聲和通知震動設為低"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"將鈴聲和通知震動設為中"</string>
@@ -2105,8 +2111,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"上次完全充飽電後的螢幕使用時間"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"充飽電 (<xliff:g id="RELATIVE_TIME">^1</xliff:g>) 後的應用程式用電量"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"充飽電 (<xliff:g id="RELATIVE_TIME">^1</xliff:g>) 後的裝置用電量"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2137,8 +2143,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在背景喚醒裝置"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"要求取得位置資訊的頻率過高"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式未正常運作"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"電池狀態良好"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"應用程式正常執行中"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"電池電量不足"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"電量衰退過快"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"延長手機的電池續航力"</string>
@@ -2153,9 +2165,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"平板電腦使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"裝置使用率比平常高"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"電池電力可能很快就會耗盡"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"你的手機使用率比平常高，電池電力可能會比預期更快耗盡。\n\n自上次充飽電 (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) 以來，耗電量前 <xliff:g id="NUMBER">%1$d</xliff:g> 高的應用程式："</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"你的平板電腦使用率比平常高，電池電力可能會比預期更快耗盡。\n\n自上次充飽電 (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) 以來，耗電量前 <xliff:g id="NUMBER">%1$d</xliff:g> 高的應用程式："</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"你的裝置使用率比平常高，電池電力可能會比預期更快耗盡。\n\n自上次充飽電 (<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>) 以來，耗電量前 <xliff:g id="NUMBER">%1$d</xliff:g> 高的應用程式："</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">限制 %1$d 個應用程式</item>
       <item quantity="one">限制 %1$d 個應用程式</item>
@@ -2184,8 +2199,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"這個應用程式將會在背景耗用電量。你的電池電力可能會比預期更快耗盡。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"移除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"取消"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"根據你的使用情形，你的電池在充飽後通常可使用約 <xliff:g id="TIME_DURATION">%1$s</xliff:g>。\n\n如果想延長裝置的電池續航力，請開啟節約耗電量模式。"</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"如果想延長裝置的電池續航力，請開啟節約耗電量模式"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"自動管理應用程式"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"針對不常使用的應用程式限制電池用量"</string>
@@ -2452,7 +2471,7 @@
     <string name="select_device_admin_msg" msgid="7347389359013278077">"裝置管理員應用程式"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"沒有可用的裝置管理員應用程式"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"個人"</string>
-    <string name="managed_device_admin_title" msgid="7853955652864478435">"公司"</string>
+    <string name="managed_device_admin_title" msgid="7853955652864478435">"工作"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"沒有信任的代理程式可供使用"</string>
     <string name="add_device_admin_msg" msgid="1501847129819382149">"要啟用這個裝置管理員應用程式嗎？"</string>
     <string name="add_device_admin" msgid="4192055385312215731">"啟用這個裝置管理員應用程式"</string>
@@ -2505,7 +2524,7 @@
     <string name="sync_is_failing" msgid="1591561768344128377">"目前同步處理發生問題。稍後會回復正常。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"新增帳戶"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"尚未提供工作設定檔"</string>
-    <string name="work_mode_label" msgid="7157582467956920750">"Work 設定檔"</string>
+    <string name="work_mode_label" msgid="7157582467956920750">"工作資料夾"</string>
     <string name="work_mode_on_summary" msgid="3628349169847990263">"由貴機構管理"</string>
     <string name="work_mode_off_summary" msgid="2657138190560082508">"已關閉應用程式和通知"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"移除工作設定檔"</string>
@@ -2747,8 +2766,8 @@
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已在你的裝置上安裝憑證授權單位憑證，該憑證將能監控你的裝置網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這個憑證，請與你的管理員聯絡。</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已為你的 Work 設定檔安裝多個憑證授權單位憑證，這些憑證將能監控你的 Work 網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這些憑證，請與你的管理員聯絡。</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已為你的 Work 設定檔安裝憑證授權單位憑證，該憑證將能監控你的 Work 網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這個憑證，請與你的管理員聯絡。</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已為你的工作資料夾安裝多個憑證授權單位憑證，這些憑證將能監控你的工作網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這些憑證，請與你的管理員聯絡。</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已為你的工作資料夾安裝憑證授權單位憑證，該憑證將能監控你的工作網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這個憑證，請與你的管理員聯絡。</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以監控你的網路活動，包括你使用電子郵件、應用程式和加密網站的情況。\n\n這是因為你的裝置上安裝了信任的憑證。"</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
@@ -2988,7 +3007,7 @@
     <string name="keywords_color_temperature" msgid="6239410718075715449">"色彩, 色溫, D65, D73, 白色, 黃色, 藍色, 暖色系, 冷色系"</string>
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑動解鎖, 密碼, 圖案, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"Work 驗證、Work、設定檔"</string>
-    <string name="keywords_unification" msgid="1922900767659821025">"Work 設定檔, 受管理設定檔, 整合, 整合, Work, 設定檔"</string>
+    <string name="keywords_unification" msgid="1922900767659821025">"工作資料夾, 受管理設定檔, 整合, 整合, Work, 設定檔"</string>
     <string name="keywords_gesture" msgid="3526905012224714078">"手勢"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付、輕觸、付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
@@ -3079,15 +3098,14 @@
     <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>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"允許視覺信號"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"限制通知"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"開啟「零打擾」模式時"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"開啟「零打擾」模式時"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"忽略通知"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"顯示通知，但關閉音效和震動"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"手機收到新通知時不會發出音效或震動"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"隱藏並忽略通知"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"完全不顯示通知"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"開啟「零打擾」模式後，你不會看到任何新通知或現有通知。不過，系統仍會顯示基本手機活動和狀態所需的通知。"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"顯示通知，但不發出任何音效"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"有通知時會靜音"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"手機收到通知時不會發出音效或震動。"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"隱藏通知"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"你不會看到新通知或現有通知"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"你的手機不會顯示新通知或現有通知，且不會發出音效或震動。當你從螢幕頂端向下滑動時，系統不會顯示通知。\n\n請注意，系統仍會顯示手機活動和狀態的重要通知。"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"自訂"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"啟用自訂設定"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"移除自訂設定"</string>
@@ -3139,25 +3157,39 @@
       <item quantity="other">系統可以自動開啟 <xliff:g id="ON_COUNT">%d</xliff:g> 條規則</item>
       <item quantity="one">系統可以自動開啟 1 條規則</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"確定"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"行為"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"例外狀況"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"設定時間"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"音效和震動"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"開啟「零打擾」模式時，系統會將音效和震動設為靜音 (你在上方允許的項目除外)。"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"將所有項目設為靜音，除了"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"已設為靜音"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"未設為靜音"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"已設為靜音 (<xliff:g id="SOUND_TYPE">%1$s</xliff:g>除外)"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"已設為靜音 (<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>和<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>除外)"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"已設為靜音 (<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>和<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>除外)"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"訊息、活動和提醒"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"開啟「零打擾」模式時，系統會將訊息、提醒和活動設為靜音 (你在上方允許的項目除外)。你可以調整訊息設定，讓好友、家人或其他聯絡人與你聯絡。"</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"更新"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"不要更新"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"你的手機有更多可協助你集中注意力的功能。\n\n你可以將設定更新為：\n\n- 完全隱藏通知\n\n- 允許下列對象來電：已加星號的聯絡人和曾在短時間內來電的來電者"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"要更新「零打擾」模式嗎？"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"設定"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"你可以前往 [設定] 進一步自訂這項設定。"</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"螢幕開啟時封鎖"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"螢幕關閉時封鎖"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"「零打擾」模式除了可以封鎖擾人的音效，也能封鎖視覺干擾。無論你打算入睡、準備集中注意力或限制使用手機的時間，這項功能對你來說都非常實用。"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"封鎖音效和視覺干擾"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"不要在收到通知時開啟螢幕或喚醒裝置"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"不顯示任何通知，除了基本手機活動和狀態以外"</string>
-    <string name="sound_work_settings" msgid="6774324553228566442">"Work 設定檔音效"</string>
+    <string name="sound_work_settings" msgid="6774324553228566442">"工作資料夾音效"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"使用個人設定檔音效"</string>
-    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Work 設定檔和個人設定檔使用相同的音效"</string>
+    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"工作資料夾和個人設定檔使用相同的音效"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"Work 手機鈴聲"</string>
     <string name="work_notification_ringtone_title" msgid="6081247402404510004">"預設 Work 通知音效"</string>
     <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"預設 Work 鬧鐘音效"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"與個人設定檔相同"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"要取代音效嗎？"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"取代"</string>
-    <string name="work_sync_dialog_message" msgid="7841728953710863208">"Work 設定檔將使用你的個人設定檔音效"</string>
+    <string name="work_sync_dialog_message" msgid="7841728953710863208">"工作資料夾將使用你的個人設定檔音效"</string>
     <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"要新增自訂音效嗎？"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"這個檔案將會複製到「<xliff:g id="FOLDER_NAME">%s</xliff:g>」資料夾"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"鈴聲"</string>
@@ -3170,7 +3202,7 @@
     <string name="notification_badging_title" msgid="5938709971403474078">"允許使用通知圓點"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"閃爍燈光"</string>
     <string name="lock_screen_notifications_title" msgid="2583595963286467672">"在螢幕鎖定畫面上"</string>
-    <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"當 Work 設定檔遭鎖定時"</string>
+    <string name="locked_work_profile_notification_title" msgid="8327882003361551992">"當工作資料夾遭鎖定時"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"隱藏敏感內容"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"完全不顯示通知"</string>
@@ -3208,7 +3240,7 @@
     <string name="notifications_sent_weekly" msgid="1030525736746720584">"每週大約 <xliff:g id="NUMBER">%1$s</xliff:g> 則"</string>
     <string name="notifications_sent_never" msgid="1001964786456700536">"永遠不要"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"管理員已禁止存取 Work 設定檔通知"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"管理員已禁止存取工作資料夾通知"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="other">%d 個應用程式可以讀取通知</item>
@@ -3316,21 +3348,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>到<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"來電"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"開啟「零打擾」模式時，系統會封鎖來電。你可以調整設定，讓好友、家人或其他聯絡人與你聯絡。"</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"所有訊息"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"選取的訊息"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"訊息"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"部分訊息"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"來自任何人"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"僅限來自聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"僅限來自已加星號的聯絡人"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"已加星號的聯絡人和曾在短時間內來電的來電者"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"聯絡人和曾在短時間內來電的來電者"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"僅限曾在短時間內來電的來電者"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"媒體"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"觸控音效"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"所有來電者"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"所選來電者"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"任何人"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"聯絡人"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"已加星號的聯絡人"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重複來電者"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"僅限<xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>和<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"如果同一個人在 <xliff:g id="MINUTES">%d</xliff:g> 分鐘內再次來電"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"自訂"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"自動開啟"</string>
@@ -3368,7 +3410,7 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN 碼"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定時鎖定裝置"</string>
-    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個 Work 設定檔是由下列應用程式管理："</string>
+    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個工作資料夾是由下列應用程式管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由 <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> 管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"安全啟動"</string>
@@ -3441,7 +3483,7 @@
     <string name="filter_enabled_apps" msgid="5395727306799456250">"已安裝的應用程式"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"免安裝應用程式"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
-    <string name="filter_work_apps" msgid="24519936790795574">"公司"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"應用程式：全部"</string>
     <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"應用程式：已關閉"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"類別：緊急重要性"</string>
@@ -3600,11 +3642,12 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"系統將移除這個應用程式建立的所有「零打擾」規則。"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"不要最佳化"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"最佳化"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"電力可能會更快耗盡"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"建議使用以延長電池續航力"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"允許 <xliff:g id="APP">%s</xliff:g> 忽略電池效能最佳化設定？"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"無"</string>
-    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"即使關閉此應用程式的使用記錄存取功能，你的管理員仍可存取 Work 設定檔中應用程式的數據用量"</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"即使關閉此應用程式的使用記錄存取功能，你的管理員仍可存取工作資料夾中應用程式的數據用量"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"已使用 <xliff:g id="COUNT_0">%1$d</xliff:g> 個字元 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個)"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"顯示在其他應用程式上層"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"顯示在其他應用程式上層"</string>
@@ -3676,7 +3719,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"備份功能已停用"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"已更新至 Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"有可用的更新"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"無法變更這項設定"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"不允許此操作"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"無法變更音量"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"不允許使用通話功能"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"不允許使用簡訊功能"</string>
@@ -3686,7 +3729,7 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"無法開啟這個應用程式"</string>
     <string name="default_admin_support_msg" msgid="4489678214035485367">"如有任何問題，請與你的 IT 管理員聯絡"</string>
     <string name="admin_support_more_info" msgid="8901377038510512654">"其他詳細資訊"</string>
-    <string name="admin_profile_owner_message" msgid="5860816886981109626">"你的管理員可以監控及管理與你的 Work 設定檔相關聯的應用程式和資料，包括設定、權限、公司系統權限、網路活動，以及裝置的位置資訊。"</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"你的管理員可以監控及管理與你的工作資料夾相關聯的應用程式和資料，包括設定、權限、公司系統權限、網路活動，以及裝置的位置資訊。"</string>
     <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"你的管理員可以監控及管理與這位使用者相關聯的應用程式和資料，包括設定、權限、公司系統權限、網路活動，以及裝置的位置資訊。"</string>
     <string name="admin_device_owner_message" msgid="6232893638259790789">"你的管理員可以監控及管理與這個裝置相關聯的應用程式和資料，包括設定、權限、公司系統權限、網路活動，以及裝置的位置資訊。"</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"關閉"</string>
@@ -3704,8 +3747,8 @@
     <string name="condition_cellular_summary" msgid="1818046558419658463">"你必須連上 Wi-Fi 才能使用網際網路"</string>
     <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">"Work 設定檔已停用"</string>
-    <string name="condition_work_summary" msgid="7543202177571590378">"應用程式、背景同步處理以及其他與你的 Work 設定檔相關的功能已停用。"</string>
+    <string name="condition_work_title" msgid="7293722361184366648">"工作資料夾已停用"</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"應用程式、背景同步處理以及其他與你的工作資料夾相關的功能已停用。"</string>
     <string name="condition_device_muted_action_turn_on_sound" msgid="4930240942726349213">"開啟音效"</string>
     <string name="condition_device_muted_title" product="tablet" msgid="3095044864508335783">"裝置已設為靜音"</string>
     <string name="condition_device_muted_title" product="default" msgid="5818278137378379647">"手機已設為靜音"</string>
@@ -3866,7 +3909,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"控制鎖定畫面上顯示的資訊"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"支援和提示"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"提示和支援"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有任何已安裝的應用程式要求「付費簡訊」存取權"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"「付費簡訊」需要額外計費，相關費用會併入你的電信費帳單。如果你為某個應用程式啟用權限，即可利用該應用程式傳送付費簡訊。"</string>
@@ -3880,7 +3923,7 @@
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快速設定開發人員圖塊"</string>
     <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope 追蹤"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
-    <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work 設定檔設定"</string>
+    <string name="managed_profile_settings_title" msgid="2729481936758125054">"工作資料夾設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許你的機構搜尋聯絡人，以便識別來電者和聯絡人的身分"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
@@ -3989,11 +4032,11 @@
     <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"已設為「<xliff:g id="APP_LABEL">%s</xliff:g>」"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"已開啟「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"已開啟你個人設定檔中的「永久連線的 VPN」"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"已開啟你 Work 設定檔中的「永久連線的 VPN」"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"已開啟你工作資料夾中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"已設定全域 HTTP Proxy"</string>
     <string name="enterprise_privacy_ca_certs_device" msgid="2019652712782510262">"信任的憑證"</string>
     <string name="enterprise_privacy_ca_certs_personal" msgid="2279084820904076599">"你的個人設定檔中安裝的信任的憑證"</string>
-    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"你的 Work 設定檔中安裝的信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="6187377647815301809">"你的工作資料夾中安裝的信任的憑證"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">最少有 <xliff:g id="COUNT_1">%d</xliff:g> 個 CA 憑證</item>
       <item quantity="one">最少有 <xliff:g id="COUNT_0">%d</xliff:g> 個 CA 憑證</item>
@@ -4001,7 +4044,7 @@
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"管理員可以鎖定裝置及重設密碼"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"管理員可以刪除所有裝置資料"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"輸入錯誤密碼的次數上限，超過後系統將自動刪除所有裝置資料"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"輸入錯誤密碼的次數上限，超過後系統將自動刪除 Work 設定檔資料"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"輸入錯誤密碼的次數上限，超過後系統將自動刪除工作資料夾資料"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 次嘗試</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 次嘗試</item>
@@ -4059,6 +4102,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"影視應用程式"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"電信業者佈建資訊"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發電信業者佈建程序"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"有什麼新奇功能？"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"認識你的新手機"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"認識你的新平板電腦"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d827515..9124b642 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -167,6 +167,8 @@
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Isicelo sokufinyelela ku-SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"I-<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ifuna ukufinyelela kukhadi lakho le-SIM. Ukunikeza ukufinyelela kukhadi le-SIM kuzokhubaza ukuxhumeka kwedatha kudivayisi yakho ngesikhathi sokuxhumeka. Nikeza ukufinyelela ku-<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="522235742194965734">"Kubonakala njenge-\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kwamanye amadivayisi"</string>
+    <!-- no translation found for bluetooth_off_footer (8406865700572772936) -->
+    <skip />
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Amadivayisi akho"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bhanqa idivayisi entsha"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Vumela ithebhulethi yakho ukuxhumana namadivayisi e-Bluetooth aseduze"</string>
@@ -1454,6 +1456,8 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"Ayikwazi ukusetha kabusha ama-eSIM"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Ama-eSIM awakwazi ukusethwa kabusha ngenxa yephutha."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Sula yonke idatha (ukusethwa kabusha kwasekuqaleni)"</string>
+    <!-- no translation found for master_clear_short_title (8652450915870274285) -->
+    <skip />
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Lokhu kuzosusa yonke idatha "<b>"ekwistoreji sangaphakathi kuthebhulethi yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Lokhu kuzosusa yonke idatha "<b>"ekwisitoreji sangaphakathi sefoni yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
@@ -1999,6 +2003,8 @@
       <item quantity="one">Ukubambezeleka okude kakhulu (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Ukubambezeleka okude kakhulu (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
+    <!-- no translation found for accessibility_vibration_summary (1372393829668784669) -->
+    <skip />
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Ukukhalisa nesaziso kusethelwe kokuvaliwe"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Ukukhalisa nesaziso sisethelwe kokuphansi"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Ukukhalisa nesaziso sisethelwe kokumaphakathi"</string>
@@ -2106,8 +2112,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ukusebenzisa kwesikrini kusuka ekushajeni okuphelele"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ukusetshenziswa kwesikrini"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Ukuskena kwenethiwekhi yeselula"</string>
-    <string name="power_usage_list_summary" msgid="6393929085382334341">"Ukusetshenziswa kohlelo lokusebenza kusuka ekushajeni okugcwele (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
-    <string name="power_usage_list_summary_device" msgid="4461926045610455423">"Ukusetshenziswa kwedivayisi kusuka ekushajeni okugcwele (<xliff:g id="RELATIVE_TIME">^1</xliff:g>)"</string>
+    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
+    <skip />
     <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>
@@ -2138,8 +2144,14 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ivusa idivayisi ngasemuva"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Icela indawo njalo"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> izinhlelo zokusebenza ezingaziphathi kahle"</string>
-    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Ibhethri lisesimeni esihle"</string>
-    <string name="battery_tip_summary_summary" msgid="7674026655453457">"Izinhlelo zokusebenza zisebenza ngokujwayelekile"</string>
+    <!-- no translation found for battery_tip_summary_title (368729969313047399) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (2198778125778121221) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (1183976728682325345) -->
+    <skip />
+    <!-- no translation found for battery_tip_summary_summary (363718204492523920) -->
+    <skip />
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Amandla ebhethri aphansi"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Ibhethri alikwazi ukunikeza impilo enhle yebhethri"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Thuthukisa impilo yebhethri yefoni yakho"</string>
@@ -2154,9 +2166,12 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Ithebulethi isetshenziswa ngaphezulu kunokujwayelekile"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Idivayisi isetshenziswa ngaphezulu kunokujwayelekile"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"Ibhethri lingaphela maduze"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7434089311164898581">"Ifoni yakho isetshenziswe ngaphezu kokuvamile. Ibhethri lakho lingaphela ngokushesha kunokulindelekile.\n\nIzinhlelo zokusebenza eziphezulu ezingu-<xliff:g id="NUMBER">%1$d</xliff:g> kusuka ekushajeji okugcwele(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="2987443811119964310">"Ithebhulethi yakho isetshenziswe ngaphezu kokuvamile. Ibhethri lakho lingaphela ngokushesha kunokulindelekile.\n\nIzinhlelo zokusebenza eziphezulu ezingu-<xliff:g id="NUMBER">%1$d</xliff:g> kusuka ekushajeji okugcwele(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="1993039726576708815">"Idivayisi yakho isetshenziswe ngaphezu kokuvamile. Ibhethri lakho lingaphela ngokushesha kunokulindelekile.\n\nIzinhlelo zokusebenza eziphezulu ezingu-<xliff:g id="NUMBER">%1$d</xliff:g> kusuka ekushajeji okugcwele(<xliff:g id="TIME_PERIOD_AGO">%2$s</xliff:g>):"</string>
+    <!-- no translation found for battery_tip_dialog_message (7001932078713215338) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (8482296786233647690) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_message (2806861679225286129) -->
+    <skip />
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Khawulela izinhlelo zokusebenza ezingu-%1$d</item>
       <item quantity="other">Khawulela izinhlelo zokusebenza ezingu-%1$d</item>
@@ -2185,8 +2200,12 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Lolu hlelo lokusebenza luzokwazi ukusebenzisa ibhethri ngemuva. Ibhethri lakho lingaphela ngokushesha kunokulindelekile."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Susa"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Khansela"</string>
-    <string name="battery_tip_dialog_summary_message" msgid="3483708973495692333">"Kusukela ekusetshenzisweni kwakho, ibhethri lakho livamise ukuhlala okungu-<xliff:g id="TIME_DURATION">%1$s</xliff:g> uma lishajwe ngokugcwele.\n\nUma kumele unwebe impilo yebhethri lakho, vula isilondolozi sebhethri."</string>
-    <string name="battery_tip_dialog_summary_message_no_estimation" msgid="1456026456418786135">"Uma kumele unwebe impilo yebhethri lakho, vula isilondolozi sebhethri"</string>
+    <!-- no translation found for battery_tip_dialog_summary_message (4628448253185085796) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (8327950887399420971) -->
+    <skip />
+    <!-- no translation found for battery_tip_dialog_summary_message (6753742263807939789) -->
+    <skip />
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Isiphathi sebhethri"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Phatha izinhlelo zokusebenza ngokuzenzakalela"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Khawulela ibhethri kuzinhlelo zokusebenza ongavamisile ukuzisebenzisa"</string>
@@ -3076,15 +3095,14 @@
     <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">"Vimbela ukuphazamiseka okubonakalayo"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vumela amasignali okubuka"</string>
-    <string name="zen_mode_restrict_notifications_screen_title" msgid="9027437428488279426">"Khawulela izaziso"</string>
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"Uma kuvulwe okuthi Ungaphazamisi"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Izaziso"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="1648631487087638037">"Uma kuvulwe okuthi Ungaphazamisi"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="9210062826172341735">"Thulisa izaziso"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="285566524371041091">"Bonisa izaziso kodwa thulisa imisindo nokudlidlizela"</string>
-    <string name="zen_mode_restrict_notifications_mute_footer" msgid="8473382758368384982">"Uma izaziso ezintsha zifika ifoni yakho ngeke yenze umsindo noma idlidlizele"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="3451553435075518722">"Fihla uphinde uthulise izaziso"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3823881787175376177">"Izaziso ngeke zivele sanhlobo"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4224323933073288352">"Ngeke ubone izaziso ezintsha noma ezikhona uma kuvulwe okuthi Ungaphazamisi. Kodwa, izaziso ezidingekayo ngokusebenza kwefoni okuyisisekelo kanye nesimo zisazovela."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bonisa izaziso ngokuthulile"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Izaziso zizothuliswa"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Uma kufika izaziso, ifoni yakho ngeke yenze umsindo noma idlidlize."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Fihla izaziso"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Ngeke ubone izaziso ezintsha noma ezikhona"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ifoni yakho ngeke ibonise izaziso ezilandelayo noma ezikhona, futhi ngeke yenze umsindo noma idlidlizele. Izaziso ngeke zivele uma uswayiphela phansi kusukela phezulu kwesikrini sakho.\n\nKhumbula, izaziso ezibalulekile zomsebenzi wefoni nesimo zisazovela."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Ngokwezifiso"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Nika amandla isilungiselelo sangokwezifiso"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Susa isilungiselelo sangokwezifiso"</string>
@@ -3136,13 +3154,27 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> izimiso zingavulwa ngokuzenzakalela</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> izimiso zingavulwa ngokuzenzakalela</item>
     </plurals>
-    <string name="zen_onboarding_ok" msgid="4332223974819182383">"Kulungile"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Ukuziphatha"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"Okuhlukile"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"Ishejuli"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"Umsindo nokudlidliza"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"Uma kuvulwe ukungaphazamisi, umsindo nokudlidliza kuzothuliswa, ngaphandle kwezinto ozivumela ngaphezulu."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"Thulisa konke ngaphandle"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"Kuthulisiwe"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"Akuthulisiwe"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"Kuthulisiwe, kodwa vumela i-<xliff:g id="SOUND_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"Kuthulisiwe, kodwa vumela i-<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> ne-<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Kuthulisiwe, kodwa vumela i-<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, ne-<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Imilayezo, imicimbi nezikhumbuzi"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Uma kuvulwe ukungaphazamisi, imilayezo, izikhumbuzi, nemicimbi izothuliswa ngaphandle kwezinto ozivumela ngaphezulu. Ungalungisa izilungiselelo zemilayezo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo bafinyelele kuwe."</string>
+    <string name="zen_onboarding_ok" msgid="4157146842078658361">"Buyekeza"</string>
+    <string name="zen_onboarding_no_update" msgid="3103752501952811308">"Ungabuyekezi"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="4051020254348888576">"Ifoni yakho ingenza okuningi ukukusiza ukuthi ugxile.\n\nBuyekeza izilungiselelo kuya ku-:\n\n- Fihla izaziso ngokuphelele\n\n- Vumela amakholi kusuka koxhumana nabo ababiwe abashayayo abaphindiwe"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="4243599835234481809">"Buyekeza okuthi Ungaphazamisi?"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Izilungiselelo"</string>
     <string name="zen_onboarding_more_options" msgid="7880013502169957729">"Futhi ungenza ngezifiso lokhu kuzilungiselelo."</string>
     <string name="zen_onboarding_screen_on_title" msgid="6058737686680609254">"Vimbela uma isikrini sivuliwe"</string>
     <string name="zen_onboarding_screen_off_title" msgid="3153498025037206166">"Vimbela uma isikrini sivaliwe"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_description" msgid="1941519590822188992">"Okuthi ungaphazamisi kungenza okuningi kunokuvimbela imisindo engafuneki - ingavimbela ukubuka. Lokhu kungasiza uma uzama ukulala, ukugxila, noma ukukhawulela isikhathi esichithwa efonini yakho."</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1442575104084675243">"Vimbela imisindo nokubuka"</string>
     <string name="zen_onboarding_screen_off_summary" msgid="5393041573999488088">"Ungavuli isikrini noma ukuvuka kwezaziso"</string>
     <string name="zen_onboarding_screen_on_summary" msgid="4351138746406623307">"Ungabonisi izaziso sanhlobo, ngaphandle komsebenzi wefoni ovamile nesimo"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Imisindo yephrofayela yomsebenzi"</string>
@@ -3313,21 +3345,31 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ukuya ku-<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Amakholi"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Uma kuvulwe ukungaphazamisi, amakholi angenayo ayavinjelwa. Ungalungisa izilungiselelo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo ukuze bakufinyelele."</string>
+    <!-- no translation found for zen_mode_starred_contacts_title (1848464279786960190) -->
+    <skip />
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (6748832187598909961) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Imilayezo"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"Yonke imilayezo"</string>
-    <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Imilayezo ekhethiwe"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"Imilayezo"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Eminye imilayezo"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Kusukela kunoma ubani"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kusukela koxhumana nabo kuphela"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kusukela koxhumana nabo abanenkanyezi kuphela"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Kusukela koxhumana nabo abanenkanyezi nabafonayo abaphindiwe"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Kusukela koxhumana nabo nabafonayo abaphindiwe"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Kusukela kwabafonayo abaphindayo kuphela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Lutho"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ama-alamu"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"Imidiya"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Imisindo yokuthinta"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Izikhumbuzi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Imibuthano"</string>
-    <string name="zen_mode_all_callers" msgid="584186167367236922">"Bonke abafonayo"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Khetha abafonayo"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"noma ubani"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"oxhumana nabo"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"oxhumana nabo abanenkanyezi"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Phinda abafonayo"</string>
+    <string name="zen_mode_calls_summary_one" msgid="2867689575419791866">"Kusukela ku-<xliff:g id="CALLER_TYPE">%1$s</xliff:g> kuphela"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Kusukela ku-<xliff:g id="CALLER_TYPE">%1$s</xliff:g> no-<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Uma umuntu ofanayo ashaya okwesibili ngaphakathi kwesikhathi esiyiminithi elingu-<xliff:g id="MINUTES">%d</xliff:g>"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Okwezifiso"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Vula ngokuzenzakalela"</string>
@@ -3597,7 +3639,8 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Yonke imithetho Ungaphazamisi edalwe yilolu hlelo lokusebenza kuzosuswa."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Ungalungiseleli"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Lungiselela"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Kungadonsa ibhethri lakho ngokushesha okukhulu"</string>
+    <!-- no translation found for ignore_optimizations_on_desc (3549930955839111652) -->
+    <skip />
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Kunconyelwe impilo yebhethri"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Vumela i-<xliff:g id="APP">%s</xliff:g> ukuthi izibe ukulungiselelwa kwebhethri?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Lutho"</string>
@@ -3673,7 +3716,7 @@
     <string name="backup_disabled" msgid="485189128759595412">"Ukwenza isipele kukhutshaziwe"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ibuyekezelwe ku-Android engu-<xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Isibuyekezo siyatholakala"</string>
-    <string name="disabled_by_policy_title" msgid="8032916235573765969">"Ayikwazi ukushintsha lesi silungiselelo"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"Isenzo asivunyelwe"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="3208724801293696486">"Ayikwazi ukushintsha ivolumu"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Ukushaya akuvunyelwe"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"I-SMS ayivunyelwe"</string>
@@ -3863,7 +3906,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"Lawula ulwazi ekukhiyeni isikrini"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bonisa noma fihla okuqukethwe kwesaziso"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Konke"</string>
-    <string name="page_tab_title_support" msgid="8483187649355540109">"Usekelo namathiphu"</string>
+    <string name="page_tab_title_support" msgid="4407600495101788249">"Amathiphu nosekelo"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ububanzi obuncane"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Azikho izinhlelo zokusebenza ezicele ukufinyelela kwe-Premium SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"I-Premium SMS ingakwenzela izindleko zemali futhi izongeza kumabhili enkampani yenethiwekhi. Uma unika amandla imvume yohlelo lokusebenza, uzokwazi ukuthumela i-premium SMS usebenzisa lolo hlelo lokusebenza."</string>
@@ -4056,6 +4099,10 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Izinhlelo zokusebenza ze-Movie ne-TV"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Ulwazi lokuhlinzeka lenkampani yenethiwekhi"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cupha ukunikezwa kwenkampani yenethiwekhi"</string>
+    <!-- no translation found for zen_suggestion_title (798067603460192693) -->
+    <skip />
+    <!-- no translation found for zen_suggestion_summary (4573237195296808909) -->
+    <skip />
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yini okusha nokujabulisayo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Thatha uhambo lwefoni yakho entsha"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Thatha uhambo kuthebulethi yakho entsha"</string>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 61a3c75..29de06b 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -78,6 +78,9 @@
     <!-- Whether alarm_volume should be shown or not. -->
     <bool name="config_show_alarm_volume">true</bool>
 
+    <!-- Whether call_volume should be shown or not. -->
+    <bool name="config_show_call_volume">true</bool>
+
     <!-- Whether notification_volume should be shown or not. -->
     <bool name="config_show_notification_volume">true</bool>
 
diff --git a/res/values/config.xml b/res/values/config.xml
index e3ec74f..f8a7acc 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -131,4 +131,7 @@
     <!-- List of a11y components on the device allowed to be enabled by Settings Slices -->
     <string-array name="config_settings_slices_accessibility_components" translatable="false"/>
 
+    <!-- Whether or not swipe up gesture's opt-in setting is available on this device -->
+    <bool name="config_swipe_up_gesture_setting_available">false</bool>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f95de27..e0b8c48 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -288,7 +288,6 @@
     <!-- Padding for Gestures settings screen -->
     <dimen name="gestures_settings_padding_top_bottom">20dp</dimen>
     <dimen name="gestures_play_button_size">36dp</dimen>
-    <dimen name="gesture_animation_padding">0dp</dimen>
 
     <dimen name="password_requirement_textsize">14sp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8dad37..fda46b7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -388,6 +388,8 @@
 
     <!-- Description for bluetooth device name summary [CHAR LIMIT=none] -->
     <string name="bluetooth_device_name_summary">Visible as \u201C<xliff:g id="device_name">^1</xliff:g>\u201D to other devices</string>
+    <!-- Footer description for discoverable mode in bluetooth off state [CHAR LIMIT=none] -->
+    <string name="bluetooth_off_footer">Turn on Bluetooth to connect to other devices.</string>
 
     <!-- Title for paired device group [CHAR LIMIT=none] -->
     <string name="bluetooth_paired_device_title">Your devices</string>
@@ -400,11 +402,6 @@
     <!-- Summary for bluetooth item in connection detail page. (phone)-->
     <string name="bluetooth_pref_summary" product="default">Allow your phone to communicate with nearby Bluetooth devices</string>
 
-    <!-- Setting Checkbox title for disabling Bluetooth inband ringing in Development Settings -->
-    <string name="bluetooth_disable_inband_ringing">Disable in-band ringing</string>
-    <!-- Summary of checkbox for disabling Bluetooth inband ringing in Development Settings -->
-    <string name="bluetooth_disable_inband_ringing_summary">Don’t play custom phone ringtones on Bluetooth headsets</string>
-
     <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
     <string name="connected_device_available_media_title">Available media devices</string>
     <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
@@ -413,7 +410,7 @@
     <string name="connected_device_connected_title">Currently connected</string>
     <!-- Title for connected device group [CHAR LIMIT=none]-->
     <string name="connected_device_saved_title">Saved devices</string>
-    <!-- Title for preference to add a device [CHAR LIMIT=none]-->
+    <!-- Title for preference to add a device [CHAR LIMIT=none] [BACKUP_MESSAGE_ID=7803521577708810621] -->
     <string name="connected_device_add_device_title">Add device</string>
     <!-- Summary for preference to add a device [CHAR LIMIT=none]-->
     <string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string>
@@ -1689,15 +1686,10 @@
     <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
-    <!-- Bluetooth developer options. -->
     <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
     <string name="bluetooth_max_connected_audio_devices_string">Maximum connected Bluetooth audio devices</string>
     <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
     <string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>
-    <!-- Bluetooth developer settings: Checkbox title for disabling Bluetooth receiving AVDTP delay reports -->
-    <string name="bluetooth_disable_avdtp_delay_reports">Disable Bluetooth AVDTP delay reports</string>
-    <!-- Bluetooth developer settings: Summary of checkbox for disabling Bluetooth receiving AVDTP delay reports -->
-    <string name="bluetooth_disable_avdtp_delay_reports_summary">Disallow receiving Bluetooth AVDTP delay reports</string>
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast</string>
@@ -2348,6 +2340,17 @@
     <!-- Message of private dns that provides a help link. [CHAR LIMIT=NONE] -->
     <string name="private_dns_help_message"><annotation id="url">Learn more</annotation> about Private DNS features</string>
 
+    <!-- Message to display when setting wifi calling are not editable [CHAR LIMIT=NONE] -->
+    <string name="wifi_calling_pref_managed_by_carrier">Setting managed by carrier</string>
+    <!-- Message to display when wifi calling needs activation [CHAR LIMIT=NONE] -->
+    <string name="wifi_calling_settings_activation_instructions">Activate Wi\u2011Fi Calling</string>
+    <!-- Message to display when wifi calling should be on [CHAR LIMIT=NONE] -->
+    <string name="wifi_calling_turn_on">Turn on Wi\u2011Fi calling</string>
+    <!-- Message to display when carrier does not support wifi calling or doesn't want the user
+         to modify the settings [CHAR LIMIT=NONE] -->
+    <string name="wifi_calling_not_supported">Wi\u2011Fi calling is not supported for %1$s</string>
+    <!-- Carrier string to use in other messages -->
+    <string name="carrier">Carrier</string>
     <!-- Sound and alerts settings -->
     <skip/>
     <string name="display_settings_title">Display</string>
@@ -3386,6 +3389,8 @@
     <!-- Master Clear -->
     <!-- Button title to factory data reset the entire device -->
     <string name="master_clear_title">Erase all data (factory reset)</string>
+    <!-- Button title to factory data reset the entire device. The "(factory reset)" part is optional for translation. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=3531267871084279512]-->
+    <string name="master_clear_short_title">Erase all data (factory reset)</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -4633,6 +4638,9 @@
         <item quantity="other">Very long delay (<xliff:g id="click_delay_label" example="200">%1$d</xliff:g> ms)</item>
     </plurals>
 
+    <!-- Summary for vibration settings preference when notification vibration and haptic feedback intensity are set. [CHAR LIMIT=32] -->
+    <string name="accessibility_vibration_summary">Ring <xliff:g id="summary_ring" example="Medium">%1$s</xliff:g>, touch <xliff:g id="summary_touch" example="High">%2$s</xliff:g></string>
+
     <!-- Summary for vibration settings preference when ring & notification are set to off-->
     <string name="accessibility_vibration_summary_off">Ring &amp; notification set to off</string>
 
@@ -4915,6 +4923,8 @@
     <string name="background_activity_warning_dialog_title">Limit background activity?</string>
     <!-- TODO: Pending UX review. Text for the warning dialog to show to the user when limiting background activity for an app -->
     <string name="background_activity_warning_dialog_text">If you limit background activity for an app, it may misbehave</string>
+    <!-- Dialog message when app can't been restricted because it is not optimized [CHAR_LIMIT=120] -->
+    <string name="background_activity_disabled_dialog_text">Since this app is not set to optimize battery, you can\u2019t restrict it.\n\nTo restrict the app, first turn on battery optimization.</string>
 
     <!-- Title for the screen usage in power use UI [CHAR_LIMIT=60] -->
     <string name="device_screen_usage">Screen usage since full charge</string>
@@ -4924,9 +4934,7 @@
     <string name="device_cellular_network">Mobile network scanning</string>
 
     <!-- Label for list of apps using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
-    <string name="power_usage_list_summary">App usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>
-    <!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
-    <string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>
+    <string name="power_usage_list_summary">Battery usage since full charge</string>
     <!-- Temp string used to debug new battery estimates [DO NOT TRANSLATE] -->
     <string name="power_usage_enhanced_debug" translatable="false"><xliff:g id="time">%1$s</xliff:g> left (New ML est)</string>
     <!-- Temp string used to debug old battery estimates [DO NOT TRANSLATE] -->
@@ -4995,9 +5003,13 @@
     <string name="battery_abnormal_apps_summary"><xliff:g id="number">%1$d</xliff:g> apps misbehaving</string>
 
     <!-- Title for the battery summary tip [CHAR LIMIT=NONE] -->
-    <string name="battery_tip_summary_title">Battery is in good shape</string>
+    <string name="battery_tip_summary_title">Apps are running normally</string>
     <!-- Summary for the battery summary tip [CHAR LIMIT=NONE] -->
-    <string name="battery_tip_summary_summary">Apps are running normally</string>
+    <string name="battery_tip_summary_summary" product="default">Phone has typical background battery usage</string>
+    <!-- Summary for the battery summary tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_summary_summary" product="tablet">Tablet has typical background battery usage</string>
+    <!-- Summary for the battery summary tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_summary_summary" product="device">Device has typical background battery usage</string>
     <!-- Title for the low battery tip [CHAR LIMIT=NONE] -->
     <string name="battery_tip_low_battery_title">Low battery capacity</string>
     <!-- Summary for the low battery tip [CHAR LIMIT=NONE] -->
@@ -5027,11 +5039,11 @@
     <!-- Summary for the battery high usage tip, which presents battery may run out soon [CHAR LIMIT=NONE] -->
     <string name="battery_tip_high_usage_summary">Battery may run out soon</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
-    <string name="battery_tip_dialog_message" product="default">Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps since last full charge(<xliff:g id="time_period_ago" example="1 hr ago">%2$s</xliff:g>):</string>
+    <string name="battery_tip_dialog_message" product="default">Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps you used since full charge:</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
-    <string name="battery_tip_dialog_message" product="tablet">Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps since last full charge(<xliff:g id="time_period_ago" example="1 hr ago">%2$s</xliff:g>):</string>
+    <string name="battery_tip_dialog_message" product="tablet">Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps you used since full charge:</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
-    <string name="battery_tip_dialog_message" product="device">Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps since last full charge(<xliff:g id="time_period_ago" example="1 hr ago">%2$s</xliff:g>):</string>
+    <string name="battery_tip_dialog_message" product="device">Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps you used since full charge:</string>
     <!-- Title for restricted app preference, showing how many app need to be restricted [CHAR LIMIT=NONE] -->
     <plurals name="battery_tip_restrict_title">
         <item quantity="one">Restrict %1$d app</item>
@@ -5076,9 +5088,11 @@
     <string name="battery_tip_unrestrict_app_dialog_cancel">Cancel</string>
 
     <!-- Message for battery tip dialog to show the battery summary -->
-    <string name="battery_tip_dialog_summary_message">Based on your usage, your battery usually lasts about <xliff:g id="time_duration">%1$s</xliff:g> when fully charged.\n\nIf you need to extend your battery life, turn on Battery Saver.</string>
+    <string name="battery_tip_dialog_summary_message" product="default">Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery.</string>
     <!-- Message for battery tip dialog to show the battery summary -->
-    <string name="battery_tip_dialog_summary_message_no_estimation">If you need to extend your battery life, turn on Battery Saver</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet">Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery.</string>
+    <!-- Message for battery tip dialog to show the battery summary -->
+    <string name="battery_tip_dialog_summary_message" product="device">Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery.</string>
 
     <!-- Title for the smart battery manager preference [CHAR LIMIT=NONE] -->
     <string name="smart_battery_manager_title">Battery Manager</string>
@@ -6904,9 +6918,13 @@
     <!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
     <string name="connected_devices_dashboard_title">Connected devices</string>
     <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
-    <string name="connected_devices_dashboard_summary">Bluetooth, Cast, NFC</string>
+    <string name="connected_devices_dashboard_summary">Bluetooth, driving mode, NFC</string>
     <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
-    <string name="connected_devices_dashboard_no_nfc_summary">Bluetooth, Cast</string>
+    <string name="connected_devices_dashboard_no_nfc_summary">Bluetooth, driving mode</string>
+    <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="connected_devices_dashboard_no_driving_mode_summary">Bluetooth, NFC</string>
+    <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary">Bluetooth</string>
     <!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
     <string name="app_and_notification_dashboard_title">Apps &amp; notifications</string>
     <!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
@@ -7389,26 +7407,34 @@
     <string name="zen_msg_event_reminder_footer">When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.</string>
 
     <!-- Do not disturb onboarding dialog, accept new settings [CHAR LIMIT=30]-->
-    <string name="zen_onboarding_ok">Update</string>
-    <!-- Do not disturb onboarding dialog, do not accept new settings [CHAR LIMIT=30]-->
-    <string name="zen_onboarding_no_update">Don\'t update</string>
-    <!-- Do not disturb onboarding dialog, description of new settings [CHAR LIMIT=NONE]-->
-    <string name="zen_onboarding_dnd_visual_disturbances_description">Your phone can do more to help you focus.\n\nUpdate settings to:\n\n- Hide notifications completely\n\n- Allow calls from starred contacts and repeat callers</string>
-    <!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->
-    <string name="zen_onboarding_dnd_visual_disturbances_header">Update Do Not Disturb?</string>
-
-    <!-- obsolete -->
+    <string name="zen_onboarding_ok">Done</string>
+    <!-- Do not disturb onboarding dialog, on click user goes to dnd settings page [CHAR LIMIT=30]-->
     <string name="zen_onboarding_settings">Settings</string>
-    <!-- obsolete -->
-    <string name="zen_onboarding_more_options">You can further customize this in Settings.</string>
-    <!-- obsolete -->
-    <string name="zen_onboarding_screen_on_title">Block when the screen is on</string>
-    <!-- obsolete -->
-    <string name="zen_onboarding_screen_off_title">Block when the screen is off</string>
-    <!-- obsolete -->
-    <string name="zen_onboarding_screen_off_summary">Don\'t turn on the screen or wake for notifications</string>
-    <!-- obsolete -->
-    <string name="zen_onboarding_screen_on_summary">Don\'t show notifications at all, except for basic phone activity and status</string>
+
+    <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
+    <string name="zen_onboarding_new_setting_title">No visuals or sounds from notifications</string>
+    <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
+    <string name="zen_onboarding_current_setting_title">No sound from notifications</string>
+    <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->
+    <string name="zen_onboarding_new_setting_summary">You won\u2019t see or hear notifications. Calls from starred contacts and repeat callers are allowed.</string>
+    <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->
+    <string name="zen_onboarding_current_setting_summary">(Current setting)</string>
+
+    <!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->
+    <string name="zen_onboarding_dnd_visual_disturbances_header">Change Do Not Disturb notification settings?</string>
+
+    <!-- DO NOT TRANSLATE obsolete [CHAR LIMIT=NONE]-->
+    <string name="zen_onboarding_dnd_visual_disturbances_description" translatable="false">Your phone can do more to help you focus.\n\nUpdate settings to:\n\n- Hide notifications completely\n\n- Allow calls from starred contacts and repeat callers</string>
+    <!-- DO NOT TRANSLATE obsolete -->
+    <string name="zen_onboarding_more_options" translatable="false">You can further customize this in Settings.</string>
+    <!-- DO NOT TRANSLATE obsolete -->
+    <string name="zen_onboarding_screen_on_title" translatable="false">Block when the screen is on</string>
+    <!-- DO NOT TRANSLATE obsolete -->
+    <string name="zen_onboarding_screen_off_title" translatable="false">Block when the screen is off</string>
+    <!-- DO NOT TRANSLATE obsolete -->
+    <string name="zen_onboarding_screen_off_summary" translatable="false">Don\'t turn on the screen or wake for notifications</string>
+    <!-- DO NOT TRANSLATE obsolete -->
+    <string name="zen_onboarding_screen_on_summary" translatable="false">Don\'t show notifications at all, except for basic phone activity and status</string>
 
     <!-- Work Sounds: Work sound settings section header.  [CHAR LIMIT=50] -->
     <string name="sound_work_settings">Work profile sounds</string>
@@ -7919,12 +7945,27 @@
     <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
     <string name="zen_mode_calls">Calls</string>
 
+    <!-- [CHAR LIMIT=40] Zen mode settings: Allow calls toggle title -->
+    <string name="zen_mode_calls_title">Allow calls</string>
+
     <!-- [CHAR LIMIT=20] Zen mode settings: Calls screen footer -->
     <string name="zen_mode_calls_footer">When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
 
+    <!-- [CHAR LIMIT=50] Zen mode settings: Starred contacts preference title -->
+    <string name="zen_mode_starred_contacts_title">Starred contacts</string>
+
+    <!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->
+    <plurals name="zen_mode_starred_contacts_summary_additional_contacts">
+        <item quantity="one">and 1 other</item>
+        <item quantity="other">and <xliff:g id="num_people" example="3">%d</xliff:g> others</item>
+    </plurals>
+
     <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
     <string name="zen_mode_messages">Messages</string>
 
+    <!-- [CHAR LIMIT=40] Zen mode settings: Allow messages toggle title -->
+    <string name="zen_mode_messages_title">Allow messages</string>
+
     <!-- [CHAR LIMIT=50] Zen mode settings: All messages summary -->
     <string name="zen_mode_all_messages">Messages</string>
 
@@ -7964,9 +8005,15 @@
     <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
     <string name="zen_mode_reminders">Reminders</string>
 
+    <!-- [CHAR LIMIT=70] Zen mode settings: Allow reminders toggle title -->
+    <string name="zen_mode_reminders_title">Allow reminders</string>
+
     <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
     <string name="zen_mode_events">Events</string>
 
+    <!-- [CHAR LIMIT=70] Zen mode settings: Allow events toggle title -->
+    <string name="zen_mode_events_title">Allow events</string>
+
     <!-- [CHAR LIMIT=50] Zen mode settings: All callers summary -->
     <string name="zen_mode_all_callers">anyone</string>
 
@@ -7979,8 +8026,11 @@
     <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
     <string name="zen_mode_repeat_callers">Repeat callers</string>
 
+    <!-- [CHAR LIMIT=70] Zen mode settings: Allow repeat callers toggle title -->
+    <string name="zen_mode_repeat_callers_title">Allow repeat callers</string>
+
     <!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->
-    <string name="zen_mode_calls_summary_one">From <xliff:g id="caller type" example="contacts">%1$s</xliff:g> only</string>
+    <string name="zen_mode_calls_summary_one">From <xliff:g id="caller type" example="contacts">%1$s</xliff:g></string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->
     <string name="zen_mode_calls_summary_two">From <xliff:g id="caller type" example="starred contacts">%1$s</xliff:g> and <xliff:g id="callert tpye" example="repeat callers">%2$s</xliff:g></string>
@@ -8698,7 +8748,7 @@
     <string name="ignore_optimizations_off">Optimize</string>
 
     <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
-    <string name="ignore_optimizations_on_desc">May drain your battery more quickly</string>
+    <string name="ignore_optimizations_on_desc">May drain your battery more quickly. App will no longer be restricted from using background battery.</string>
 
     <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
     <string name="ignore_optimizations_off_desc">Recommended for better battery life</string>
@@ -8886,7 +8936,7 @@
     <!-- Summary of Android version info (when there is a pending upgrade available) [CHAR LIMIT=NONE] -->
     <string name="android_version_pending_update_summary">Update available</string>
 
-    <!-- Title for dialog displayed when user selects on a setting locked by an admin [CHAR LIMIT=30] -->
+    <!-- Title for dialog displayed when user selects on a setting locked by an admin [CHAR LIMIT=30 BACKUP_MESSAGE_ID:4867639270211833535] -->
     <string name="disabled_by_policy_title">Action not allowed</string>
     <!-- Title for dialog displayed to tell user that changing volume was disallowed by an admin [CHAR LIMIT=50] -->
     <string name="disabled_by_policy_title_adjust_volume">Can’t change volume</string>
@@ -9193,7 +9243,7 @@
     <!-- Informational text about time left in billing cycle [CHAR LIMIT=60] -->
     <string name="billing_cycle_less_than_one_day_left">Less than 1 day left</string>
 
-    <!-- Informational text about carrier and update time [CHAR LIMIT=30] -->
+    <!-- Informational text about carrier and update time [CHAR LIMIT=32] -->
     <string name="carrier_and_update_text">Updated by <xliff:g name="carrier" example="T-mobile">^1</xliff:g> <xliff:g name="time" example="3m">^2</xliff:g> ago</string>
 
     <!-- Informational text about update time only, without carrier. First argument intentionally skipped. [CHAR LIMIT=30] -->
@@ -9850,9 +9900,21 @@
     <!-- Help URI, USB Audio [DO NOT TRANSLATE] -->
     <string name="help_url_audio_accessory_not_supported" translatable="false"></string>
 
+    <!-- Help URI, restricted apps page [DO NOT TRANSLATE] -->
+    <string name="help_uri_restricted_apps" translatable="false"></string>
+
     <!-- Help URI, battery saver page [DO NOT TRANSLATE] -->
     <string name="help_url_battery_saver_settings" translatable="false"></string>
 
+    <!-- Help URI, smart battery page [DO NOT TRANSLATE] -->
+    <string name="help_uri_smart_battery_settings" translatable="false"></string>
+
+    <!-- Title label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
+    <string name="zen_suggestion_title">Update Do Not Disturb</string>
+
+    <!-- Summary label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
+    <string name="zen_suggestion_summary">Hide notifications to stay focused</string>
+
     <!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
     <string name="new_device_suggestion_title">What\'s new and exciting?</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 819202e..763d8fa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -439,8 +439,7 @@
         <item name="android:background">@drawable/btn_borderless_rect</item>
         <item name="android:gravity">center</item>
         <item name="android:focusable">true</item>
-        <item name="android:paddingStart">8dp</item>
-        <item name="android:paddingEnd">8dp</item>
+        <item name="android:padding">8dp</item>
     </style>
 
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index e3319e9..53e575f 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -20,7 +20,8 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="apps_and_notification_screen"
     android:title="@string/app_and_notification_dashboard_title"
-    settings:initialExpandedChildrenCount="7">
+    settings:initialExpandedChildrenCount="8">
+    <!-- the initial count should include the dynamic tiles -->
 
     <PreferenceCategory
         android:key="recent_apps_category"
diff --git a/res/xml/bluetooth_screen.xml b/res/xml/bluetooth_screen.xml
index ec25520..407feb6 100644
--- a/res/xml/bluetooth_screen.xml
+++ b/res/xml/bluetooth_screen.xml
@@ -15,5 +15,19 @@
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="bluetooth_switchbar_screen"
-    android:title="@string/bluetooth_settings_title" />
\ No newline at end of file
+    android:title="@string/bluetooth_settings_title">
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="bluetooth_screen_add_bt_devices"
+        android:title="@string/connected_device_add_device_title"
+        android:icon="@drawable/ic_menu_add"
+        android:summary="@string/connected_device_add_device_summary"
+        android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
+        settings:allowDividerAbove="true"
+        settings:userRestriction="no_config_bluetooth"
+        settings:useAdminDisabledSummary="true"
+        settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 1e9d97e..6d25c58 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -32,7 +32,7 @@
 
     <com.android.settingslib.RestrictedPreference
         android:key="add_bt_devices"
-        android:title="@string/connected_device_add_device_title"
+        android:title="@string/bluetooth_pairing_pref_title"
         android:icon="@drawable/ic_menu_add"
         android:summary="@string/connected_device_add_device_summary"
         android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index c491980..3836b43 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -254,16 +254,6 @@
             android:title="@string/bluetooth_disable_absolute_volume"
             android:summary="@string/bluetooth_disable_absolute_volume_summary" />
 
-        <SwitchPreference
-            android:key="bluetooth_disable_inband_ringing"
-            android:title="@string/bluetooth_disable_inband_ringing"
-            android:summary="@string/bluetooth_disable_inband_ringing_summary" />
-
-        <SwitchPreference
-            android:key="bluetooth_disable_avdtp_delay_reports"
-            android:title="@string/bluetooth_disable_avdtp_delay_reports"
-            android:summary="@string/bluetooth_disable_avdtp_delay_reports_summary"/>
-
         <ListPreference
             android:key="bluetooth_select_avrcp_version"
             android:title="@string/bluetooth_select_avrcp_version_string"
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 064d625..69d8fca 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -97,6 +97,7 @@
         android:order="15"
         android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
         android:dialogLayout="@layout/private_dns_mode_dialog"
-        android:positiveButtonText="@string/save" />
+        android:positiveButtonText="@string/save"
+        android:negativeButtonText="@android:string/cancel" />
 
 </PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 15fbcc8..5bee7b0 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -38,36 +38,42 @@
         android:order="-175"
         settings:controller="com.android.settings.sound.MediaOutputPreferenceController"/>
 
-    <!-- Ring volume -->
+    <!-- Call volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
-        android:key="ring_volume"
-        android:icon="@*android:drawable/ic_audio_ring_notif"
-        android:title="@string/ring_volume_option_title"
+        android:key="call_volume"
+        android:icon="@drawable/ic_local_phone_24_lib"
+        android:title="@string/call_volume_option_title"
         android:order="-170"
-        settings:controller="com.android.settings.notification.RingVolumePreferenceController"
-        settings:allowDividerAbove="true"/>
-
-    <!-- Also vibrate for calls -->
-    <SwitchPreference
-        android:key="vibrate_when_ringing"
-        android:title="@string/vibrate_when_ringing_title"
-        android:order="-160"/>
+        settings:controller="com.android.settings.notification.CallVolumePreferenceController"/>
 
     <!-- Hands free profile output switcher -->
     <ListPreference
         android:key="take_call_on_output"
         android:title="@string/take_call_on_title"
         android:dialogTitle="@string/take_call_on_title"
-        android:order="-155"
+        android:order="-165"
         settings:controller="com.android.settings.sound.HandsFreeProfileOutputPreferenceController"/>
 
+    <!-- Ring volume -->
+    <com.android.settings.notification.VolumeSeekBarPreference
+        android:key="ring_volume"
+        android:icon="@*android:drawable/ic_audio_ring_notif"
+        android:title="@string/ring_volume_option_title"
+        android:order="-160"
+        settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>
+
+    <!-- Also vibrate for calls -->
+    <SwitchPreference
+        android:key="vibrate_when_ringing"
+        android:title="@string/vibrate_when_ringing_title"
+        android:order="-155"/>
+
     <!-- Alarm volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
         android:key="alarm_volume"
         android:icon="@*android:drawable/ic_audio_alarm"
         android:title="@string/alarm_volume_option_title"
         android:order="-150"
-        settings:allowDividerAbove="true"
         settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>
 
     <!-- Notification volume -->
@@ -93,7 +99,6 @@
         android:title="@string/gesture_prevent_ringing_sound_title"
         android:order="-110"
         android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
-        settings:allowDividerAbove="true"
         settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />
 
     <!-- Phone ringtone -->
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index f9d9596..bf11698 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -28,6 +28,7 @@
 
     <com.android.settings.widget.ValidatedEditTextPreference
         android:key="wifi_tether_network_password"
+        android:persistent="false"
         android:title="@string/wifi_hotspot_password_title" />
 
     <SwitchPreference
diff --git a/res/xml/zen_mode_calls_settings.xml b/res/xml/zen_mode_calls_settings.xml
index d9e47f3..1a6655f 100644
--- a/res/xml/zen_mode_calls_settings.xml
+++ b/res/xml/zen_mode_calls_settings.xml
@@ -25,16 +25,18 @@
       <!-- Calls -->
       <ListPreference
           android:key="zen_mode_calls"
-          android:title="@string/zen_mode_calls"
+          android:title="@string/zen_mode_calls_title"
           android:entries="@array/zen_mode_contacts_entries"
           android:entryValues="@array/zen_mode_contacts_values"/>
 
-      <!-- TODO: setting that links to contacts or placeholder for external app -->
+      <Preference
+          android:key="zen_mode_starred_contacts"
+          android:title="@string/zen_mode_starred_contacts_title"/>
 
       <!-- Repeat callers -->
       <SwitchPreference
           android:key="zen_mode_repeat_callers"
-          android:title="@string/zen_mode_repeat_callers" />
+          android:title="@string/zen_mode_repeat_callers_title" />
    </PreferenceCategory>
 
    <com.android.settingslib.widget.FooterPreference/>
diff --git a/res/xml/zen_mode_msg_event_reminder_settings.xml b/res/xml/zen_mode_msg_event_reminder_settings.xml
index 866f333..9bee9e9 100644
--- a/res/xml/zen_mode_msg_event_reminder_settings.xml
+++ b/res/xml/zen_mode_msg_event_reminder_settings.xml
@@ -25,19 +25,23 @@
       <!-- Messages -->
       <ListPreference
           android:key="zen_mode_messages"
-          android:title="@string/zen_mode_messages"
+          android:title="@string/zen_mode_messages_title"
           android:entries="@array/zen_mode_contacts_entries"
           android:entryValues="@array/zen_mode_contacts_values"/>
 
+      <Preference
+          android:key="zen_mode_starred_contacts"
+          android:title="@string/zen_mode_starred_contacts_title"/>
+
       <!-- Reminders -->
       <SwitchPreference
           android:key="zen_mode_reminders"
-          android:title="@string/zen_mode_reminders"/>
+          android:title="@string/zen_mode_reminders_title"/>
 
       <!-- Events -->
       <SwitchPreference
           android:key="zen_mode_events"
-          android:title="@string/zen_mode_events"/>
+          android:title="@string/zen_mode_events_title"/>
    </PreferenceCategory>
 
    <com.android.settingslib.widget.FooterPreference />
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 766c6ae..8f573c0 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -102,7 +102,7 @@
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getActivity().setTitle(R.string.master_clear_title);
+        getActivity().setTitle(R.string.master_clear_short_title);
     }
 
     /**
@@ -114,7 +114,7 @@
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
         return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
-                request, res.getText(R.string.master_clear_title));
+                request, res.getText(R.string.master_clear_short_title));
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 94c3fb5..1e56e54 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -387,7 +387,6 @@
             if (adapter.getState() == BluetoothAdapter.STATE_OFF) {
                 mBluetoothEnableForTether = true;
                 adapter.enable();
-                mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
                 mBluetoothTether.setEnabled(false);
                 return;
             }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 3f94af4..72e485e 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -33,6 +33,7 @@
 import android.os.Vibrator;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.preference.ListPreference;
@@ -747,12 +748,34 @@
         pref.setSummary(entries[index]);
     }
 
-    private void updateVibrationSummary(Preference pref) {
-        Vibrator vibrator = getContext().getSystemService(Vibrator.class);
-        final int intensity = Settings.System.getInt(getContext().getContentResolver(),
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    void updateVibrationSummary(Preference pref) {
+        final Context context = getContext();
+        final Vibrator vibrator = context.getSystemService(Vibrator.class);
+
+        final int ringIntensity = Settings.System.getInt(context.getContentResolver(),
                 Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
                 vibrator.getDefaultNotificationVibrationIntensity());
-        mVibrationPreferenceScreen.setSummary(getVibrationSummary(getContext(), intensity));
+        CharSequence ringIntensityString =
+                VibrationIntensityPreferenceController.getIntensityString(context, ringIntensity);
+
+        final int touchIntensity = Settings.System.getInt(context.getContentResolver(),
+                Settings.System.HAPTIC_FEEDBACK_INTENSITY,
+                vibrator.getDefaultHapticFeedbackIntensity());
+        CharSequence touchIntensityString =
+                VibrationIntensityPreferenceController.getIntensityString(context, touchIntensity);
+
+        if (mVibrationPreferenceScreen == null) {
+            mVibrationPreferenceScreen = findPreference(VIBRATION_PREFERENCE_SCREEN);
+        }
+
+        if (ringIntensity == touchIntensity) {
+            mVibrationPreferenceScreen.setSummary(ringIntensityString);
+        } else {
+            mVibrationPreferenceScreen.setSummary(
+                    getString(R.string.accessibility_vibration_summary,
+                            ringIntensityString, touchIntensityString));
+        }
     }
 
     private String getVibrationSummary(Context context, @VibrationIntensity int intensity) {
diff --git a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
index 6b9a480..ec988cd 100644
--- a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
@@ -23,7 +23,6 @@
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 
-import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
@@ -88,7 +87,7 @@
     @Override
     public int getAvailabilityStatus() {
         // Return unsupported when the service is disabled or not installed.
-        return getAccessibilityServiceInfo() == null ? DISABLED_UNSUPPORTED : AVAILABLE;
+        return getAccessibilityServiceInfo() == null ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 
     private AccessibilityServiceInfo getAccessibilityServiceInfo() {
diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
index 947893d..84063a1 100644
--- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
@@ -56,7 +56,7 @@
     public int getAvailabilityStatus() {
         return MagnificationPreferenceFragment.isApplicable(mContext.getResources())
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
index 44d5b79..aa6d4f3 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -32,6 +32,8 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settings.search.actionbar.SearchMenuController;
+import com.android.settings.support.actionbar.HelpResourceProvider;
 
 import java.util.Arrays;
 import java.util.List;
@@ -88,6 +90,10 @@
             // If invoked from SUW, redirect to fragment instrumented for Vision Settings metrics
             preference.setFragment(
                     ToggleScreenMagnificationPreferenceFragmentForSetupWizard.class.getName());
+            Bundle args = preference.getExtras();
+            // Copy from AccessibilitySettingsForSetupWizardActivity, hide search and help menu
+            args.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 0);
+            args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);
         }
         return super.onPreferenceTreeClick(preference);
     }
diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
index ea212cf..9c81afa 100644
--- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
@@ -77,16 +77,19 @@
     public CharSequence getSummary() {
         final int intensity = Settings.System.getInt(mContext.getContentResolver(),
                 mSettingKey, getDefaultIntensity());
+        return getIntensityString(mContext, intensity);
+   }
 
+    public static CharSequence getIntensityString(Context context, int intensity) {
         switch (intensity) {
             case Vibrator.VIBRATION_INTENSITY_OFF:
-                return mContext.getText(R.string.accessibility_vibration_intensity_off);
+                return context.getText(R.string.accessibility_vibration_intensity_off);
             case Vibrator.VIBRATION_INTENSITY_LOW:
-                return mContext.getText(R.string.accessibility_vibration_intensity_low);
+                return context.getText(R.string.accessibility_vibration_intensity_low);
             case Vibrator.VIBRATION_INTENSITY_MEDIUM:
-                return mContext.getText(R.string.accessibility_vibration_intensity_medium);
+                return context.getText(R.string.accessibility_vibration_intensity_medium);
             case Vibrator.VIBRATION_INTENSITY_HIGH:
-                return mContext.getText(R.string.accessibility_vibration_intensity_high);
+                return context.getText(R.string.accessibility_vibration_intensity_high);
             default:
                 return "";
         }
diff --git a/src/com/android/settings/applications/DataSaverController.java b/src/com/android/settings/applications/DataSaverController.java
index d9710fc..87589a7 100644
--- a/src/com/android/settings/applications/DataSaverController.java
+++ b/src/com/android/settings/applications/DataSaverController.java
@@ -35,6 +35,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_data_saver)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/DeviceAdministratorsController.java b/src/com/android/settings/applications/DeviceAdministratorsController.java
index c7ef8ce..79c078e 100644
--- a/src/com/android/settings/applications/DeviceAdministratorsController.java
+++ b/src/com/android/settings/applications/DeviceAdministratorsController.java
@@ -34,6 +34,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_device_administrators)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/EnabledVrListenersController.java b/src/com/android/settings/applications/EnabledVrListenersController.java
index 94a70ef..0aae14f 100644
--- a/src/com/android/settings/applications/EnabledVrListenersController.java
+++ b/src/com/android/settings/applications/EnabledVrListenersController.java
@@ -34,6 +34,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_enabled_vr_listeners)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/HighPowerAppsController.java b/src/com/android/settings/applications/HighPowerAppsController.java
index dc847b3..b7ec2fb 100644
--- a/src/com/android/settings/applications/HighPowerAppsController.java
+++ b/src/com/android/settings/applications/HighPowerAppsController.java
@@ -34,6 +34,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_high_power_apps)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/PremiumSmsController.java b/src/com/android/settings/applications/PremiumSmsController.java
index 40911a5..ecf19ff 100644
--- a/src/com/android/settings/applications/PremiumSmsController.java
+++ b/src/com/android/settings/applications/PremiumSmsController.java
@@ -34,6 +34,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_premium_sms)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
index afcf760..b0bb173 100644
--- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
@@ -78,7 +78,7 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_app_info_settings_battery)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
index a40562a..69be98d 100644
--- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
@@ -56,7 +56,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return isBandwidthControlEnabled() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isBandwidthControlEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
index daf3992..4bc680c 100644
--- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
@@ -105,11 +105,11 @@
     @Override
     public int getAvailabilityStatus() {
         if (!mContext.getResources().getBoolean(R.bool.config_show_app_info_settings_memory)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
 
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index cf1731d..d5061d5 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -46,7 +46,7 @@
         if (UserManager.get(mContext).isManagedProfile()) {
             return DISABLED_FOR_USER;
         }
-        return hasAppCapability() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return hasAppCapability() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
index 0997e60..0c4044a 100644
--- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
@@ -55,19 +55,19 @@
     @Override
     public int getAvailabilityStatus() {
         if (TextUtils.isEmpty(mPackageName)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         final List<ResolveInfo> resolved = mPackageManager.queryIntentActivities(mIntent,
                 0 /* flags */);
         if (resolved == null || resolved.isEmpty()) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         for (ResolveInfo info : resolved) {
             if (isSystemApp(info)) {
                 return AVAILABLE;
             }
         }
-        return DISABLED_UNSUPPORTED;
+        return UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 301e71b..328d4a2 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -545,7 +545,7 @@
                 startAppInfoFragment(AppStorageSettings.class, R.string.storage_settings);
                 break;
             case LIST_TYPE_HIGH_POWER:
-                HighPowerDetail.show(this, mCurrentPkgName, INSTALLED_APP_DETAILS);
+                HighPowerDetail.show(this, mCurrentUid, mCurrentPkgName, INSTALLED_APP_DETAILS);
                 break;
             case LIST_TYPE_OVERLAY:
                 startAppInfoFragment(DrawOverlayDetails.class, R.string.overlay_settings);
diff --git a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
index 183d13f..f0439d6 100644
--- a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
@@ -41,7 +41,7 @@
     public int getAvailabilityStatus() {
         return mUm.isAdminUser()
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index 1e4b693..01c1ff6 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -16,20 +16,22 @@
 package com.android.settings.bluetooth;
 
 import android.bluetooth.BluetoothProfile;
-import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.media.AudioManager;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
+
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import android.support.v7.preference.Preference;
 
 /**
  * Controller to maintain available media Bluetooth devices
  */
-public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
+public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
+        implements Preference.OnPreferenceClickListener {
 
     private static final String TAG = "AvailableMediaBluetoothDeviceUpdater";
     private static final boolean DBG = false;
@@ -57,18 +59,20 @@
     }
 
     @Override
-    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+    public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state,
+            int bluetoothProfile) {
         if (DBG) {
-            Log.d(TAG,"onConnectionStateChanged() device : " +
-                    cachedDevice.getName() + ", state : " + state);
+            Log.d(TAG, "onProfileConnectionStateChanged() device: " +
+                    cachedDevice.getName() + ", state: " + state + ", bluetoothProfile: "
+                    + bluetoothProfile);
         }
-        if (state == BluetoothAdapter.STATE_CONNECTED) {
+        if (state == BluetoothProfile.STATE_CONNECTED) {
             if (isFilterMatched(cachedDevice)) {
                 addPreference(cachedDevice);
             } else {
                 removePreference(cachedDevice);
             }
-        } else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
+        } else if (state == BluetoothProfile.STATE_DISCONNECTED) {
             removePreference(cachedDevice);
         }
     }
@@ -114,5 +118,12 @@
         }
         return isFilterMatched;
     }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
+                .getBluetoothDevice();
+        return device.setActive();
+    }
 }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index f2f220a..8827a71 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -99,7 +99,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return mLocalAdapter != null ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return mLocalAdapter != null ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index dfcbfca..bab7171 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -59,24 +59,12 @@
     protected DashboardFragment mFragment;
 
     private final boolean mShowDeviceWithoutNames;
-    private Preference.OnPreferenceClickListener mDevicePreferenceClickListener = null;
-
+    
     @VisibleForTesting
     final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
         launchDeviceDetails(pref);
     };
 
-    private class PreferenceClickListener implements
-        Preference.OnPreferenceClickListener {
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            final CachedBluetoothDevice device =
-                ((BluetoothDevicePreference) preference).getBluetoothDevice();
-            Log.i(TAG, "OnPreferenceClickListener: device=" + device);
-            return device.setActive();
-        }
-    }
-
     public BluetoothDeviceUpdater(Context context, DashboardFragment fragment,
             DevicePreferenceCallback devicePreferenceCallback) {
         this(fragment, devicePreferenceCallback, Utils.getLocalBtManager(context));
@@ -91,7 +79,6 @@
                 BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false);
         mPreferenceMap = new HashMap<>();
         mLocalManager = localManager;
-        mDevicePreferenceClickListener = new PreferenceClickListener();
     }
 
     /**
@@ -162,6 +149,11 @@
     }
 
     @Override
+    public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state,
+            int bluetoothProfile) {
+    }
+
+    @Override
     public void onServiceConnected() {
         // When bluetooth service connected update the UI
         forceUpdate();
@@ -207,7 +199,10 @@
                     new BluetoothDevicePreference(mPrefContext, cachedDevice,
                             mShowDeviceWithoutNames);
             btPreference.setOnGearClickListener(mDeviceProfilesListener);
-            btPreference.setOnPreferenceClickListener(mDevicePreferenceClickListener);
+            if (this instanceof Preference.OnPreferenceClickListener) {
+                btPreference.setOnPreferenceClickListener(
+                        (Preference.OnPreferenceClickListener)this);
+            }
             mPreferenceMap.put(device, btPreference);
             mDevicePreferenceCallback.onDeviceAdded(btPreference);
         }
diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
index 6fbb84a..cacfa0c 100644
--- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
@@ -26,7 +26,6 @@
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
@@ -57,7 +56,7 @@
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
index 11702bc..d43290c 100644
--- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.bluetooth;
 
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
@@ -60,19 +59,20 @@
     }
 
     @Override
-    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+    public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state,
+            int bluetoothProfile) {
         if (DBG) {
-            Log.d(TAG,"onConnectionStateChanged() device : " +
-                    cachedDevice.getName() + ", state : " + state);
+            Log.d(TAG, "onProfileConnectionStateChanged() device: " +
+                    cachedDevice.getName() + ", state: " + state + ", bluetoothProfile: "
+                    + bluetoothProfile);
         }
-
-        if (state == BluetoothAdapter.STATE_CONNECTED) {
+        if (state == BluetoothProfile.STATE_CONNECTED) {
             if (isFilterMatched(cachedDevice)) {
                 addPreference(cachedDevice);
             } else {
                 removePreference(cachedDevice);
             }
-        } else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
+        } else if (state == BluetoothProfile.STATE_DISCONNECTED) {
             removePreference(cachedDevice);
         }
     }
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index c25a43b..f087c6a 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -15,8 +15,8 @@
  */
 package com.android.settings.bluetooth;
 
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.support.annotation.VisibleForTesting;
 
@@ -24,11 +24,15 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import android.support.v7.preference.Preference;
+import android.util.Log;
 
 /**
  * Maintain and update saved bluetooth devices(bonded but not connected)
  */
-public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
+public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
+        implements Preference.OnPreferenceClickListener {
+    private static final String TAG = "SavedBluetoothDeviceUpdater";
 
     public SavedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
             DevicePreferenceCallback devicePreferenceCallback) {
@@ -43,10 +47,11 @@
     }
 
     @Override
-    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
-        if (state == BluetoothAdapter.STATE_CONNECTED) {
+    public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state,
+            int bluetoothProfile) {
+        if (state == BluetoothProfile.STATE_CONNECTED) {
             removePreference(cachedDevice);
-        } else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
+        } else if (state == BluetoothProfile.STATE_DISCONNECTED) {
             addPreference(cachedDevice);
         }
     }
@@ -56,4 +61,12 @@
         final BluetoothDevice device = cachedDevice.getDevice();
         return device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected();
     }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
+                .getBluetoothDevice();
+        device.connect(true);
+        return true;
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
index 2de271c..da6d86f 100644
--- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
@@ -75,7 +75,7 @@
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
index fd14d47..6fa7d1b 100644
--- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.connecteddevice;
 
+import static com.android.settingslib.Utils.isAudioModeOngoingCall;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.support.annotation.VisibleForTesting;
@@ -23,8 +25,13 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
+import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.BluetoothCallback;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -35,26 +42,30 @@
  * to add/remove {@link Preference}
  */
 public class AvailableMediaDeviceGroupController extends BasePreferenceController
-        implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback {
+        implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback, BluetoothCallback {
 
     private static final String KEY = "available_device_list";
 
     @VisibleForTesting
     PreferenceGroup mPreferenceGroup;
     private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
+    private final LocalBluetoothManager mLocalBluetoothManager;
 
     public AvailableMediaDeviceGroupController(Context context) {
         super(context, KEY);
+        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
     }
 
     @Override
     public void onStart() {
         mBluetoothDeviceUpdater.registerCallback();
+        mLocalBluetoothManager.getEventManager().registerCallback(this);
     }
 
     @Override
     public void onStop() {
         mBluetoothDeviceUpdater.unregisterCallback();
+        mLocalBluetoothManager.getEventManager().unregisterCallback(this);
     }
 
     @Override
@@ -63,6 +74,7 @@
         if (isAvailable()) {
             mPreferenceGroup = (PreferenceGroup) screen.findPreference(KEY);
             mPreferenceGroup.setVisible(false);
+            updateTitle();
             mBluetoothDeviceUpdater.setPrefContext(screen.getContext());
             mBluetoothDeviceUpdater.forceUpdate();
         }
@@ -72,7 +84,7 @@
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -105,4 +117,56 @@
     public void setBluetoothDeviceUpdater(BluetoothDeviceUpdater bluetoothDeviceUpdater) {
         mBluetoothDeviceUpdater  = bluetoothDeviceUpdater;
     }
+
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {
+        // do nothing
+    }
+
+    @Override
+    public void onScanningStateChanged(boolean started) {
+        // do nothing
+    }
+
+    @Override
+    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
+        // do nothing
+    }
+
+    @Override
+    public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
+        // do nothing
+    }
+
+    @Override
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+        // do nothing
+    }
+
+    @Override
+    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+        // do nothing
+    }
+
+    @Override
+    public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
+        // do nothing
+    }
+
+    @Override
+    public void onAudioModeChanged() {
+        updateTitle();
+    }
+
+    private void updateTitle() {
+        if (isAudioModeOngoingCall(mContext)) {
+            // in phone call
+            mPreferenceGroup.
+                    setTitle(mContext.getString(R.string.connected_device_available_call_title));
+        } else {
+            // without phone call
+            mPreferenceGroup.
+                    setTitle(mContext.getString(R.string.connected_device_available_media_title));
+        }
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index ec616c8..77b75c5 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -128,7 +128,7 @@
                         BluetoothAdapter adapter = manager.getAdapter();
                         final int status = adapter != null
                                 ? TogglePreferenceController.AVAILABLE
-                                : TogglePreferenceController.DISABLED_UNSUPPORTED;
+                                : TogglePreferenceController.UNSUPPORTED_ON_DEVICE;
                         if (status != TogglePreferenceController.AVAILABLE) {
                             keys.add(KEY_BLUETOOTH_SCREEN);
                         }
diff --git a/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java b/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java
index 072de75..6d4e8b8 100644
--- a/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java
@@ -38,7 +38,7 @@
         if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING)) {
             return AVAILABLE;
         }
-        return DISABLED_UNSUPPORTED;
+        return CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
index 47e3438..e97683d 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@ -33,7 +33,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
 /**
@@ -88,7 +87,7 @@
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
index f80c877..1826be5 100644
--- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
@@ -30,7 +30,6 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.DockUpdaterFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -86,7 +85,7 @@
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
index 44305dd..c3eb672 100644
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -49,8 +49,8 @@
      * {@link #isSupported()}.
      */
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({AVAILABLE, DISABLED_UNSUPPORTED, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING,
-            UNAVAILABLE_UNKNOWN})
+    @IntDef({AVAILABLE, UNSUPPORTED_ON_DEVICE, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING,
+            CONDITIONALLY_UNAVAILABLE})
     public @interface AvailabilityStatus {
     }
 
@@ -60,12 +60,20 @@
     public static final int AVAILABLE = 0;
 
     /**
-     * The setting is not supported by the device.
+     * A generic catch for settings which are currently unavailable, but may become available in
+     * the future. You should use {@link #DISABLED_FOR_USER} or {@link #DISABLED_DEPENDENT_SETTING}
+     * if they describe the condition more accurately.
+     */
+    public static final int CONDITIONALLY_UNAVAILABLE = 1;
+
+    /**
+     * The setting is not, and will not supported by this device.
      * <p>
      * There is no guarantee that the setting page exists, and any links to the Setting should take
      * you to the home page of Settings.
      */
-    public static final int DISABLED_UNSUPPORTED = 1;
+    public static final int UNSUPPORTED_ON_DEVICE = 2;
+
 
     /**
      * The setting cannot be changed by the current user.
@@ -73,7 +81,7 @@
      * Links to the Setting should take you to the page of the Setting, even if it cannot be
      * changed.
      */
-    public static final int DISABLED_FOR_USER = 2;
+    public static final int DISABLED_FOR_USER = 3;
 
     /**
      * The setting has a dependency in the Settings App which is currently blocking access.
@@ -90,15 +98,8 @@
      * Links to the Setting should take you to the page of the Setting, even if it cannot be
      * changed.
      */
-    public static final int DISABLED_DEPENDENT_SETTING = 3;
+    public static final int DISABLED_DEPENDENT_SETTING = 4;
 
-    /**
-     * A catch-all case for internal errors and inexplicable unavailability.
-     * <p>
-     * There is no guarantee that the setting page exists, and any links to the Setting should take
-     * you to the home page of Settings.
-     */
-    public static final int UNAVAILABLE_UNKNOWN = 4;
 
     protected final String mPreferenceKey;
 
@@ -181,8 +182,8 @@
     @Override
     public final boolean isAvailable() {
         final int availabilityStatus = getAvailabilityStatus();
-        return (availabilityStatus == AVAILABLE) ||
-                (availabilityStatus == DISABLED_DEPENDENT_SETTING);
+        return (availabilityStatus == AVAILABLE
+                || availabilityStatus == DISABLED_DEPENDENT_SETTING);
     }
 
     /**
@@ -193,7 +194,7 @@
      * Note that a return value of {@code true} does not mean that the setting is available.
      */
     public final boolean isSupported() {
-        return getAvailabilityStatus() != DISABLED_UNSUPPORTED;
+        return getAvailabilityStatus() != UNSUPPORTED_ON_DEVICE;
     }
 
     /**
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index 7b7fb5b..cd478fc 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -27,7 +27,9 @@
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.development.DevelopmentSettingsDashboardFragment;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
+import com.android.settings.display.NightDisplaySettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.GestureSettings;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.ConfigureNotificationSettings;
@@ -95,6 +97,10 @@
                 CategoryKey.CATEGORY_SECURITY_LOCKSCREEN);
         PARENT_TO_CATEGORY_KEY_MAP.put(ZenModeSettings.class.getName(),
                 CategoryKey.CATEGORY_DO_NOT_DISTURB);
+        PARENT_TO_CATEGORY_KEY_MAP.put(GestureSettings.class.getName(),
+            CategoryKey.CATEGORY_GESTURES);
+        PARENT_TO_CATEGORY_KEY_MAP.put(NightDisplaySettings.class.getName(),
+            CategoryKey.CATEGORY_NIGHT_DISPLAY);
 
         CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());
 
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index af7c900..20033b6 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -276,7 +276,7 @@
         mSummaryLoader.updateSummaryToCache(category);
         mStagingCategory = category;
         if (mSuggestionControllerMixin == null) {
-            mAdapter.setCategory(mStagingCategory);
+            ThreadUtils.postOnMainThread(() -> mAdapter.setCategory(mStagingCategory));
             return;
         }
         if (mSuggestionControllerMixin.isSuggestionLoaded()) {
diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java
index 4acd332..405ed81 100644
--- a/src/com/android/settings/dashboard/conditional/DndCondition.java
+++ b/src/com/android/settings/dashboard/conditional/DndCondition.java
@@ -83,7 +83,7 @@
 
     @Override
     public Drawable getIcon() {
-        return mManager.getContext().getDrawable(R.drawable.ic_zen);
+        return mManager.getContext().getDrawable(R.drawable.ic_do_not_disturb_on_24dp);
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java b/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
index bf5bc36..7f7bc2b 100644
--- a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
+++ b/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
@@ -55,7 +55,7 @@
 
     @Override
     public Drawable getIcon() {
-        return mManager.getContext().getDrawable(R.drawable.ic_volume_ringer_mute);
+        return mManager.getContext().getDrawable(R.drawable.ic_notifications_off_24dp);
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index d0c0b25..257e8c3 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -22,7 +22,6 @@
 import android.content.SharedPreferences;
 import android.service.settings.suggestions.Suggestion;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.util.Pair;
 
@@ -32,6 +31,8 @@
 import com.android.settings.display.NightDisplayPreferenceController;
 import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
 import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.notification.ZenOnboardingActivity;
+import com.android.settings.notification.ZenSuggestionActivity;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ScreenLockSuggestionActivity;
 import com.android.settings.support.NewDeviceIntroSuggestionActivity;
@@ -88,6 +89,8 @@
             return NightDisplayPreferenceController.isSuggestionComplete(context);
         } else if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
             return NewDeviceIntroSuggestionActivity.isSuggestionComplete(context);
+        } else if (className.equals(ZenSuggestionActivity.class.getName())) {
+            return ZenOnboardingActivity.isSuggestionComplete(context);
         }
         return false;
     }
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 58faac2..0767f7a 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -28,7 +28,6 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.SubscriptionPlan;
 import android.text.TextUtils;
-import android.text.format.Formatter;
 import android.util.Log;
 import android.util.RecurrenceRule;
 
@@ -182,7 +181,7 @@
     @Override
     public int getAvailabilityStatus() {
         return DataUsageUtils.hasSim(mActivity)
-                || DataUsageUtils.hasWifiRadio(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+                || DataUsageUtils.hasWifiRadio(mContext) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java b/src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java
deleted file mode 100644
index 6c7a7dd..0000000
--- a/src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class BluetoothDelayReportsPreferenceController extends DeveloperOptionsPreferenceController
-        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
-    private static final String BLUETOOTH_DISABLE_AVDTP_DELAY_REPORT_KEY =
-            "bluetooth_disable_avdtp_delay_reports";
-    @VisibleForTesting
-    static final String BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY =
-            "persist.bluetooth.disabledelayreports";
-
-    public BluetoothDelayReportsPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return BLUETOOTH_DISABLE_AVDTP_DELAY_REPORT_KEY;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean isDisabled = (Boolean) newValue;
-        SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY,
-                isDisabled ? "true" : "false");
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final boolean isDisabled = SystemProperties.getBoolean(
-                BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
-        ((SwitchPreference) mPreference).setChecked(isDisabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        // the default setting for this preference is the disabled state
-        ((SwitchPreference) mPreference).setChecked(false);
-        SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, "false");
-    }
-
-}
diff --git a/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java b/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
deleted file mode 100644
index c64ac11..0000000
--- a/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.development;
-
-import android.bluetooth.BluetoothHeadset;
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class BluetoothInbandRingingPreferenceController extends DeveloperOptionsPreferenceController
-        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
-    private static final String BLUETOOTH_DISABLE_INBAND_RINGING_KEY =
-            "bluetooth_disable_inband_ringing";
-    @VisibleForTesting
-    static final String BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY =
-            "persist.bluetooth.disableinbandringing";
-
-    public BluetoothInbandRingingPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return isInbandRingingSupported();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return BLUETOOTH_DISABLE_INBAND_RINGING_KEY;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean isChecked = (Boolean) newValue;
-        SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY,
-                isChecked ? "true" : "false");
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final boolean isEnabled = SystemProperties.getBoolean(
-                BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
-        ((SwitchPreference) mPreference).setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        ((SwitchPreference) mPreference).setChecked(false);
-        SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, "false");
-    }
-
-    @VisibleForTesting
-    boolean isInbandRingingSupported() {
-        return BluetoothHeadset.isInbandRingingSupported(mContext);
-    }
-}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 3ee5db1..5f5d1a8 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -404,8 +404,6 @@
         controllers.add(new TetheringHardwareAccelPreferenceController(context));
         controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
         controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
-        controllers.add(new BluetoothInbandRingingPreferenceController(context));
-        controllers.add(new BluetoothDelayReportsPreferenceController(context));
         controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
         controllers.add(new BluetoothAudioCodecPreferenceController(context, lifecycle,
                 bluetoothA2dpConfigStore));
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index a6d5363..cb04ed4 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -50,7 +50,7 @@
         if (mConfig == null) {
             mConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return isAvailable(mConfig) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable(mConfig) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index 15eb8b3..a44b294 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -86,7 +86,7 @@
         if (mConfig == null) {
             mConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 28f9260..564e27a 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -57,7 +57,7 @@
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_automatic_brightness_available)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index 596e2c6..6580b03 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -71,7 +71,7 @@
     @Override
     public int getAvailabilityStatus() {
         return RotationPolicy.isRotationLockToggleVisible(mContext)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index 9634739..7f50d0a 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -50,7 +50,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
index e7b7de2..4ae15f2 100644
--- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
@@ -37,7 +37,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
index 524e7db..f76e730 100644
--- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
@@ -35,7 +35,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
index 4dda8f4..da54d87 100644
--- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
@@ -35,7 +35,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
index 228d271..15dd501 100644
--- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
@@ -31,7 +31,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index b039644..ec7e577 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -35,7 +35,7 @@
     @Override
     public int getAvailabilityStatus() {
         if (!ColorDisplayController.isAvailable(mContext)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         } else if (!mController.isActivated()) {
             return DISABLED_DEPENDENT_SETTING;
         }
diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
index 19eb4bb..91af1ce 100644
--- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
+++ b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
@@ -60,7 +60,7 @@
     @Override
     public int getAvailabilityStatus() {
         if (mFingerprintManager == null || !mFingerprintManager.isHardwareDetected()) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         if (isUserSupported()) {
             return AVAILABLE;
diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
index e8e5ad9..d7bfbc7 100644
--- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
@@ -42,7 +42,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mPowerUsageFeatureProvider.isSmartBatterySupported()
-                ? DISABLED_UNSUPPORTED
+                ? UNSUPPORTED_ON_DEVICE
                 : AVAILABLE;
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
index b5b98c35..01770a2 100644
--- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
@@ -193,14 +193,7 @@
         }
 
         mBatteryStatsHelper = statsHelper;
-        final long lastFullChargeTime = mBatteryUtils.calculateLastFullChargeTime(
-                mBatteryStatsHelper, System.currentTimeMillis());
-        final CharSequence timeSequence = StringUtil.formatRelativeTime(mContext,
-                lastFullChargeTime,
-                false);
-        final int resId = showAllApps ? R.string.power_usage_list_summary_device
-                : R.string.power_usage_list_summary;
-        mAppListGroup.setTitle(TextUtils.expandTemplate(mContext.getText(resId), timeSequence));
+        mAppListGroup.setTitle(R.string.power_usage_list_summary);
 
         final PowerProfile powerProfile = statsHelper.getPowerProfile();
         final BatteryStats stats = statsHelper.getStats();
diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index ca4742d..3075d9b 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -21,9 +21,14 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.PowerManager;
+import android.support.annotation.IntDef;
 import android.support.annotation.VisibleForTesting;
 
 import com.android.settings.Utils;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Use this broadcastReceiver to listen to the battery change, and it will invoke
@@ -43,7 +48,19 @@
      * Battery saver(e.g. off->on)
      */
     public interface OnBatteryChangedListener {
-        void onBatteryChanged();
+        void onBatteryChanged(@BatteryUpdateType int type);
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({BatteryUpdateType.MANUAL,
+            BatteryUpdateType.BATTERY_LEVEL,
+            BatteryUpdateType.BATTERY_SAVER,
+            BatteryUpdateType.BATTERY_STATUS})
+    public @interface BatteryUpdateType {
+        int MANUAL = 0;
+        int BATTERY_LEVEL = 1;
+        int BATTERY_SAVER = 2;
+        int BATTERY_STATUS = 3;
     }
 
     @VisibleForTesting
@@ -85,14 +102,17 @@
                 final String batteryLevel = Utils.getBatteryPercentage(intent);
                 final String batteryStatus = Utils.getBatteryStatus(
                         mContext.getResources(), intent);
-                if (forceUpdate || !batteryLevel.equals(mBatteryLevel) || !batteryStatus.equals(
-                        mBatteryStatus)) {
-                    mBatteryLevel = batteryLevel;
-                    mBatteryStatus = batteryStatus;
-                    mBatteryListener.onBatteryChanged();
+                if (forceUpdate) {
+                    mBatteryListener.onBatteryChanged(BatteryUpdateType.MANUAL);
+                } else if(!batteryLevel.equals(mBatteryLevel)) {
+                    mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_LEVEL);
+                } else if (!batteryStatus.equals(mBatteryStatus)) {
+                    mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_STATUS);
                 }
+                mBatteryLevel = batteryLevel;
+                mBatteryStatus = batteryStatus;
             } else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(intent.getAction())) {
-                mBatteryListener.onBatteryChanged();
+                mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_SAVER);
             }
         }
     }
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 639c1fb..a1f5df2 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -512,37 +512,6 @@
     }
 
     /**
-     * Check if the app represented by {@code uid} has battery usage more than {@code threshold}
-     *
-     * @param batteryStatsHelper used to check the battery usage
-     * @param userManager        used to init the {@code batteryStatsHelper}
-     * @param uid                represent the app
-     * @param threshold          battery percentage threshold(e.g. 10 means 10% battery usage )
-     * @return {@code true} if battery drain is more than the threshold
-     */
-    public boolean isAppHeavilyUsed(BatteryStatsHelper batteryStatsHelper, UserManager userManager,
-            int uid, int threshold) {
-        initBatteryStatsHelper(batteryStatsHelper, null /* bundle */, userManager);
-        final int dischargeAmount = batteryStatsHelper.getStats().getDischargeAmount(
-                BatteryStats.STATS_SINCE_CHARGED);
-        List<BatterySipper> batterySippers = batteryStatsHelper.getUsageList();
-        final double hiddenAmount = removeHiddenBatterySippers(batterySippers);
-
-        for (int i = 0, size = batterySippers.size(); i < size; i++) {
-            final BatterySipper batterySipper = batterySippers.get(i);
-            if (batterySipper.getUid() == uid) {
-                final int percent = (int) calculateBatteryPercent(
-                        batterySipper.totalPowerMah, batteryStatsHelper.getTotalPower(),
-                        hiddenAmount,
-                        dischargeAmount);
-                return percent >= threshold;
-            }
-        }
-
-        return false;
-    }
-
-    /**
      * Return {@code true} if we should hide anomaly app represented by {@code uid}
      */
     public boolean shouldHideAnomaly(PowerWhitelistBackend powerWhitelistBackend, int uid) {
@@ -552,7 +521,7 @@
             return true;
         }
 
-        return isSystemUid(uid) || powerWhitelistBackend.isSysWhitelistedExceptIdle(packageNames)
+        return isSystemUid(uid) || powerWhitelistBackend.isWhitelisted(packageNames)
                 || (isSystemApp(mPackageManager, packageNames) && !hasLauncherEntry(packageNames));
     }
 
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index 9cafbcb..4f70700 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -17,6 +17,7 @@
 package com.android.settings.fuelgauge;
 
 import android.app.AlertDialog;
+import android.app.AppOpsManager;
 import android.app.Dialog;
 import android.app.Fragment;
 import android.content.Context;
@@ -43,12 +44,18 @@
 
     private static final String ARG_DEFAULT_ON = "default_on";
 
-    private final PowerWhitelistBackend mBackend = PowerWhitelistBackend.getInstance();
-
-    private String mPackageName;
+    @VisibleForTesting
+    PowerWhitelistBackend mBackend;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+    @VisibleForTesting
+    String mPackageName;
+    @VisibleForTesting
+    int mPackageUid;
     private CharSequence mLabel;
     private boolean mDefaultOn;
-    private boolean mIsEnabled;
+    @VisibleForTesting
+    boolean mIsEnabled;
     private Checkable mOptionOn;
     private Checkable mOptionOff;
 
@@ -60,8 +67,11 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mBatteryUtils = BatteryUtils.getInstance(getContext());
+        mBackend = PowerWhitelistBackend.getInstance();
 
         mPackageName = getArguments().getString(AppInfoBase.ARG_PACKAGE_NAME);
+        mPackageUid = getArguments().getInt(AppInfoBase.ARG_PACKAGE_UID);
         PackageManager pm = getContext().getPackageManager();
         try {
             mLabel = pm.getApplicationInfo(mPackageName, 0).loadLabel(pm);
@@ -129,6 +139,8 @@
             if (newValue != oldValue) {
                 logSpecialPermissionChange(newValue, mPackageName, getContext());
                 if (newValue) {
+                    mBatteryUtils.setForceAppStandby(mPackageUid, mPackageName,
+                            AppOpsManager.MODE_ALLOWED);
                     mBackend.addApp(mPackageName);
                 } else {
                     mBackend.removeApp(mPackageName);
@@ -165,10 +177,11 @@
                 : R.string.high_power_off);
     }
 
-    public static void show(Fragment caller, String packageName, int requestCode) {
+    public static void show(Fragment caller, int uid, String packageName, int requestCode) {
         HighPowerDetail fragment = new HighPowerDetail();
         Bundle args = new Bundle();
         args.putString(AppInfoBase.ARG_PACKAGE_NAME, packageName);
+        args.putInt(AppInfoBase.ARG_PACKAGE_UID, uid);
         fragment.setArguments(args);
         fragment.setTargetFragment(caller, requestCode);
         fragment.show(caller.getFragmentManager(), HighPowerDetail.class.getSimpleName());
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 327a6c5..6493430 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -13,6 +13,8 @@
  */
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -30,7 +32,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.utils.StringUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -106,7 +107,7 @@
                 mMetricsFeatureProvider.action(getContext(),
                         MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE,
                         mShowAllApps);
-                restartBatteryStatsLoader();
+                restartBatteryStatsLoader(BatteryUpdateType.MANUAL);
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -138,7 +139,7 @@
     }
 
     @Override
-    protected void refreshUi() {
+    protected void refreshUi(@BatteryUpdateType int refreshType) {
         final Context context = getContext();
         if (context == null) {
             return;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index b811f20..58d9d08 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.*;
+
 import android.app.Activity;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -26,18 +28,17 @@
 
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settingslib.utils.AsyncLoader;
 
 /**
  * Common base class for things that need to show the battery usage graph.
  */
-public abstract class PowerUsageBase extends DashboardFragment
-        implements LoaderManager.LoaderCallbacks<BatteryStatsHelper> {
+public abstract class PowerUsageBase extends DashboardFragment {
 
     // +1 to allow ordering for PowerUsageSummary.
     @VisibleForTesting
     static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
     private static final String TAG = "PowerUsageBase";
+    private static final String KEY_REFRESH_TYPE = "refresh_type";
 
     protected BatteryStatsHelper mStatsHelper;
     protected UserManager mUm;
@@ -57,8 +58,8 @@
         setHasOptionsMenu(true);
 
         mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(getContext());
-        mBatteryBroadcastReceiver.setBatteryChangedListener(() -> {
-            restartBatteryStatsLoader();
+        mBatteryBroadcastReceiver.setBatteryChangedListener(type -> {
+            restartBatteryStatsLoader(type);
         });
     }
 
@@ -81,11 +82,14 @@
         mBatteryBroadcastReceiver.unRegister();
     }
 
-    protected void restartBatteryStatsLoader() {
-        getLoaderManager().restartLoader(0, Bundle.EMPTY, this);
+    protected void restartBatteryStatsLoader(int refreshType) {
+        final Bundle bundle = new Bundle();
+        bundle.putInt(KEY_REFRESH_TYPE, refreshType);
+
+        getLoaderManager().restartLoader(0, bundle, new PowerLoaderCallback());
     }
 
-    protected abstract void refreshUi();
+    protected abstract void refreshUi(@BatteryUpdateType int refreshType);
 
     protected void updatePreference(BatteryHistoryPreference historyPref) {
         final long startTime = System.currentTimeMillis();
@@ -93,21 +97,30 @@
         BatteryUtils.logRuntime(TAG, "updatePreference", startTime);
     }
 
-    @Override
-    public Loader<BatteryStatsHelper> onCreateLoader(int id,
-            Bundle args) {
-        return new BatteryStatsHelperLoader(getContext());
-    }
+    /**
+     * {@link android.app.LoaderManager.LoaderCallbacks} for {@link PowerUsageBase} to load
+     * the {@link BatteryStatsHelper}
+     */
+    public class PowerLoaderCallback implements LoaderManager.LoaderCallbacks<BatteryStatsHelper> {
+        private int mRefreshType;
 
-    @Override
-    public void onLoadFinished(Loader<BatteryStatsHelper> loader,
-            BatteryStatsHelper statsHelper) {
-        mStatsHelper = statsHelper;
-        refreshUi();
-    }
+        @Override
+        public Loader<BatteryStatsHelper> onCreateLoader(int id,
+                Bundle args) {
+            mRefreshType = args.getInt(KEY_REFRESH_TYPE);
+            return new BatteryStatsHelperLoader(getContext());
+        }
 
-    @Override
-    public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
+        @Override
+        public void onLoadFinished(Loader<BatteryStatsHelper> loader,
+                BatteryStatsHelper statsHelper) {
+            mStatsHelper = statsHelper;
+            refreshUi(mRefreshType);
+        }
 
+        @Override
+        public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
+
+        }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 0563815..e4f7a72 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
+
 import android.app.Activity;
 import android.app.LoaderManager;
 import android.app.LoaderManager.LoaderCallbacks;
@@ -277,7 +279,7 @@
                 } else {
                     mStatsType = BatteryStats.STATS_SINCE_CHARGED;
                 }
-                refreshUi();
+                refreshUi(BatteryUpdateType.MANUAL);
                 return true;
             case MENU_ADVANCED_BATTERY:
                 new SubSettingLauncher(getContext())
@@ -291,14 +293,15 @@
         }
     }
 
-    protected void refreshUi() {
+    protected void refreshUi(@BatteryUpdateType int refreshType) {
         final Context context = getContext();
         if (context == null) {
             return;
         }
 
-        // Only skip BatteryTipLoader for the first time when device is rotated
-        if (mNeedUpdateBatteryTip) {
+        // Skip BatteryTipLoader if device is rotated or only battery level change
+        if (mNeedUpdateBatteryTip
+                && refreshType != BatteryUpdateType.BATTERY_LEVEL) {
             restartBatteryTipLoader();
         } else {
             mNeedUpdateBatteryTip = true;
@@ -397,8 +400,9 @@
     }
 
     @Override
-    protected void restartBatteryStatsLoader() {
-        restartBatteryStatsLoader(true /* clearHeader */);
+    protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) {
+        super.restartBatteryStatsLoader(refreshType);
+        mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
     }
 
     @Override
@@ -407,13 +411,6 @@
         mBatteryTipPreferenceController.saveInstanceState(outState);
     }
 
-    void restartBatteryStatsLoader(boolean clearHeader) {
-        super.restartBatteryStatsLoader();
-        if (clearHeader) {
-            mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
-        }
-    }
-
     @Override
     public void onBatteryTipHandled(BatteryTip batteryTip) {
         restartBatteryTipLoader();
@@ -428,7 +425,7 @@
             mContext = context;
             mLoader = loader;
             mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
-            mBatteryBroadcastReceiver.setBatteryChangedListener(() -> {
+            mBatteryBroadcastReceiver.setBatteryChangedListener(type -> {
                 BatteryInfo.getBatteryInfo(mContext, new BatteryInfo.Callback() {
                     @Override
                     public void onBatteryInfoLoaded(BatteryInfo info) {
diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
index 23b4067..5a7f4ba 100644
--- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
+++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -122,6 +122,11 @@
         return MetricsProto.MetricsEvent.FUELGAUGE_RESTRICTED_APP_DETAILS;
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_uri_restricted_apps;
+    }
+
     @VisibleForTesting
     void refreshUi() {
         mRestrictedAppListGroup.removeAll();
diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
index e222b91..3e80c35 100644
--- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
@@ -45,7 +45,7 @@
     public int getAvailabilityStatus() {
         return mPowerUsageFeatureProvider.isSmartBatterySupported()
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
index 5e63976..d954e83 100644
--- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java
+++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
@@ -60,6 +60,11 @@
     }
 
     @Override
+    public int getHelpResource() {
+        return R.string.help_uri_smart_battery_settings;
+    }
+
+    @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this);
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index 0e4f9c3..b6bcd54 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -38,6 +38,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.support.annotation.GuardedBy;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.util.Pair;
@@ -65,10 +66,14 @@
     static final int UID_NULL = -1;
     @VisibleForTesting
     static final int STATSD_UID_FILED = 1;
-
     @VisibleForTesting
     static final long MAX_DELAY_MS = TimeUnit.MINUTES.toMillis(30);
 
+    private final Object mLock = new Object();
+    @GuardedBy("mLock")
+    @VisibleForTesting
+    boolean mIsJobCanceled = false;
+
     public static void scheduleAnomalyDetection(Context context, Intent intent) {
         final JobScheduler jobScheduler = context.getSystemService(JobScheduler.class);
         final ComponentName component = new ComponentName(context,
@@ -85,6 +90,9 @@
 
     @Override
     public boolean onStartJob(JobParameters params) {
+        synchronized (mLock) {
+            mIsJobCanceled = false;
+        }
         ThreadUtils.postOnBackgroundThread(() -> {
             final Context context = AnomalyDetectionJobService.this;
             final BatteryDatabaseManager batteryDatabaseManager =
@@ -92,24 +100,21 @@
             final BatteryTipPolicy policy = new BatteryTipPolicy(this);
             final BatteryUtils batteryUtils = BatteryUtils.getInstance(this);
             final ContentResolver contentResolver = getContentResolver();
-            final BatteryStatsHelper batteryStatsHelper = new BatteryStatsHelper(this,
-                    true /* collectBatteryBroadcast */);
             final UserManager userManager = getSystemService(UserManager.class);
             final PowerWhitelistBackend powerWhitelistBackend = PowerWhitelistBackend.getInstance();
             final PowerUsageFeatureProvider powerUsageFeatureProvider = FeatureFactory
                     .getFactory(this).getPowerUsageFeatureProvider(this);
             final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory
                     .getFactory(this).getMetricsFeatureProvider();
-            batteryUtils.initBatteryStatsHelper(batteryStatsHelper, null /* bundle */, userManager);
 
-            for (JobWorkItem item = params.dequeueWork(); item != null;
-                    item = params.dequeueWork()) {
-                saveAnomalyToDatabase(context, batteryStatsHelper, userManager,
+            for (JobWorkItem item = dequeueWork(params); item != null; item = dequeueWork(params)) {
+                saveAnomalyToDatabase(context, userManager,
                         batteryDatabaseManager, batteryUtils, policy, powerWhitelistBackend,
                         contentResolver, powerUsageFeatureProvider, metricsFeatureProvider,
                         item.getIntent().getExtras());
+
+                completeWork(params, item);
             }
-            jobFinished(params, false /* wantsReschedule */);
         });
 
         return true;
@@ -117,12 +122,14 @@
 
     @Override
     public boolean onStopJob(JobParameters jobParameters) {
-        return false;
+        synchronized (mLock) {
+            mIsJobCanceled = true;
+        }
+        return true; // Need to reschedule
     }
 
     @VisibleForTesting
-    void saveAnomalyToDatabase(Context context, BatteryStatsHelper batteryStatsHelper,
-            UserManager userManager,
+    void saveAnomalyToDatabase(Context context, UserManager userManager,
             BatteryDatabaseManager databaseManager, BatteryUtils batteryUtils,
             BatteryTipPolicy policy, PowerWhitelistBackend powerWhitelistBackend,
             ContentResolver contentResolver, PowerUsageFeatureProvider powerUsageFeatureProvider,
@@ -136,7 +143,6 @@
                 StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES);
         final AnomalyInfo anomalyInfo = new AnomalyInfo(
                 !ArrayUtils.isEmpty(cookies) ? cookies.get(0) : "");
-        final PackageManager packageManager = context.getPackageManager();
         Log.i(TAG, "Extra stats value: " + intentDimsValue.toString());
 
         try {
@@ -151,9 +157,7 @@
 
             final boolean anomalyDetected;
             if (isExcessiveBackgroundAnomaly(anomalyInfo)) {
-                anomalyDetected = batteryUtils.isPreOApp(packageName)
-                        && batteryUtils.isAppHeavilyUsed(batteryStatsHelper, userManager, uid,
-                        policy.excessiveBgDrainPercentage);
+                anomalyDetected = batteryUtils.isPreOApp(packageName);
             } else {
                 anomalyDetected = true;
             }
@@ -229,4 +233,26 @@
         return anomalyInfo.anomalyType
                 == StatsManagerConfig.AnomalyType.EXCESSIVE_BACKGROUND_SERVICE;
     }
+
+    @VisibleForTesting
+    JobWorkItem dequeueWork(JobParameters parameters) {
+        synchronized (mLock) {
+            if (mIsJobCanceled) {
+                return null;
+            }
+
+            return parameters.dequeueWork();
+        }
+    }
+
+    @VisibleForTesting
+    void completeWork(JobParameters parameters, JobWorkItem item) {
+        synchronized (mLock) {
+            if (mIsJobCanceled) {
+                return;
+            }
+
+            parameters.completeWork(item);
+        }
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
index 74c65f9..3870e72 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
@@ -79,16 +79,8 @@
 
         switch (mBatteryTip.getType()) {
             case BatteryTip.TipType.SUMMARY:
-                final long averageTimeMs = ((SummaryTip) mBatteryTip).getAverageTimeMs();
-                final String message = context.getString(
-                        averageTimeMs == Estimate.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN
-                                ? R.string.battery_tip_dialog_summary_message_no_estimation
-                                : R.string.battery_tip_dialog_summary_message,
-                        StringUtil.formatElapsedTime(context, averageTimeMs,
-                                false /* withSeconds */));
-
                 return new AlertDialog.Builder(context)
-                        .setMessage(message)
+                        .setMessage(R.string.battery_tip_dialog_summary_message)
                         .setPositiveButton(android.R.string.ok, null)
                         .create();
             case BatteryTip.TipType.HIGH_DEVICE_USAGE:
@@ -102,10 +94,7 @@
 
                 return new AlertDialog.Builder(context)
                         .setMessage(getString(R.string.battery_tip_dialog_message,
-                                highUsageTip.getHighUsageAppList().size(),
-                                StringUtil.formatRelativeTime(context,
-                                        highUsageTip.getLastFullChargeTimeMs(),
-                                        false /* withSeconds */)))
+                                highUsageTip.getHighUsageAppList().size()))
                         .setView(view)
                         .setPositiveButton(android.R.string.ok, null)
                         .create();
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
index b9194b4..fc2bbdf 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
@@ -67,7 +67,7 @@
         final BatteryInfo batteryInfo = mBatteryUtils.getBatteryInfo(mBatteryStatsHelper, TAG);
         final Context context = getContext();
 
-        tips.add(new LowBatteryDetector(policy, batteryInfo).detect());
+        tips.add(new LowBatteryDetector(context, policy, batteryInfo).detect());
         tips.add(new HighUsageDetector(context, policy, mBatteryStatsHelper,
                 batteryInfo.discharging).detect());
         tips.add(new SmartBatteryDetector(policy, context.getContentResolver()).detect());
@@ -87,7 +87,8 @@
         final List<BatteryTip> tips = new ArrayList<>();
         tips.add(new SummaryTip(BatteryTip.StateType.NEW,
                 Estimate.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN));
-        tips.add(new LowBatteryTip(BatteryTip.StateType.NEW));
+        tips.add(new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */,
+                "Fake data"));
 
         return tips;
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
index 5520bf3..7743372 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
@@ -50,6 +50,7 @@
     private static final String KEY_TEST_BATTERY_SAVER_TIP = "test_battery_saver_tip";
     private static final String KEY_TEST_HIGH_USAGE_TIP = "test_high_usage_tip";
     private static final String KEY_TEST_SMART_BATTERY_TIP = "test_smart_battery_tip";
+    private static final String KEY_TEST_LOW_BATTERY_TIP = "test_low_battery_tip";
 
     /**
      * {@code true} if general battery tip is enabled
@@ -192,6 +193,14 @@
      */
     public final boolean testSmartBatteryTip;
 
+    /**
+     * {@code true} if we want to test low battery tip.
+     *
+     * @see Settings.Global#BATTERY_TIP_CONSTANTS
+     * @see #KEY_TEST_LOW_BATTERY_TIP
+     */
+    public final boolean testLowBatteryTip;
+
     private final KeyValueListParser mParser;
 
     public BatteryTipPolicy(Context context) {
@@ -221,14 +230,15 @@
         appRestrictionEnabled = mParser.getBoolean(KEY_APP_RESTRICTION_ENABLED, true);
         reducedBatteryEnabled = mParser.getBoolean(KEY_REDUCED_BATTERY_ENABLED, false);
         reducedBatteryPercent = mParser.getInt(KEY_REDUCED_BATTERY_PERCENT, 50);
-        lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, false);
-        lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 16);
+        lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, true);
+        lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 3);
         dataHistoryRetainDay = mParser.getInt(KEY_DATA_HISTORY_RETAIN_DAY, 30);
         excessiveBgDrainPercentage = mParser.getInt(KEY_EXCESSIVE_BG_DRAIN_PERCENTAGE, 10);
 
         testBatterySaverTip = mParser.getBoolean(KEY_TEST_BATTERY_SAVER_TIP, false);
         testHighUsageTip = mParser.getBoolean(KEY_TEST_HIGH_USAGE_TIP, false);
         testSmartBatteryTip = mParser.getBoolean(KEY_TEST_SMART_BATTERY_TIP, false);
+        testLowBatteryTip = mParser.getBoolean(KEY_TEST_LOW_BATTERY_TIP, false);
     }
 
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index be25518..9e64c71 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -94,6 +94,7 @@
             case BatteryTip.TipType.SMART_BATTERY_MANAGER:
                 return new SmartBatteryAction(settingsActivity, fragment);
             case BatteryTip.TipType.BATTERY_SAVER:
+            case BatteryTip.TipType.LOW_BATTERY:
                 if (batteryTip.getState() == BatteryTip.StateType.HANDLED) {
                     return new OpenBatterySaverAction(settingsActivity);
                 } else {
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java
index 2a6302e..c3f9b07 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java
@@ -16,31 +16,52 @@
 
 package com.android.settings.fuelgauge.batterytip.detectors;
 
-import android.text.format.DateUtils;
+import android.content.Context;
+import android.os.PowerManager;
 
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Detect whether the battery is too low
  */
 public class LowBatteryDetector implements BatteryTipDetector {
     private BatteryInfo mBatteryInfo;
     private BatteryTipPolicy mPolicy;
+    private PowerManager mPowerManager;
+    private int mWarningLevel;
 
-    public LowBatteryDetector(BatteryTipPolicy policy, BatteryInfo batteryInfo) {
+    public LowBatteryDetector(Context context, BatteryTipPolicy policy, BatteryInfo batteryInfo) {
         mPolicy = policy;
         mBatteryInfo = batteryInfo;
+        mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        mWarningLevel = context.getResources().getInteger(
+                com.android.internal.R.integer.config_lowBatteryWarningLevel);
     }
 
     @Override
     public BatteryTip detect() {
-        // Show it if battery life is less than mPolicy.lowBatteryHour
-        final boolean isShown = mPolicy.lowBatteryEnabled && mBatteryInfo.discharging
-                && mBatteryInfo.remainingTimeUs < mPolicy.lowBatteryHour * DateUtils.HOUR_IN_MILLIS;
+        final boolean powerSaveModeOn = mPowerManager.isPowerSaveMode();
+        final boolean lowBattery = mBatteryInfo.batteryLevel <= mWarningLevel
+                || (mBatteryInfo.discharging
+                && mBatteryInfo.remainingTimeUs < TimeUnit.HOURS.toMicros(mPolicy.lowBatteryHour));
+
+        int state = BatteryTip.StateType.INVISIBLE;
+        if (mPolicy.lowBatteryEnabled) {
+            if (powerSaveModeOn) {
+                // Show it is handled if battery saver is on
+                state = BatteryTip.StateType.HANDLED;
+            } else if (mPolicy.testLowBatteryTip || (mBatteryInfo.discharging && lowBattery)) {
+                // Show it is new if in test or in discharging low battery state
+                state = BatteryTip.StateType.NEW;
+            }
+        }
+
         return new LowBatteryTip(
-                isShown ? BatteryTip.StateType.NEW : BatteryTip.StateType.INVISIBLE);
+                state, powerSaveModeOn, mBatteryInfo.remainingLabel);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index f02dd72..2afdc81 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -74,10 +74,10 @@
         TIP_ORDER.append(TipType.APP_RESTRICTION, 0);
         TIP_ORDER.append(TipType.BATTERY_SAVER, 1);
         TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 2);
-        TIP_ORDER.append(TipType.SUMMARY, 3);
-        TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 4);
-        TIP_ORDER.append(TipType.REDUCED_BATTERY, 5);
-        TIP_ORDER.append(TipType.LOW_BATTERY, 6);
+        TIP_ORDER.append(TipType.LOW_BATTERY, 3);
+        TIP_ORDER.append(TipType.SUMMARY, 4);
+        TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 5);
+        TIP_ORDER.append(TipType.REDUCED_BATTERY, 6);
         TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 7);
     }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
index 86237dd..b48a7dd 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTip.java
@@ -25,36 +25,32 @@
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
- * Tip to show current battery life is short
+ * Tip to show current battery level is low or remaining time is less than a certain period
  */
-public class LowBatteryTip extends BatteryTip {
+public class LowBatteryTip extends EarlyWarningTip {
+    private CharSequence mSummary;
 
-    public LowBatteryTip(@StateType int state) {
-        super(TipType.LOW_BATTERY, state, false /* showDialog */);
+    public LowBatteryTip(@StateType int state, boolean powerSaveModeOn, CharSequence summary) {
+        super(state, powerSaveModeOn);
+        mType = TipType.LOW_BATTERY;
+        mSummary = summary;
     }
 
-    private LowBatteryTip(Parcel in) {
+    public LowBatteryTip(Parcel in) {
         super(in);
-    }
-
-    @Override
-    public CharSequence getTitle(Context context) {
-        return context.getString(R.string.battery_tip_low_battery_title);
+        mSummary = in.readCharSequence();
     }
 
     @Override
     public CharSequence getSummary(Context context) {
-        return context.getString(R.string.battery_tip_low_battery_summary);
+        return mState == StateType.HANDLED ? context.getString(
+                R.string.battery_tip_early_heads_up_done_summary) : mSummary;
     }
 
     @Override
-    public int getIconId() {
-        return R.drawable.ic_perm_device_information_red_24dp;
-    }
-
-    @Override
-    public void updateState(BatteryTip tip) {
-        mState = tip.mState;
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeCharSequence(mSummary);
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
index fd94f9f..8a8e099 100644
--- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
@@ -63,7 +63,7 @@
     public int getAvailabilityStatus() {
         final boolean isAvailable = mAssistOnly ? mFeatureProvider.isSupported(mContext)
                 : mFeatureProvider.isSensorAvailable(mContext);
-        return isAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
index aebda18..c400cbd 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
@@ -58,7 +58,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index 00fb956..94ef978 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -74,7 +74,7 @@
         if (mAmbientConfig == null) {
             mAmbientConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return mAmbientConfig.pulseOnDoubleTapAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return mAmbientConfig.pulseOnDoubleTapAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index f819508..2dd8635 100644
--- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -68,7 +68,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index 1eb188a..0e00abb 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -51,7 +51,7 @@
         for (AbstractPreferenceController controller : mGestureControllers) {
             isAvailable = isAvailable || controller.isAvailable();
         }
-        return isAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     /**
diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index 46318f5..d50df19 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -68,7 +68,7 @@
         if (mAmbientConfig == null) {
             mAmbientConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return mAmbientConfig.pulseOnPickupAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return mAmbientConfig.pulseOnPickupAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java
index 493755f..66aef60 100644
--- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java
+++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java
@@ -61,7 +61,7 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_volumeHushGestureEnabled)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
index d755d72..bb6a26d 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
@@ -56,7 +56,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/SwipeUpPreferenceController.java b/src/com/android/settings/gestures/SwipeUpPreferenceController.java
index c3abd46..27c7241 100644
--- a/src/com/android/settings/gestures/SwipeUpPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeUpPreferenceController.java
@@ -19,17 +19,12 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
 
 public class SwipeUpPreferenceController extends GesturePreferenceController {
 
@@ -46,6 +41,10 @@
     }
 
     static boolean isGestureAvailable(Context context) {
+        if (!context.getResources().getBoolean(R.bool.config_swipe_up_gesture_setting_available)) {
+            return false;
+        }
+
         final ComponentName recentsComponentName = ComponentName.unflattenFromString(
                 context.getString(com.android.internal.R.string.config_recentsComponentName));
         final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
@@ -59,7 +58,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -81,8 +80,10 @@
 
     @Override
     public boolean isChecked() {
+        final int defaultValue = mContext.getResources()
+                .getBoolean(com.android.internal.R.bool.config_swipe_up_gesture_default) ? ON : OFF;
         final int swipeUpEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.SWIPE_UP_TO_SWITCH_APPS_ENABLED, OFF);
+                Settings.Secure.SWIPE_UP_TO_SWITCH_APPS_ENABLED, defaultValue);
         return swipeUpEnabled != OFF;
     }
 }
diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index 85aef63..4fc29ec 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -64,7 +64,7 @@
     public int getAvailabilityStatus() {
         // If device explicitly wants to hide this, return early.
         if (!mContext.getResources().getBoolean(R.bool.config_show_vibrate_input_devices)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
 
         final int[] devices = mIm.getInputDeviceIds();
@@ -74,7 +74,7 @@
                 return AVAILABLE;
             }
         }
-        return DISABLED_UNSUPPORTED;
+        return CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java
index 857751c..c7275e1 100644
--- a/src/com/android/settings/language/PointerSpeedController.java
+++ b/src/com/android/settings/language/PointerSpeedController.java
@@ -36,6 +36,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_pointer_speed)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java
index ec487e4..6c63010 100644
--- a/src/com/android/settings/location/LocationScanningPreferenceController.java
+++ b/src/com/android/settings/location/LocationScanningPreferenceController.java
@@ -36,6 +36,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 56c305d..b6246e3 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -93,7 +93,7 @@
     @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 178aa27..969cb11 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -156,16 +156,18 @@
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        final Context context = getContext();
-        if (mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) {
-            // Only clickable if hostname is valid, so we could save it safely
-            Settings.Global.putString(context.getContentResolver(), HOSTNAME_KEY,
-                    mEditText.getText().toString());
-        }
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            final Context context = getContext();
+            if (mMode.equals(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME)) {
+                // Only clickable if hostname is valid, so we could save it safely
+                Settings.Global.putString(context.getContentResolver(), HOSTNAME_KEY,
+                        mEditText.getText().toString());
+            }
 
-        FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
-                MetricsProto.MetricsEvent.ACTION_PRIVATE_DNS_MODE, mMode);
-        Settings.Global.putString(context.getContentResolver(), MODE_KEY, mMode);
+            FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
+                    MetricsProto.MetricsEvent.ACTION_PRIVATE_DNS_MODE, mMode);
+            Settings.Global.putString(context.getContentResolver(), MODE_KEY, mMode);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
index 0900e3c..3c238aa 100644
--- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 
 public class AlarmVolumePreferenceController extends
@@ -34,7 +33,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_alarm_volume)
-                && !mHelper.isSingleVolume() ? AVAILABLE : DISABLED_UNSUPPORTED;
+                && !mHelper.isSingleVolume() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index 37e3db0..260a415 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -84,7 +84,7 @@
     public int getAvailabilityStatus() {
         return mContext.getResources()
                 .getBoolean(com.android.internal.R.bool.config_notificationBadging)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/notification/CallVolumePreferenceController.java b/src/com/android/settings/notification/CallVolumePreferenceController.java
new file mode 100644
index 0000000..c0e1633
--- /dev/null
+++ b/src/com/android/settings/notification/CallVolumePreferenceController.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+import com.android.settings.R;
+
+
+public class CallVolumePreferenceController extends VolumeSeekBarPreferenceController {
+
+    private AudioManager mAudioManager;
+
+    public CallVolumePreferenceController(Context context, String key) {
+        super(context, key);
+        mAudioManager = context.getSystemService(AudioManager.class);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_call_volume)
+                && !mHelper.isSingleVolume() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public int getAudioStream() {
+        if (mAudioManager.isBluetoothScoOn()) {
+            return AudioManager.STREAM_BLUETOOTH_SCO;
+        }
+        return AudioManager.STREAM_VOICE_CALL;
+    }
+
+    @Override
+    public int getMuteIcon() {
+        // User will not be allowed to fully mute the call volume, use original
+        // icon for mute icon.
+        return R.drawable.ic_local_phone_24_lib;
+    }
+
+}
diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java
index 8f0a7f9..f3bffe0 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -18,9 +18,8 @@
 
 import android.content.Context;
 import android.media.AudioManager;
-import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+
 import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class MediaVolumePreferenceController extends
     VolumeSeekBarPreferenceController {
@@ -35,7 +34,7 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_media_volume)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index 8e7171d..c3c8793 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -36,7 +35,7 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_notification_volume)
                 && !Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java
index e74b110..c4c71c4 100644
--- a/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -17,7 +17,6 @@
 package com.android.settings.notification;
 
 import android.app.NotificationManager;
-import android.arch.lifecycle.LifecycleObserver;
 import android.arch.lifecycle.OnLifecycleEvent;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -30,7 +29,6 @@
 import android.os.Message;
 import android.os.Vibrator;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -48,6 +46,8 @@
     private final RingReceiver mReceiver = new RingReceiver();
     private final H mHandler = new H();
 
+    private int mMuteIcon;
+
     public RingVolumePreferenceController(Context context) {
         this(context, KEY_RING_VOLUME);
     }
@@ -85,7 +85,7 @@
     @Override
     public int getAvailabilityStatus() {
         return Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -95,7 +95,7 @@
 
     @Override
     public int getMuteIcon() {
-        return R.drawable.ic_volume_ringer_vibrate;
+        return mMuteIcon;
     }
 
     private void updateRingerMode() {
@@ -105,11 +105,6 @@
         updatePreferenceIcon();
     }
 
-    private boolean wasRingerModeVibrate() {
-        return mVibrator != null && mRingerMode == AudioManager.RINGER_MODE_SILENT
-            && mHelper.getLastAudibleStreamVolume(getAudioStream()) == 0;
-    }
-
     private void updateEffectsSuppressor() {
         final ComponentName suppressor = NotificationManager.from(mContext).getEffectsSuppressor();
         if (Objects.equals(suppressor, mSuppressor)) return;
@@ -123,10 +118,15 @@
 
     private void updatePreferenceIcon() {
         if (mPreference != null) {
-            mPreference.showIcon(
-                    mRingerMode == AudioManager.RINGER_MODE_VIBRATE || wasRingerModeVibrate()
-                            ? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate
-                            : com.android.internal.R.drawable.ic_audio_ring_notif);
+            if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {
+                mMuteIcon = R.drawable.ic_volume_ringer_vibrate;
+                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
+            } else if (mRingerMode == AudioManager.RINGER_MODE_SILENT) {
+                mMuteIcon = R.drawable.ic_notifications_off_24dp;
+                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_mute);
+            } else {
+                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif);
+            }
         }
     }
 
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index dbf8ecf..3ba71a1 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -151,6 +151,7 @@
         volumeControllers.add(use(MediaVolumePreferenceController.class));
         volumeControllers.add(use(RingVolumePreferenceController.class));
         volumeControllers.add(use(NotificationVolumePreferenceController.class));
+        volumeControllers.add(use(CallVolumePreferenceController.class));
 
         for (VolumeSeekBarPreferenceController controller : volumeControllers) {
             controller.setCallback(mVolumeCallback);
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index d7b5e52..b94d494 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -83,7 +83,9 @@
     public void setStream(int stream) {
         mStream = stream;
         setMax(mAudioManager.getStreamMaxVolume(mStream));
-        setMin(mAudioManager.getStreamMinVolume(mStream));
+        // Use getStreamMinVolumeInt for non-public stream type
+        // eg: AudioManager.STREAM_BLUETOOTH_SCO
+        setMin(mAudioManager.getStreamMinVolumeInt(mStream));
         setProgress(mAudioManager.getStreamVolume(mStream));
     }
 
@@ -108,10 +110,6 @@
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
-        if (mStream == 0) {
-            Log.w(TAG, "No stream found, not binding volumizer");
-            return;
-        }
         mSeekBar = (SeekBar) view.findViewById(com.android.internal.R.id.seekbar);
         mIconView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
         mSuppressionTextView = (TextView) view.findViewById(R.id.suppression_text);
diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java
index 3c6a026..9e2b650 100644
--- a/src/com/android/settings/notification/ZenModeBackend.java
+++ b/src/com/android/settings/notification/ZenModeBackend.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.notification;
 
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
+import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
+
 import android.app.ActivityManager;
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;
@@ -132,6 +135,9 @@
     }
 
     protected void saveVisualEffectsPolicy(int category, boolean suppress) {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.ZEN_SETTINGS_UPDATED, 1);
+
         int suppressedEffects = getNewSuppressedEffects(suppress, category);
         savePolicy(mPolicy.priorityCategories, mPolicy.priorityCallSenders,
                 mPolicy.priorityMessageSenders, suppressedEffects);
@@ -146,19 +152,24 @@
     protected void savePolicy(int priorityCategories, int priorityCallSenders,
             int priorityMessageSenders, int suppressedVisualEffects) {
         mPolicy = new NotificationManager.Policy(priorityCategories, priorityCallSenders,
-                priorityMessageSenders,
-                suppressedVisualEffects);
+                priorityMessageSenders, suppressedVisualEffects);
         mNotificationManager.setNotificationPolicy(mPolicy);
     }
 
-    protected int getNewSuppressedEffects(boolean suppress, int effectType) {
+    private int getNewSuppressedEffects(boolean suppress, int effectType) {
         int effects = mPolicy.suppressedVisualEffects;
+
         if (suppress) {
             effects |= effectType;
         } else {
             effects &= ~effectType;
         }
-        return effects;
+
+        return clearDeprecatedEffects(effects);
+    }
+
+    private int clearDeprecatedEffects(int effects) {
+        return effects & ~(SUPPRESSED_EFFECT_SCREEN_ON | SUPPRESSED_EFFECT_SCREEN_OFF);
     }
 
     protected boolean isEffectAllowed(int effect) {
diff --git a/src/com/android/settings/notification/ZenModeCallsSettings.java b/src/com/android/settings/notification/ZenModeCallsSettings.java
index 20396b5..cd56d7b 100644
--- a/src/com/android/settings/notification/ZenModeCallsSettings.java
+++ b/src/com/android/settings/notification/ZenModeCallsSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.notification;
 
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
+
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
@@ -40,8 +42,8 @@
             Lifecycle lifecycle) {
         List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new ZenModeCallsPreferenceController(context, lifecycle));
-        // TODO: is a controller needed for a pref that just launches an external activity?
-        // or can the contacts app insert this setting themselves?
+        controllers.add(new ZenModeStarredContactsPreferenceController(context, lifecycle,
+                PRIORITY_CATEGORY_CALLS));
         controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle,
                 context.getResources().getInteger(com.android.internal.R.integer
                 .config_zen_repeat_callers_threshold)));
diff --git a/src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java b/src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java
index c2508e3..95b9f7e 100644
--- a/src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java
+++ b/src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.notification;
 
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
+
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
@@ -42,6 +44,8 @@
         controllers.add(new ZenModeEventsPreferenceController(context, lifecycle));
         controllers.add(new ZenModeRemindersPreferenceController(context, lifecycle));
         controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle));
+        controllers.add(new ZenModeStarredContactsPreferenceController(context, lifecycle,
+                PRIORITY_CATEGORY_MESSAGES));
         controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle,
                 R.string.zen_msg_event_reminder_footer));
         return controllers;
diff --git a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
index 307dfcf..8d0cd0e 100644
--- a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
+++ b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
@@ -16,22 +16,15 @@
 
 package com.android.settings.notification;
 
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_SHOW_CUSTOM;
-
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.SearchIndexableResource;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.FooterPreference;
 
@@ -40,68 +33,21 @@
 
 public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase implements Indexable {
 
-    protected static final int APP_MENU_SHOW_CUSTOM = 1;
-    protected boolean mShowMenuSelected;
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.add(0, APP_MENU_SHOW_CUSTOM, 0, R.string.zen_mode_restrict_notifications_enable_custom)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() == APP_MENU_SHOW_CUSTOM) {
-            final FeatureFactory featureFactory = FeatureFactory.getFactory(mContext);
-            MetricsFeatureProvider metrics = featureFactory.getMetricsFeatureProvider();
-
-            mShowMenuSelected = !mShowMenuSelected;
-
-            ZenModeVisEffectsCustomPreferenceController custom =
-                    use(ZenModeVisEffectsCustomPreferenceController.class);
-            custom.setShownByMenu(mShowMenuSelected);
-            custom.displayPreference(getPreferenceScreen());
-
-            if (mShowMenuSelected) {
-                custom.select();
-                metrics.action(mContext, ACTION_ZEN_SHOW_CUSTOM, true);
-            } else {
-                metrics.action(mContext, ACTION_ZEN_SHOW_CUSTOM, false);
-            }
-
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        if (mShowMenuSelected) {
-            menu.findItem(APP_MENU_SHOW_CUSTOM)
-                    .setTitle(R.string.zen_mode_restrict_notifications_disable_custom);
-        } else {
-            menu.findItem(APP_MENU_SHOW_CUSTOM)
-                    .setTitle(R.string.zen_mode_restrict_notifications_enable_custom);
-        }
-
-        if (mShowMenuSelected && use(ZenModeVisEffectsCustomPreferenceController.class)
-                .areCustomOptionsSelected()) {
-            menu.findItem(APP_MENU_SHOW_CUSTOM).setEnabled(false);
-        } else {
-            menu.findItem(APP_MENU_SHOW_CUSTOM).setEnabled(true);
-        }
-    }
-
-    @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_uri_interruptions;
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
         List<AbstractPreferenceController> controllers = new ArrayList<>();
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index ec0f619..62b3fe5 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -30,6 +30,7 @@
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
 import android.content.Context;
+import android.icu.text.ListFormatter;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
@@ -166,17 +167,20 @@
                 return mContext.getString(R.string.join_two_items, enabledCategories.get(0),
                         enabledCategories.get(1).toLowerCase());
             } else if (numCategories == 3){
-                String secondaryText = mContext.getString(R.string.join_two_unrelated_items,
-                        enabledCategories.get(0), enabledCategories.get(1).toLowerCase());
-                return mContext.getString(R.string.join_many_items_last, secondaryText,
-                        enabledCategories.get(2).toLowerCase());
+                final List<String> summaries = new ArrayList<>();
+                summaries.add(enabledCategories.get(0));
+                summaries.add(enabledCategories.get(1).toLowerCase());
+                summaries.add(enabledCategories.get(2).toLowerCase());
+
+                return ListFormatter.getInstance().format(summaries);
             } else {
-                String secondaryText = mContext.getString(R.string.join_many_items_middle,
-                        enabledCategories.get(0), enabledCategories.get(1).toLowerCase());
-                secondaryText = mContext.getString(R.string.join_many_items_middle, secondaryText,
-                        enabledCategories.get(2).toLowerCase());
-                return mContext.getString(R.string.join_many_items_last, secondaryText,
-                        mContext.getString(R.string.zen_mode_other_options));
+                final List<String> summaries = new ArrayList<>();
+                summaries.add(enabledCategories.get(0));
+                summaries.add(enabledCategories.get(1).toLowerCase());
+                summaries.add(enabledCategories.get(2).toLowerCase());
+                summaries.add(mContext.getString(R.string.zen_mode_other_options));
+
+                return ListFormatter.getInstance().format(summaries);
             }
         }
 
diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
new file mode 100644
index 0000000..1b8a3d5
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
+import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.icu.text.ListFormatter;
+import android.provider.Contacts;
+import android.provider.ContactsContract;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ZenModeStarredContactsPreferenceController extends
+        AbstractZenModePreferenceController implements Preference.OnPreferenceClickListener {
+
+    protected static final String KEY = "zen_mode_starred_contacts";
+    private Preference mPreference;
+    private final int mPriorityCategory;
+    private final PackageManager mPackageManager;
+
+    @VisibleForTesting
+    Intent mStarredContactsIntent;
+    @VisibleForTesting
+    Intent mFallbackIntent;
+
+    public ZenModeStarredContactsPreferenceController(Context context, Lifecycle lifecycle, int
+            priorityCategory) {
+        super(context, KEY, lifecycle);
+        mPriorityCategory = priorityCategory;
+        mPackageManager = mContext.getPackageManager();
+
+        mStarredContactsIntent = new Intent(Contacts.Intents.UI.LIST_STARRED_ACTION);
+
+        mFallbackIntent =  new Intent(Intent.ACTION_MAIN);
+        mFallbackIntent.addCategory(Intent.CATEGORY_APP_CONTACTS);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(KEY);
+        mPreference.setOnPreferenceClickListener(this);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mPriorityCategory == PRIORITY_CATEGORY_CALLS) {
+            return mBackend.isPriorityCategoryEnabled(PRIORITY_CATEGORY_CALLS)
+                    && mBackend.getPriorityCallSenders() == PRIORITY_SENDERS_STARRED
+                    && isIntentValid();
+        } else if (mPriorityCategory == PRIORITY_CATEGORY_MESSAGES) {
+            return mBackend.isPriorityCategoryEnabled(PRIORITY_CATEGORY_MESSAGES)
+                    && mBackend.getPriorityMessageSenders() == PRIORITY_SENDERS_STARRED
+                    && isIntentValid();
+        } else {
+            // invalid category
+            return false;
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        List<String> starredContacts = getStarredContacts();
+        int numStarredContacts = starredContacts.size();
+
+        List<String> displayContacts = new ArrayList<>();
+
+        if (numStarredContacts == 0) {
+            displayContacts.add(mContext.getString(R.string.zen_mode_from_none));
+        } else {
+            for (int i = 0; i < 2 && i < numStarredContacts; i++) {
+                displayContacts.add(starredContacts.get(i));
+            }
+
+            if (numStarredContacts == 3) {
+                displayContacts.add(starredContacts.get(2));
+            } else if (numStarredContacts > 2) {
+                displayContacts.add(mContext.getResources().getQuantityString(
+                        R.plurals.zen_mode_starred_contacts_summary_additional_contacts,
+                        numStarredContacts - 2, numStarredContacts - 2));
+            }
+        }
+
+        mPreference.setSummary(ListFormatter.getInstance().format(displayContacts));
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (mStarredContactsIntent.resolveActivity(mPackageManager) != null) {
+            mContext.startActivity(mStarredContactsIntent);
+        } else {
+            mContext.startActivity(mFallbackIntent);
+        }
+        return true;
+    }
+
+    private List<String> getStarredContacts() {
+        List<String> starredContacts = new ArrayList<>();
+
+        Cursor cursor = mContext.getContentResolver().query(ContactsContract.Contacts.CONTENT_URI,
+                new String[]{ContactsContract.Contacts.DISPLAY_NAME_PRIMARY},
+                ContactsContract.Data.STARRED + "=1", null,
+                ContactsContract.Data.TIMES_CONTACTED);
+
+        if (cursor.moveToFirst()) {
+            do {
+                starredContacts.add(cursor.getString(0));
+            } while (cursor.moveToNext());
+        }
+        return starredContacts;
+    }
+
+    private boolean isIntentValid() {
+        return mStarredContactsIntent.resolveActivity(mPackageManager) != null
+                || mFallbackIntent.resolveActivity(mPackageManager) != null;
+    }
+}
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
index fd235e6..0a7f726 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
@@ -19,7 +19,6 @@
 import android.app.NotificationManager.Policy;
 import android.content.Context;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
@@ -29,7 +28,6 @@
 public class ZenModeVisEffectsCustomPreferenceController
         extends AbstractZenModePreferenceController {
 
-    protected boolean mShowMenuSelected;
     protected static final int INTERRUPTIVE_EFFECTS = Policy.SUPPRESSED_EFFECT_AMBIENT
             | Policy.SUPPRESSED_EFFECT_PEEK
             | Policy.SUPPRESSED_EFFECT_LIGHTS
@@ -42,11 +40,7 @@
 
     @Override
     public boolean isAvailable() {
-        if (mShowMenuSelected) {
-            return true;
-        }
-
-        return areCustomOptionsSelected();
+        return true;
     }
 
     @Override
@@ -57,22 +51,14 @@
         pref.setChecked(areCustomOptionsSelected());
 
         pref.setOnGearClickListener(p -> {
-            new SubSettingLauncher(mContext)
-                    .setDestination(ZenModeBlockedEffectsSettings.class.getName())
-                    .setTitle(R.string.zen_mode_what_to_block_title)
-                    .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_ZEN_NOTIFICATIONS)
-                    .launch();
+            launchCustomSettings();
         });
 
         pref.setOnRadioButtonClickListener(p -> {
-            select();
+            launchCustomSettings();
         });
     }
 
-    protected void setShownByMenu(boolean shown) {
-        mShowMenuSelected = shown;
-    }
-
     protected boolean areCustomOptionsSelected() {
         boolean allEffectsSuppressed =
                 Policy.areAllVisualEffectsSuppressed(mBackend.mPolicy.suppressedVisualEffects);
@@ -84,9 +70,14 @@
     protected void select() {
         mMetricsFeatureProvider.action(mContext,
                 MetricsProto.MetricsEvent.ACTION_ZEN_CUSTOM, true);
-        mBackend.savePolicy(mBackend.mPolicy.priorityCategories,
-                mBackend.mPolicy.priorityCallSenders,
-                mBackend.mPolicy.priorityMessageSenders,
-                INTERRUPTIVE_EFFECTS);
+    }
+
+    private void launchCustomSettings() {
+        select();
+        new SubSettingLauncher(mContext)
+                .setDestination(ZenModeBlockedEffectsSettings.class.getName())
+                .setTitle(R.string.zen_mode_what_to_block_title)
+                .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_ZEN_NOTIFICATIONS)
+                .launch();
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/notification/ZenOnboardingActivity.java b/src/com/android/settings/notification/ZenOnboardingActivity.java
index 9d71f54..fca1a6c 100644
--- a/src/com/android/settings/notification/ZenOnboardingActivity.java
+++ b/src/com/android/settings/notification/ZenOnboardingActivity.java
@@ -19,16 +19,38 @@
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
+import android.provider.Settings;
+import android.text.format.DateUtils;
+import android.util.Log;
 import android.view.View;
+import android.widget.RadioButton;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
 
 public class ZenOnboardingActivity extends Activity {
 
+    private static final String TAG = "ZenOnboardingActivity";
+
+    @VisibleForTesting
+    static final String PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME =
+            "pref_zen_suggestion_first_display_time_ms";
+    @VisibleForTesting
+    static final long ALWAYS_SHOW_THRESHOLD = DateUtils.DAY_IN_MILLIS * 14;
+
+    View mNewSetting;
+    View mKeepCurrentSetting;
+    RadioButton mNewSettingButton;
+    RadioButton mKeepCurrentSettingButton;
+
     private NotificationManager mNm;
     private MetricsLogger mMetrics;
 
@@ -38,6 +60,10 @@
         setNotificationManager(getSystemService(NotificationManager.class));
         setMetricsLogger(new MetricsLogger());
 
+        Context context = getApplicationContext();
+        Settings.Global.putInt(context.getContentResolver(),
+                Settings.Global.ZEN_SETTINGS_SUGGESTION_VIEWED, 1);
+
         setupUI();
     }
 
@@ -45,6 +71,34 @@
     protected void setupUI() {
         setContentView(R.layout.zen_onboarding);
 
+        mNewSetting = findViewById(R.id.zen_onboarding_new_setting);
+        mKeepCurrentSetting = findViewById(R.id.zen_onboarding_current_setting);
+        mNewSettingButton = findViewById(R.id.zen_onboarding_new_setting_button);
+        mKeepCurrentSettingButton = findViewById(R.id.zen_onboarding_current_setting_button);
+
+        View.OnClickListener newSettingClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mKeepCurrentSettingButton.setChecked(false);
+                mNewSettingButton.setChecked(true);
+            }
+        };
+
+        View.OnClickListener currentSettingClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mKeepCurrentSettingButton.setChecked(true);
+                mNewSettingButton.setChecked(false);
+            }
+        };
+
+        mNewSetting.setOnClickListener(newSettingClickListener);
+        mNewSettingButton.setOnClickListener(newSettingClickListener);
+
+        mKeepCurrentSetting.setOnClickListener(currentSettingClickListener);
+        mKeepCurrentSettingButton.setOnClickListener(currentSettingClickListener);
+
+        mKeepCurrentSettingButton.setChecked(true);
         mMetrics.visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
     }
 
@@ -58,22 +112,83 @@
         mMetrics = ml;
     }
 
-    public void close(View button) {
-        mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
-        finishAndRemoveTask();
+    public void launchSettings(View button) {
+        mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SETTINGS);
+        Intent settings = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS);
+        settings.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(settings);
     }
 
     public void save(View button) {
-        mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
-        Policy policy = mNm.getNotificationPolicy();
+        NotificationManager.Policy policy = mNm.getNotificationPolicy();
 
-        Policy newPolicy = new NotificationManager.Policy(
-                Policy.PRIORITY_CATEGORY_REPEAT_CALLERS | policy.priorityCategories,
-                Policy.PRIORITY_SENDERS_STARRED,
-                policy.priorityMessageSenders,
-                Policy.getAllSuppressedVisualEffects());
-        mNm.setNotificationPolicy(newPolicy);
+        if (mNewSettingButton.isChecked()) {
+            NotificationManager.Policy newPolicy = new NotificationManager.Policy(
+                    Policy.PRIORITY_CATEGORY_REPEAT_CALLERS | policy.priorityCategories,
+                    Policy.PRIORITY_SENDERS_STARRED,
+                    policy.priorityMessageSenders,
+                    NotificationManager.Policy.getAllSuppressedVisualEffects());
+            mNm.setNotificationPolicy(newPolicy);
+            mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
+        } else {
+            mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
+        }
+
+        Settings.Global.putInt(getApplicationContext().getContentResolver(),
+                Settings.Global.ZEN_SETTINGS_UPDATED, 1);
 
         finishAndRemoveTask();
     }
+
+    public static boolean isSuggestionComplete(Context context) {
+        if (wasZenUpdated(context)) {
+            return true;
+        }
+
+        if (showSuggestion(context) || withinShowTimeThreshold(context)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static boolean wasZenUpdated(Context context) {
+        // ZEN_SETTINGS_UPDATED is true for:
+        // - fresh P+ device
+        // - if zen visual effects values were changed by the user in Settings
+        return Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.ZEN_SETTINGS_UPDATED, 0) != 0;
+    }
+
+    private static boolean showSuggestion(Context context) {
+        // SHOW_ZEN_SETTINGS_SUGGESTION is by default true, but false when:
+        // - user manually turns on dnd
+
+        // SHOW_ZEN_SETTINGS_SUGGESTION is also true when:
+        // - automatic rule has started DND and user has not seen the first use dialog
+        return Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.SHOW_ZEN_SETTINGS_SUGGESTION, 0) != 0;
+
+    }
+
+    private static boolean withinShowTimeThreshold(Context context) {
+        final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        final SharedPreferences prefs = featureProvider.getSharedPrefs(context);
+        final long currentTimeMs = System.currentTimeMillis();
+        final long firstDisplayTimeMs;
+
+        if (!prefs.contains(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME)) {
+            firstDisplayTimeMs = currentTimeMs;
+            prefs.edit().putLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, currentTimeMs).commit();
+        } else {
+            firstDisplayTimeMs = prefs.getLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, -1);
+        }
+
+        final long showTimeMs = firstDisplayTimeMs + ALWAYS_SHOW_THRESHOLD;
+        final boolean stillShow = currentTimeMs < showTimeMs;
+
+        Log.d(TAG, "still show zen suggestion based on time: " + stillShow);
+        return stillShow;
+    }
 }
diff --git a/src/com/android/settings/notification/ZenSuggestionActivity.java b/src/com/android/settings/notification/ZenSuggestionActivity.java
new file mode 100644
index 0000000..9d2148c
--- /dev/null
+++ b/src/com/android/settings/notification/ZenSuggestionActivity.java
@@ -0,0 +1,24 @@
+package com.android.settings.notification;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Settings;
+
+public class ZenSuggestionActivity extends Activity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // start up zen settings activity
+        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS);
+        startActivity(settingsIntent);
+
+        // start up onboarding activity
+        Intent onboardingActivity = new Intent(Settings.ZEN_MODE_ONBOARDING);
+        startActivity(onboardingActivity);
+
+        finish();
+    }
+}
diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java
index 14eb907..2307b2c 100644
--- a/src/com/android/settings/print/PrintSettingPreferenceController.java
+++ b/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -59,7 +59,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
index 37978df..8e64d79 100644
--- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java
+++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
@@ -47,34 +47,35 @@
             List<String> keywords);
 
     default void updateIndex(Context context, boolean force) {
-        if (!isIndexingEnabled()) return;
+        if (!isIndexingEnabled()) {
+            return;
+        }
 
         if (!force && Objects.equals(
-                Settings.Secure.getString(context.getContentResolver(), INDEX_VERSION),  VERSION)) {
+                Settings.Secure.getString(context.getContentResolver(), INDEX_VERSION), VERSION)) {
             // No need to update.
             return;
         }
 
-        ComponentName jobComponent = new ComponentName(context.getPackageName(),
+        final ComponentName jobComponent = new ComponentName(context.getPackageName(),
                 DeviceIndexUpdateJobService.class.getName());
-        int jobId = context.getResources().getInteger(R.integer.device_index_update);
+        final int jobId = context.getResources().getInteger(R.integer.device_index_update);
         // Schedule a job so that we know it'll be able to complete, but try to run as
         // soon as possible.
         context.getSystemService(JobScheduler.class).schedule(
                 new JobInfo.Builder(jobId, jobComponent)
                         .setPersisted(true)
-                        .setMinimumLatency(1)
+                        .setMinimumLatency(1000)
                         .setOverrideDeadline(1)
                         .build());
 
         Settings.Secure.putString(context.getContentResolver(), INDEX_VERSION, VERSION);
     }
 
-    static String createDeepLink(String s) {
+    static Uri createDeepLink(String s) {
         return new Uri.Builder().scheme(SETTINGS)
                 .authority(SettingsSliceProvider.SLICE_AUTHORITY)
                 .appendQueryParameter(INTENT, s)
-                .build()
-                .toString();
+                .build();
     }
 }
diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java
index 573dcdf..19b7d5e 100644
--- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java
+++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java
@@ -17,7 +17,6 @@
 import static android.app.slice.Slice.HINT_LARGE;
 import static android.app.slice.Slice.HINT_TITLE;
 import static android.app.slice.SliceItem.FORMAT_TEXT;
-
 import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink;
 
 import android.app.job.JobParameters;
@@ -54,10 +53,12 @@
     @Override
     public boolean onStartJob(JobParameters params) {
         if (DEBUG) Log.d(TAG, "onStartJob");
-        mRunningJob = true;
-        Thread thread = new Thread(() -> updateIndex(params));
-        thread.setPriority(Thread.MIN_PRIORITY);
-        thread.start();
+        if (!mRunningJob) {
+            mRunningJob = true;
+            Thread thread = new Thread(() -> updateIndex(params));
+            thread.setPriority(Thread.MIN_PRIORITY);
+            thread.start();
+        }
         return true;
     }
 
@@ -73,16 +74,20 @@
 
     @VisibleForTesting
     protected void updateIndex(JobParameters params) {
-        if (DEBUG) Log.d(TAG, "Starting index");
-        DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(
-                this).getDeviceIndexFeatureProvider();
-        SliceManager manager = getSliceManager();
-        Uri baseUri = new Builder()
+        if (DEBUG) {
+            Log.d(TAG, "Starting index");
+        }
+        final DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(this)
+                .getDeviceIndexFeatureProvider();
+        final SliceManager manager = getSliceManager();
+        final Uri baseUri = new Builder()
                 .scheme(ContentResolver.SCHEME_CONTENT)
                 .authority(SettingsSliceProvider.SLICE_AUTHORITY)
                 .build();
-        Collection<Uri> slices = manager.getSliceDescendants(baseUri);
-        if (DEBUG) Log.d(TAG, "Indexing " + slices.size() + " slices");
+        final Collection<Uri> slices = manager.getSliceDescendants(baseUri);
+        if (DEBUG) {
+            Log.d(TAG, "Indexing " + slices.size() + " slices");
+        }
 
         for (Uri slice : slices) {
             if (!mRunningJob) {
@@ -93,16 +98,20 @@
             SliceMetadata metaData = getMetadata(loadedSlice);
             CharSequence title = findTitle(loadedSlice, metaData);
             if (title != null) {
-                if (DEBUG) Log.d(TAG, "Indexing: " + slice + " " + title + " " + loadedSlice);
-                indexProvider.index(this, title, slice, Uri.parse(createDeepLink(
+                if (DEBUG) {
+                    Log.d(TAG, "Indexing: " + slice + " " + title + " " + loadedSlice);
+                }
+                indexProvider.index(this, title, slice, createDeepLink(
                         new Intent(SliceDeepLinkSpringBoard.ACTION_VIEW_SLICE)
                                 .setPackage(getPackageName())
                                 .putExtra(SliceDeepLinkSpringBoard.EXTRA_SLICE, slice.toString())
-                                .toUri(Intent.URI_ANDROID_APP_SCHEME))),
+                                .toUri(Intent.URI_ANDROID_APP_SCHEME)),
                         metaData.getSliceKeywords());
             }
         }
-        if (DEBUG) Log.d(TAG, "Done indexing");
+        if (DEBUG) {
+            Log.d(TAG, "Done indexing");
+        }
         jobFinished(params, false);
     }
 
@@ -115,7 +124,7 @@
     }
 
     protected CharSequence findTitle(Slice loadedSlice, SliceMetadata metaData) {
-        ListContent content = new ListContent(this, loadedSlice);
+        ListContent content = new ListContent(null, loadedSlice);
         SliceItem headerItem = content.getHeaderItem();
         if (headerItem == null) {
             if (content.getRowItems().size() != 0) {
diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
index 8125599..0ecab36 100644
--- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java
+++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
@@ -44,7 +44,7 @@
         if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE) &&
                 !mContext.getResources().getBoolean(
                 R.bool.config_show_encryption_and_credentials_encryption_status)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
 
         return mUserManager.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER;
diff --git a/src/com/android/settings/security/ScreenPinningPreferenceController.java b/src/com/android/settings/security/ScreenPinningPreferenceController.java
index a90746e..37a3f9c 100644
--- a/src/com/android/settings/security/ScreenPinningPreferenceController.java
+++ b/src/com/android/settings/security/ScreenPinningPreferenceController.java
@@ -33,7 +33,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_screen_pinning_settings)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java
index 82f1935..8672974 100644
--- a/src/com/android/settings/security/ShowPasswordPreferenceController.java
+++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java
@@ -55,7 +55,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_show_password)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
 }
diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
index 55448e2..22742e5 100644
--- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
+++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
@@ -23,6 +23,7 @@
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.Utils;
@@ -32,10 +33,14 @@
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+
 public class VisiblePatternProfilePreferenceController extends TogglePreferenceController
         implements LifecycleObserver, OnResume {
 
     private static final String KEY_VISIBLE_PATTERN_PROFILE = "visiblepattern_profile";
+    private static final String TAG = "VisPtnProfPrefCtrl";
 
     private final LockPatternUtils mLockPatternUtils;
     private final UserManager mUm;
@@ -45,7 +50,7 @@
     private Preference mPreference;
 
     public VisiblePatternProfilePreferenceController(Context context) {
-         this(context, null /* lifecycle */);
+        this(context, null /* lifecycle */);
     }
 
     // TODO (b/73074893) Replace this constructor without Lifecycle using setter method instead.
@@ -63,12 +68,25 @@
 
     @Override
     public int getAvailabilityStatus() {
-        if (mLockPatternUtils.isSecure(mProfileChallengeUserId)
-                && mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId)
-                == PASSWORD_QUALITY_SOMETHING) {
-            return AVAILABLE;
+        final FutureTask<Integer> futureTask = new FutureTask<>(
+                // Put the API call in a future to avoid StrictMode violation.
+                () -> {
+                    final boolean isSecure = mLockPatternUtils.isSecure(mProfileChallengeUserId);
+                    final boolean hasPassword = mLockPatternUtils
+                            .getKeyguardStoredPasswordQuality(mProfileChallengeUserId)
+                            == PASSWORD_QUALITY_SOMETHING;
+                    if (isSecure && hasPassword) {
+                        return AVAILABLE;
+                    }
+                    return DISABLED_FOR_USER;
+                });
+        try {
+            futureTask.run();
+            return futureTask.get();
+        } catch (InterruptedException | ExecutionException e) {
+            Log.w(TAG, "Error getting lock pattern state.");
+            return DISABLED_FOR_USER;
         }
-        return DISABLED_FOR_USER;
     }
 
     @Override
diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
index 3e39860..322682e 100644
--- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
@@ -47,7 +47,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_manage_trust_agents)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 55ad6b0..8f07447 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -18,6 +18,8 @@
 
 import static android.Manifest.permission.READ_SEARCH_INDEXABLES;
 
+import static com.android.settings.wifi.calling.WifiCallingSliceHelper.PATH_WIFI_CALLING;
+
 import android.app.PendingIntent;
 import android.app.slice.SliceManager;
 import android.content.ContentResolver;
@@ -26,32 +28,31 @@
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
-import android.os.StrictMode;
 import android.provider.Settings;
 import android.provider.SettingsSlicesContract;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.graphics.drawable.IconCompat;
 import android.text.TextUtils;
-import android.util.ArrayMap;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.settings.R;
-import com.android.settingslib.utils.ThreadUtils;
-
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
 import androidx.slice.Slice;
 import androidx.slice.SliceProvider;
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.SliceAction;
 
+import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * A {@link SliceProvider} for Settings to enabled inline results in system apps.
  *
@@ -117,6 +118,7 @@
 
     @VisibleForTesting
     Map<Uri, SliceData> mSliceWeakDataCache;
+    @VisibleForTesting
     Map<Uri, SliceData> mSliceDataCache;
 
     public SettingsSliceProvider() {
@@ -126,7 +128,7 @@
     @Override
     public boolean onCreateSliceProvider() {
         mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(getContext());
-        mSliceDataCache = new ArrayMap<>();
+        mSliceDataCache = new ConcurrentHashMap<>();
         mSliceWeakDataCache = new WeakHashMap<>();
         return true;
     }
@@ -155,17 +157,17 @@
 
     @Override
     public Slice onBindSlice(Uri sliceUri) {
-        // TODO: Remove this when all slices are not breaking strict mode
-        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
-                .permitAll()
-                .build());
-
         String path = sliceUri.getPath();
         // If adding a new Slice, do not directly match Slice URIs.
         // Use {@link SlicesDatabaseAccessor}.
         switch (path) {
             case "/" + PATH_WIFI:
                 return createWifiSlice(sliceUri);
+            case "/" + PATH_WIFI_CALLING:
+                return FeatureFactory.getFactory(getContext())
+                        .getSlicesFeatureProvider()
+                        .getNewWifiCallingSliceHelper(getContext())
+                        .createWifiCallingSlice(sliceUri);
         }
 
         SliceData cachedSliceData = mSliceWeakDataCache.get(sliceUri);
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index 47a7f5a..0409734 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -21,6 +21,7 @@
 import static com.android.settings.slices.SettingsSliceProvider.ACTION_WIFI_CHANGED;
 import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
 import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
+import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED;
 
 import android.app.slice.Slice;
 import android.content.BroadcastReceiver;
@@ -79,6 +80,12 @@
                     context.getContentResolver().notifyChange(uri, null);
                 }, 1000);
                 break;
+            case ACTION_WIFI_CALLING_CHANGED:
+                FeatureFactory.getFactory(context)
+                      .getSlicesFeatureProvider()
+                      .getNewWifiCallingSliceHelper(context)
+                      .handleWifiCallingChanged(intent);
+                break;
         }
     }
 
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index edb2512..be2e8df 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -17,10 +17,10 @@
 package com.android.settings.slices;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
 import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
-import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
 import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
 
@@ -30,13 +30,16 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.provider.Settings;
 import android.provider.SettingsSlicesContract;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.Pair;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.SubSettings;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.SliderPreferenceController;
@@ -75,6 +78,7 @@
      * {@param sliceData} is an inline controller.
      */
     public static Slice buildSlice(Context context, SliceData sliceData) {
+        Log.d(TAG, "Creating slice for: " + sliceData.getPreferenceController());
         final BasePreferenceController controller = getPreferenceController(context, sliceData);
         final Pair<Integer, Object> sliceNamePair =
                 Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, sliceData.getKey());
@@ -177,8 +181,7 @@
      * @return {@link PendingIntent} to the Settings home page.
      */
     public static PendingIntent getSettingsIntent(Context context) {
-        final PackageManager manager = context.getPackageManager();
-        final Intent intent = manager.getLaunchIntentForPackage(context.getPackageName());
+        final Intent intent = new Intent(Settings.ACTION_SETTINGS);
         return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
     }
 
@@ -235,7 +238,7 @@
                 (TogglePreferenceController) controller;
         final SliceAction sliceAction = getToggleAction(context, sliceData,
                 toggleController.isChecked());
-        final List<String> keywords = buildSliceKeywords(sliceData.getKeywords());
+        final List<String> keywords = buildSliceKeywords(sliceData);
 
         return new ListBuilder(context, sliceData.getUri(), SLICE_TTL_MILLIS)
                 .addRow(rowBuilder -> rowBuilder
@@ -253,7 +256,7 @@
         final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
         final IconCompat icon = IconCompat.createWithResource(context, sliceData.getIconResource());
         final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
-        final List<String> keywords = buildSliceKeywords(sliceData.getKeywords());
+        final List<String> keywords = buildSliceKeywords(sliceData);
 
         return new ListBuilder(context, sliceData.getUri(), SLICE_TTL_MILLIS)
                 .addRow(rowBuilder -> rowBuilder
@@ -273,7 +276,7 @@
         final IconCompat icon = IconCompat.createWithResource(context, sliceData.getIconResource());
         final SliceAction primaryAction = new SliceAction(contentIntent, icon,
                 sliceData.getTitle());
-        final List<String> keywords = buildSliceKeywords(sliceData.getKeywords());
+        final List<String> keywords = buildSliceKeywords(sliceData);
 
         return new ListBuilder(context, sliceData.getUri(), SLICE_TTL_MILLIS)
                 .addInputRange(builder -> builder
@@ -321,25 +324,34 @@
                 || TextUtils.equals(summary, doublePlaceHolder));
     }
 
-    private static List<String> buildSliceKeywords(String keywordString) {
-        if (keywordString == null) {
-            return new ArrayList<>();
+    private static List<String> buildSliceKeywords(SliceData data) {
+        final List<String> keywords = new ArrayList<>();
+
+        keywords.add(data.getTitle());
+
+        if (!TextUtils.equals(data.getTitle(), data.getScreenTitle())) {
+            keywords.add(data.getScreenTitle().toString());
         }
 
-        final String[] keywords = keywordString.split(",");
-        return Arrays.asList(keywords);
+        final String keywordString = data.getKeywords();
+        if (keywordString != null) {
+            final String[] keywordArray = keywordString.split(",");
+            keywords.addAll(Arrays.asList(keywordArray));
+        }
+
+        return keywords;
     }
 
     private static Slice buildUnavailableSlice(Context context, SliceData data,
             BasePreferenceController controller) {
         final String title = data.getTitle();
-        final List<String> keywords = buildSliceKeywords(data.getKeywords());
+        final List<String> keywords = buildSliceKeywords(data);
         final String summary;
         final SliceAction primaryAction;
         final IconCompat icon = IconCompat.createWithResource(context, data.getIconResource());
 
         switch (controller.getAvailabilityStatus()) {
-            case DISABLED_UNSUPPORTED:
+            case UNSUPPORTED_ON_DEVICE:
                 summary = context.getString(R.string.unsupported_setting_summary);
                 primaryAction = new SliceAction(getSettingsIntent(context), icon, title);
                 break;
@@ -353,7 +365,7 @@
                 primaryAction = new SliceAction(getContentPendingIntent(context, data), icon,
                         title);
                 break;
-            case UNAVAILABLE_UNKNOWN:
+            case CONDITIONALLY_UNAVAILABLE:
             default:
                 summary = context.getString(R.string.unknown_unavailability_setting_summary);
                 primaryAction = new SliceAction(getSettingsIntent(context), icon, title);
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index eb6a44f..7bd66ba 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -185,7 +185,6 @@
                             | MetadataFlag.FLAG_NEED_PREF_TITLE
                             | MetadataFlag.FLAG_NEED_PREF_ICON
                             | MetadataFlag.FLAG_NEED_PREF_SUMMARY
-                            | MetadataFlag.FLAG_NEED_KEYWORDS
                             | MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG);
 
             for (Bundle bundle : metadata) {
@@ -198,7 +197,6 @@
                 final String key = bundle.getString(METADATA_KEY);
                 final String title = bundle.getString(METADATA_TITLE);
                 final String summary = bundle.getString(METADATA_SUMMARY);
-                final String keywords = bundle.getString(METADATA_KEYWORDS);
                 final int iconResId = bundle.getInt(METADATA_ICON);
                 final int sliceType = SliceBuilderUtils.getSliceType(mContext, controllerClassName,
                         key);
@@ -210,7 +208,6 @@
                         .setSummary(summary)
                         .setIcon(iconResId)
                         .setScreenTitle(screenTitle)
-                        .setKeywords(keywords)
                         .setPreferenceControllerClassName(controllerClassName)
                         .setFragmentName(fragmentName)
                         .setSliceType(sliceType)
diff --git a/src/com/android/settings/slices/SlicesFeatureProvider.java b/src/com/android/settings/slices/SlicesFeatureProvider.java
index e5bba61..8dd6547 100644
--- a/src/com/android/settings/slices/SlicesFeatureProvider.java
+++ b/src/com/android/settings/slices/SlicesFeatureProvider.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 
+import com.android.settings.wifi.calling.WifiCallingSliceHelper;
+
 /**
  * Manages Slices in Settings.
  */
@@ -24,4 +26,9 @@
      * If the data is already indexed, the data will not change.
      */
     void indexSliceData(Context context);
-}
\ No newline at end of file
+
+    /**
+     * Gets new WifiCallingSliceHelper object
+     */
+    WifiCallingSliceHelper getNewWifiCallingSliceHelper(Context context);
+}
diff --git a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
index 8e5bc06..16684bf 100644
--- a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
+++ b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 import com.android.settingslib.utils.ThreadUtils;
 
 /**
@@ -39,4 +40,9 @@
         SlicesIndexer indexer = getSliceIndexer(context);
         indexer.indexSliceData();
     }
-}
\ No newline at end of file
+
+    @Override
+    public WifiCallingSliceHelper getNewWifiCallingSliceHelper(Context context) {
+        return new WifiCallingSliceHelper(context);
+    }
+}
diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
index b2dafcc..dde2b30 100644
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -16,8 +16,12 @@
 
 package com.android.settings.sound;
 
-
 import static android.media.AudioManager.STREAM_DEVICES_CHANGED_ACTION;
+import static android.media.AudioManager.STREAM_MUSIC;
+import static android.media.AudioManager.STREAM_VOICE_CALL;
+import static android.media.AudioSystem.DEVICE_OUT_ALL_A2DP;
+import static android.media.AudioSystem.DEVICE_OUT_ALL_SCO;
+import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
 import static android.media.MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY;
 
 import android.bluetooth.BluetoothDevice;
@@ -38,19 +42,22 @@
 import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
 
-import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.FeatureFlags;
+import com.android.settingslib.bluetooth.A2dpProfile;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HeadsetProfile;
+import com.android.settingslib.bluetooth.HearingAidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -65,12 +72,12 @@
 
     private static final int INVALID_INDEX = -1;
 
+    protected final List<BluetoothDevice> mConnectedDevices;
     protected final AudioManager mAudioManager;
     protected final MediaRouter mMediaRouter;
     protected final LocalBluetoothProfileManager mProfileManager;
     protected int mSelectedIndex;
     protected Preference mPreference;
-    protected List<BluetoothDevice> mConnectedDevices;
 
     private final AudioManagerAudioDeviceCallback mAudioManagerAudioDeviceCallback;
     private final LocalBluetoothManager mLocalBluetoothManager;
@@ -89,6 +96,7 @@
         mAudioManagerAudioDeviceCallback = new AudioManagerAudioDeviceCallback();
         mReceiver = new WiredHeadsetBroadcastReceiver();
         mMediaRouterCallback = new MediaRouterCallback();
+        mConnectedDevices = new ArrayList<>();
     }
 
     /**
@@ -98,7 +106,7 @@
     @Override
     public final int getAvailabilityStatus() {
         return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
@@ -153,7 +161,6 @@
      */
     @Override
     public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
-        updateState(mPreference);
     }
 
     @Override
@@ -167,6 +174,12 @@
     }
 
     @Override
+    public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state,
+            int bluetoothProfile) {
+        updateState(mPreference);
+    }
+
+    @Override
     public void onBluetoothStateChanged(int bluetoothState) {
     }
 
@@ -195,19 +208,105 @@
     }
 
     protected boolean isStreamFromOutputDevice(int streamType, int device) {
-        return mAudioManager.getDevicesForStream(streamType) == device;
+        return (device & mAudioManager.getDevicesForStream(streamType)) != 0;
     }
 
-    protected boolean isOngoingCallStatus() {
-        final int audioMode = mAudioManager.getMode();
-        return audioMode == AudioManager.MODE_RINGTONE
-                || audioMode == AudioManager.MODE_IN_CALL
-                || audioMode == AudioManager.MODE_IN_COMMUNICATION;
+    /**
+     * get hands free profile(HFP) connected device
+     */
+    protected List<BluetoothDevice> getConnectedHfpDevices() {
+        final List<BluetoothDevice> connectedDevices = new ArrayList<>();
+        final HeadsetProfile hfpProfile = mProfileManager.getHeadsetProfile();
+        if (hfpProfile == null) {
+            return connectedDevices;
+        }
+        final List<BluetoothDevice> devices = hfpProfile.getConnectedDevices();
+        for (BluetoothDevice device : devices) {
+            if (device.isConnected()) {
+                connectedDevices.add(device);
+            }
+        }
+        return connectedDevices;
+    }
+
+    /**
+     * get A2dp connected device
+     */
+    protected List<BluetoothDevice> getConnectedA2dpDevices() {
+        final List<BluetoothDevice> connectedDevices = new ArrayList<>();
+        final A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile();
+        if (a2dpProfile == null) {
+            return connectedDevices;
+        }
+        final List<BluetoothDevice> devices = a2dpProfile.getConnectedDevices();
+        for (BluetoothDevice device : devices) {
+            if (device.isConnected()) {
+                connectedDevices.add(device);
+            }
+        }
+        return connectedDevices;
+    }
+
+    /**
+     * get hearing aid profile connected device, exclude other devices with same hiSyncId.
+     */
+    protected List<BluetoothDevice> getConnectedHearingAidDevices() {
+        final List<BluetoothDevice> connectedDevices = new ArrayList<>();
+        final HearingAidProfile hapProfile = mProfileManager.getHearingAidProfile();
+        if (hapProfile == null) {
+            return connectedDevices;
+        }
+        final List<Long> devicesHiSyncIds = new ArrayList<>();
+        final List<BluetoothDevice> devices = hapProfile.getConnectedDevices();
+        for (BluetoothDevice device : devices) {
+            final long hiSyncId = hapProfile.getHiSyncId(device);
+            // device with same hiSyncId should not be shown in the UI.
+            // So do not add it into connectedDevices.
+            if (!devicesHiSyncIds.contains(hiSyncId) && device.isConnected()) {
+                devicesHiSyncIds.add(hiSyncId);
+                connectedDevices.add(device);
+            }
+        }
+        return connectedDevices;
+    }
+
+    /**
+     * According to different stream and output device, find the active device from
+     * the corresponding profile. Hearing aid device could stream both STREAM_MUSIC
+     * and STREAM_VOICE_CALL.
+     *
+     * @param streamType the type of audio streams.
+     * @return the active device. Return null if the active device is current device
+     * or streamType is not STREAM_MUSIC or STREAM_VOICE_CALL.
+     */
+    protected BluetoothDevice findActiveDevice(int streamType) {
+        if (streamType != STREAM_MUSIC && streamType != STREAM_VOICE_CALL) {
+            return null;
+        }
+        if (isStreamFromOutputDevice(STREAM_MUSIC, DEVICE_OUT_ALL_A2DP)) {
+            return mProfileManager.getA2dpProfile().getActiveDevice();
+        } else if (isStreamFromOutputDevice(STREAM_VOICE_CALL, DEVICE_OUT_ALL_SCO)) {
+            return mProfileManager.getHeadsetProfile().getActiveDevice();
+        } else if (isStreamFromOutputDevice(streamType, DEVICE_OUT_HEARING_AID)) {
+            // The first element is the left active device; the second element is
+            // the right active device. And they will have same hiSyncId. If either
+            // or both side is not active, it will be null on that position.
+            List<BluetoothDevice> activeDevices =
+                    mProfileManager.getHearingAidProfile().getActiveDevices();
+            for (BluetoothDevice btDevice : activeDevices) {
+                if (btDevice != null && mConnectedDevices.contains(btDevice)) {
+                    // also need to check mConnectedDevices, because one of
+                    // the device(same hiSyncId) might not be shown in the UI.
+                    return btDevice;
+                }
+            }
+        }
+        return null;
     }
 
     int getDefaultDeviceIndex() {
         // Default device is after all connected devices.
-        return ArrayUtils.size(mConnectedDevices);
+        return mConnectedDevices.size();
     }
 
     void setupPreferenceEntries(CharSequence[] mediaOutputs, CharSequence[] mediaValues,
@@ -268,7 +367,7 @@
         mContext.unregisterReceiver(mReceiver);
     }
 
-    /** Callback for headset plugged and unplugged events. */
+    /** Notifications of audio device connection and disconnection events. */
     private class AudioManagerAudioDeviceCallback extends AudioDeviceCallback {
         @Override
         public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index 58ea7b7..2039913 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -16,19 +16,22 @@
 
 package com.android.settings.sound;
 
+import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID;
 import static android.media.AudioManager.STREAM_VOICE_CALL;
 import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET;
 
+import com.android.settingslib.Utils;
+
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settingslib.bluetooth.HeadsetProfile;
+import com.android.settingslib.bluetooth.HearingAidProfile;
 
 /**
- * This class allows switching between HFP-connected BT devices
+ * This class allows switching between HFP-connected & HAP-connected BT devices
  * while in on-call state.
  */
 public class HandsFreeProfileOutputPreferenceController extends
@@ -45,7 +48,7 @@
             return;
         }
 
-        if (!isOngoingCallStatus()) {
+        if (!Utils.isAudioModeOngoingCall(mContext)) {
             // Without phone call, disable the switch entry.
             mPreference.setVisible(false);
             preference.setSummary(mContext.getText(R.string.media_output_default_summary));
@@ -55,16 +58,11 @@
         // Ongoing call status, list all the connected devices support hands free profile.
         // Select current active device.
         // Disable switch entry if there is no connected device.
-        mConnectedDevices = null;
-        BluetoothDevice activeDevice = null;
+        mConnectedDevices.clear();
+        mConnectedDevices.addAll(getConnectedHfpDevices());
+        mConnectedDevices.addAll(getConnectedHearingAidDevices());
 
-        final HeadsetProfile headsetProfile = mProfileManager.getHeadsetProfile();
-        if (headsetProfile != null) {
-            mConnectedDevices = headsetProfile.getConnectedDevices();
-            activeDevice = headsetProfile.getActiveDevice();
-        }
-
-        final int numDevices = ArrayUtils.size(mConnectedDevices);
+        final int numDevices = mConnectedDevices.size();
         if (numDevices == 0) {
             // No connected devices, disable switch entry.
             mPreference.setVisible(false);
@@ -77,7 +75,7 @@
         CharSequence[] mediaValues = new CharSequence[numDevices + 1];
 
         // Setup devices entries, select active connected device
-        setupPreferenceEntries(mediaOutputs, mediaValues, activeDevice);
+        setupPreferenceEntries(mediaOutputs, mediaValues, findActiveDevice(STREAM_VOICE_CALL));
 
         if (isStreamFromOutputDevice(STREAM_VOICE_CALL, DEVICE_OUT_USB_HEADSET)) {
             // If wired headset is plugged in and active, select to default device.
@@ -90,8 +88,21 @@
 
     @Override
     public void setActiveBluetoothDevice(BluetoothDevice device) {
-        if (isOngoingCallStatus()) {
-            mProfileManager.getHeadsetProfile().setActiveDevice(device);
+        if (!Utils.isAudioModeOngoingCall(mContext)) {
+            return;
+        }
+        final HearingAidProfile hapProfile = mProfileManager.getHearingAidProfile();
+        final HeadsetProfile hfpProfile = mProfileManager.getHeadsetProfile();
+        if (hapProfile != null && hfpProfile != null && device == null) {
+            hfpProfile.setActiveDevice(null);
+            hapProfile.setActiveDevice(null);
+            return;
+        }
+        if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
+            hapProfile.setActiveDevice(device);
+        }
+        if (hfpProfile != null) {
+            hfpProfile.setActiveDevice(device);
         }
     }
 }
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index dce19f1..79f3c9d 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -16,22 +16,24 @@
 
 package com.android.settings.sound;
 
+import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID;
 import static android.media.AudioManager.STREAM_MUSIC;
 import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX;
 import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET;
 
+import com.android.settingslib.Utils;
+
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.media.AudioManager;
 import android.support.v7.preference.Preference;
 
-import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settingslib.bluetooth.A2dpProfile;
-
+import com.android.settingslib.bluetooth.HearingAidProfile;
 
 /**
- * This class which allows switching between a2dp-connected BT devices.
+ * This class which allows switching between A2dp-connected & HAP-connected BT devices.
  * A few conditions will disable this switcher:
  * - No available BT device(s)
  * - Media stream captured by cast device
@@ -57,7 +59,7 @@
             return;
         }
 
-        if (isOngoingCallStatus()) {
+        if (Utils.isAudioModeOngoingCall(mContext)) {
             // Ongoing call status, switch entry for media will be disabled.
             mPreference.setVisible(false);
             preference.setSummary(
@@ -65,18 +67,14 @@
             return;
         }
 
+        mConnectedDevices.clear();
         // Otherwise, list all of the A2DP connected device and display the active device.
-        mConnectedDevices = null;
-        BluetoothDevice activeDevice = null;
         if (mAudioManager.getMode() == AudioManager.MODE_NORMAL) {
-            final A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile();
-            if (a2dpProfile != null) {
-                mConnectedDevices = a2dpProfile.getConnectedDevices();
-                activeDevice = a2dpProfile.getActiveDevice();
-            }
+            mConnectedDevices.addAll(getConnectedA2dpDevices());
+            mConnectedDevices.addAll(getConnectedHearingAidDevices());
         }
 
-        final int numDevices = ArrayUtils.size(mConnectedDevices);
+        final int numDevices = mConnectedDevices.size();
         if (numDevices == 0) {
             // Disable switch entry if there is no connected devices.
             mPreference.setVisible(false);
@@ -89,7 +87,7 @@
         CharSequence[] mediaValues = new CharSequence[numDevices + 1];
 
         // Setup devices entries, select active connected device
-        setupPreferenceEntries(mediaOutputs, mediaValues, activeDevice);
+        setupPreferenceEntries(mediaOutputs, mediaValues, findActiveDevice(STREAM_MUSIC));
 
         if (isStreamFromOutputDevice(STREAM_MUSIC, DEVICE_OUT_USB_HEADSET)) {
             // If wired headset is plugged in and active, select to default device.
@@ -102,8 +100,21 @@
 
     @Override
     public void setActiveBluetoothDevice(BluetoothDevice device) {
-        if (mAudioManager.getMode() == AudioManager.MODE_NORMAL) {
-            mProfileManager.getA2dpProfile().setActiveDevice(device);
+        if (mAudioManager.getMode() != AudioManager.MODE_NORMAL) {
+            return;
+        }
+        final HearingAidProfile hapProfile = mProfileManager.getHearingAidProfile();
+        final A2dpProfile a2dpProfile = mProfileManager.getA2dpProfile();
+        if (hapProfile != null && a2dpProfile != null && device == null) {
+            hapProfile.setActiveDevice(null);
+            a2dpProfile.setActiveDevice(null);
+            return;
+        }
+        if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
+            hapProfile.setActiveDevice(device);
+        }
+        if (a2dpProfile != null) {
+            a2dpProfile.setActiveDevice(device);
         }
     }
 }
diff --git a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java
index f881e2f..cddbb57 100644
--- a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java
+++ b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java
@@ -20,9 +20,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
@@ -47,6 +50,8 @@
     @VisibleForTesting
     static final long PERMANENT_DISMISS_THRESHOLD = DateUtils.DAY_IN_MILLIS * 14;
 
+    public static final String TIPS_PACKAGE_NAME = "com.google.android.apps.tips";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -62,7 +67,9 @@
     }
 
     public static boolean isSuggestionComplete(Context context) {
-        return !isSupported(context)
+        // Always returns 'true' if Tips application exists. Check b/77652536 for more details.
+        return isTipsInstalledAsSystemApp(context)
+                || !isSupported(context)
                 || isExpired(context)
                 || hasLaunchedBefore(context)
                 || !canOpenUrlInBrowser(context);
@@ -130,4 +137,18 @@
                 .addCategory(Intent.CATEGORY_BROWSABLE)
                 .setData(Uri.parse(url));
     }
+
+    /**
+     * Check if the specified package exists and is marked with <i>FLAG_SYSTEM</i>
+     */
+    private static boolean isTipsInstalledAsSystemApp(@NonNull Context context) {
+        try {
+            final PackageInfo info = context.getPackageManager().getPackageInfo(TIPS_PACKAGE_NAME,
+                    PackageManager.MATCH_SYSTEM_ONLY);
+            return info != null;
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "Cannot find the package: " + TIPS_PACKAGE_NAME, e);
+            return false;
+        }
+    }
 }
diff --git a/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java b/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java
index 1fbf835..868f10f 100644
--- a/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java
+++ b/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java
@@ -32,6 +32,6 @@
         return mContext.getResources().getBoolean(
                 com.android.settings.R.bool.config_additional_system_update_setting_enable)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/system/ResetPreferenceController.java b/src/com/android/settings/system/ResetPreferenceController.java
index 16f7ce3..ec0c27b 100644
--- a/src/com/android/settings/system/ResetPreferenceController.java
+++ b/src/com/android/settings/system/ResetPreferenceController.java
@@ -30,6 +30,6 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_reset_dashboard)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java
index 80d4ecb..88715bf 100644
--- a/src/com/android/settings/system/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java
@@ -35,6 +35,9 @@
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+
 public class SystemUpdatePreferenceController extends BasePreferenceController {
 
     private static final String TAG = "SysUpdatePrefContr";
@@ -55,7 +58,7 @@
         return mContext.getResources().getBoolean(R.bool.config_show_system_update_settings)
                 && mUm.isAdminUser()
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -84,9 +87,19 @@
 
     @Override
     public CharSequence getSummary() {
-        final Bundle updateInfo = mUpdateManager.retrieveSystemUpdateInfo();
         CharSequence summary = mContext.getString(R.string.android_version_summary,
                 Build.VERSION.RELEASE);
+        final FutureTask<Bundle> bundleFutureTask = new FutureTask<>(
+                // Put the API call in a future to avoid StrictMode violation.
+                () -> mUpdateManager.retrieveSystemUpdateInfo());
+        final Bundle updateInfo;
+        try {
+            bundleFutureTask.run();
+            updateInfo = bundleFutureTask.get();
+        } catch (InterruptedException | ExecutionException e) {
+            Log.w(TAG, "Error getting system update info.");
+            return summary;
+        }
         switch (updateInfo.getInt(SystemUpdateManager.KEY_STATUS)) {
             case SystemUpdateManager.STATUS_WAITING_DOWNLOAD:
             case SystemUpdateManager.STATUS_IN_PROGRESS:
diff --git a/src/com/android/settings/widget/PreferenceCategoryController.java b/src/com/android/settings/widget/PreferenceCategoryController.java
index c6477f3..7b52be0 100644
--- a/src/com/android/settings/widget/PreferenceCategoryController.java
+++ b/src/com/android/settings/widget/PreferenceCategoryController.java
@@ -43,7 +43,7 @@
     @Override
     public int getAvailabilityStatus() {
         if (mChildren == null || mChildren.isEmpty()) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         // Category is available if any child is available
         for (AbstractPreferenceController controller : mChildren) {
@@ -51,7 +51,7 @@
                 return AVAILABLE;
             }
         }
-        return DISABLED_UNSUPPORTED;
+        return CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index e995c31..79196f1 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -220,6 +220,7 @@
         mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
         mHiddenSettingsSpinner.setOnItemSelectedListener(this);
+        mHiddenSettingsSpinner.setVisibility(View.GONE);
         mHiddenSettingsSpinner.setEnabled(false);
         mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);
         mHiddenWarningView.setVisibility(
@@ -240,6 +241,7 @@
             showProxyFields();
             mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
             // Hidden option can be changed only when the user adds a network manually.
+            mHiddenSettingsSpinner.setVisibility(View.VISIBLE);
             mHiddenSettingsSpinner.setEnabled(true);
             ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox))
                     .setOnCheckedChangeListener(this);
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index cdb9292..fc71d74 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -160,15 +160,14 @@
                 setSwitchBarChecked(false);
                 mSwitchWidget.setEnabled(true);
         }
-        if (mayDisableTethering(!mSwitchWidget.isChecked())) {
-            if (RestrictedLockUtils.hasBaseUserRestriction(mContext,
-                    UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId())) {
-                mSwitchWidget.setEnabled(false);
-            } else {
-                final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
-                    UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
-                mSwitchWidget.setDisabledByAdmin(admin);
-            }
+
+        if (RestrictedLockUtils.hasBaseUserRestriction(mContext,
+                UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId())) {
+            mSwitchWidget.setEnabled(false);
+        } else {
+            final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
+                UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
+            mSwitchWidget.setDisabledByAdmin(admin);
         }
     }
 
@@ -203,15 +202,11 @@
         // Show toast message if Wi-Fi is not allowed in airplane mode
         if (isChecked && !WirelessUtils.isRadioAllowed(mContext, Settings.Global.RADIO_WIFI)) {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
-            // Reset switch to off. No infinite check/listenenr loop.
+            // Reset switch to off. No infinite check/listener loop.
             mSwitchWidget.setChecked(false);
             return false;
         }
 
-        // Disable tethering if enabling Wifi
-        if (mayDisableTethering(isChecked)) {
-            mConnectivityManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
-        }
         if (isChecked) {
             mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_WIFI_ON);
         } else {
@@ -226,10 +221,4 @@
         }
         return true;
     }
-
-    private boolean mayDisableTethering(boolean isChecked) {
-        final int wifiApState = mWifiManager.getWifiApState();
-        return isChecked && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
-            (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED));
-    }
 }
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
new file mode 100644
index 0000000..7213148
--- /dev/null
+++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
@@ -0,0 +1,363 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.calling;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.PersistableBundle;
+import android.support.v4.graphics.drawable.IconCompat;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.ims.ImsManager;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.slices.SliceBroadcastReceiver;
+import com.android.settings.slices.SliceBuilderUtils;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+
+/**
+ * Helper class to control slices for wifi calling settings.
+ */
+public class WifiCallingSliceHelper {
+
+    private static final String TAG = "WifiCallingSliceHelper";
+
+    /**
+     * Settings slice path to wifi calling setting.
+     */
+    public static final String PATH_WIFI_CALLING = "wifi_calling";
+
+    /**
+     * Action passed for changes to wifi calling slice (toggle).
+     */
+    public static final String ACTION_WIFI_CALLING_CHANGED =
+            "com.android.settings.wifi.calling.action.WIFI_CALLING_CHANGED";
+
+    /**
+     * Action for Wifi calling Settings activity which
+     * allows setting configuration for Wifi calling
+     * related settings
+     */
+    public static final String ACTION_WIFI_CALLING_SETTINGS_ACTIVITY =
+            "android.settings.WIFI_CALLING_SETTINGS";
+
+    /**
+     * Timeout for querying wifi calling setting from ims manager.
+     */
+    private static final int TIMEOUT_MILLIS = 2000;
+
+    /**
+     * Time for which data contained in the slice can remain fresh.
+     */
+    private static final int SLICE_TTL_MILLIS = 60000;
+
+    protected SubscriptionManager mSubscriptionManager;
+    private final Context mContext;
+
+    @VisibleForTesting
+    public WifiCallingSliceHelper(Context context) {
+        mContext = context;
+    }
+
+    /**
+     * Returns Slice object for wifi calling settings.
+     *
+     * If wifi calling is being turned on and if wifi calling activation is needed for the current
+     * carrier, this method will return Slice with instructions to go to Settings App.
+     *
+     * If wifi calling is not supported for the current carrier, this method will return slice with
+     * not supported message.
+     *
+     * If wifi calling setting can be changed, this method will return the slice to toggle wifi
+     * calling option with ACTION_WIFI_CALLING_CHANGED as endItem.
+     */
+    public Slice createWifiCallingSlice(Uri sliceUri) {
+        final int subId = getDefaultVoiceSubId();
+        final String carrierName = getSimCarrierName();
+
+        if (subId <= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            Log.d(TAG, "Invalid subscription Id");
+            return getNonActionableWifiCallingSlice(
+                    mContext.getString(R.string.wifi_calling_settings_title),
+                    mContext.getString(R.string.wifi_calling_not_supported, carrierName),
+                    sliceUri, SliceBuilderUtils.getSettingsIntent(mContext));
+        }
+
+        final ImsManager imsManager = getImsManager(subId);
+
+        if (!imsManager.isWfcEnabledByPlatform()
+                || !imsManager.isWfcProvisionedOnDevice()) {
+            Log.d(TAG, "Wifi calling is either not provisioned or not enabled by Platform");
+            return getNonActionableWifiCallingSlice(
+                    mContext.getString(R.string.wifi_calling_settings_title),
+                    mContext.getString(R.string.wifi_calling_not_supported, carrierName),
+                    sliceUri, SliceBuilderUtils.getSettingsIntent(mContext));
+        }
+
+        try {
+            final boolean isWifiCallingEnabled = isWifiCallingEnabled(imsManager);
+            final Intent activationAppIntent =
+                    getWifiCallingCarrierActivityIntent(subId);
+
+            // Send this actionable wifi calling slice to toggle the setting
+            // only when there is no need for wifi calling activation with the server
+            if (activationAppIntent != null && !isWifiCallingEnabled) {
+                Log.d(TAG, "Needs Activation");
+                // Activation needed for the next action of the user
+                // Give instructions to go to settings app
+                return getNonActionableWifiCallingSlice(
+                        mContext.getString(R.string.wifi_calling_settings_title),
+                        mContext.getString(
+                                R.string.wifi_calling_settings_activation_instructions),
+                        sliceUri, getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+            }
+            return getWifiCallingSlice(sliceUri, mContext, isWifiCallingEnabled);
+        } catch (InterruptedException | TimeoutException | ExecutionException e) {
+            Log.e(TAG, "Unable to read the current WiFi calling status", e);
+            return getNonActionableWifiCallingSlice(
+                    mContext.getString(R.string.wifi_calling_settings_title),
+                    mContext.getString(R.string.wifi_calling_turn_on),
+                    sliceUri, getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+        }
+    }
+
+    private boolean isWifiCallingEnabled(ImsManager imsManager)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        final FutureTask<Boolean> isWifiOnTask = new FutureTask<>(new Callable<Boolean>() {
+            @Override
+            public Boolean call() {
+                return imsManager.isWfcEnabledByUser();
+            }
+        });
+        final ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(isWifiOnTask);
+
+        Boolean isWifiEnabledByUser = false;
+        isWifiEnabledByUser = isWifiOnTask.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+
+        return isWifiEnabledByUser && imsManager.isNonTtyOrTtyOnVolteEnabled();
+    }
+
+    /**
+     * Builds a toggle slice where the intent takes you to the wifi calling page and the toggle
+     * enables/disables wifi calling.
+     */
+    private Slice getWifiCallingSlice(Uri sliceUri, Context mContext,
+            boolean isWifiCallingEnabled) {
+
+        final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
+        final String title = mContext.getString(R.string.wifi_calling_settings_title);
+        return new ListBuilder(mContext, sliceUri, SLICE_TTL_MILLIS)
+                .setColor(R.color.material_blue_500)
+                .addRow(b -> b
+                        .setTitle(title)
+                        .addEndItem(
+                                new SliceAction(
+                                        getBroadcastIntent(ACTION_WIFI_CALLING_CHANGED),
+                                        null /* actionTitle */, isWifiCallingEnabled))
+                        .setPrimaryAction(new SliceAction(
+                                getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY),
+                                icon,
+                                title)))
+                .build();
+    }
+
+    protected ImsManager getImsManager(int subId) {
+        return ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(subId));
+    }
+
+    private Integer getWfcMode(ImsManager imsManager)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        FutureTask<Integer> wfcModeTask = new FutureTask<>(new Callable<Integer>() {
+            @Override
+            public Integer call() {
+                return imsManager.getWfcMode(false);
+            }
+        });
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(wfcModeTask);
+        return wfcModeTask.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Handles wifi calling setting change from wifi calling slice and posts notification. Should be
+     * called when intent action is ACTION_WIFI_CALLING_CHANGED. Executed in @WorkerThread
+     *
+     * @param intent action performed
+     */
+    public void handleWifiCallingChanged(Intent intent) {
+        final int subId = getDefaultVoiceSubId();
+
+        if (subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            final ImsManager imsManager = getImsManager(subId);
+            if (imsManager.isWfcEnabledByPlatform()
+                    || imsManager.isWfcProvisionedOnDevice()) {
+                final boolean currentValue = imsManager.isWfcEnabledByUser()
+                        && imsManager.isNonTtyOrTtyOnVolteEnabled();
+                final boolean newValue = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
+                        currentValue);
+                final Intent activationAppIntent =
+                        getWifiCallingCarrierActivityIntent(subId);
+                if (!newValue || activationAppIntent == null) {
+                    // If either the action is to turn off wifi calling setting
+                    // or there is no activation involved - Update the setting
+                    if (newValue != currentValue) {
+                        imsManager.setWfcSetting(newValue);
+                    }
+                }
+            }
+        }
+        // notify change in slice in any case to get re-queried. This would result in displaying
+        // appropriate message with the updated setting.
+        final Uri uri = SliceBuilderUtils.getUri(PATH_WIFI_CALLING, false /*isPlatformSlice*/);
+        mContext.getContentResolver().notifyChange(uri, null);
+    }
+
+    /**
+     * Returns Slice with the title and subtitle provided as arguments with wifi signal Icon.
+     *
+     * @param title Title of the slice
+     * @param subtitle Subtitle of the slice
+     * @param sliceUri slice uri
+     * @return Slice with title and subtitle
+     */
+    // TODO(b/79548264) asses different scenarios and return null instead of non-actionable slice
+    private Slice getNonActionableWifiCallingSlice(String title, String subtitle, Uri sliceUri,
+            PendingIntent primaryActionIntent) {
+        final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
+        return new ListBuilder(mContext, sliceUri, SLICE_TTL_MILLIS)
+                .setColor(R.color.material_blue_500)
+                .addRow(b -> b
+                        .setTitle(title)
+                        .setSubtitle(subtitle)
+                        .setPrimaryAction(new SliceAction(
+                                primaryActionIntent, icon,
+                                title)))
+                .build();
+    }
+
+    /**
+     * Returns {@code true} when the key is enabled for the carrier, and {@code false} otherwise.
+     */
+    private boolean isCarrierConfigManagerKeyEnabled(Context mContext, String key,
+            int subId, boolean defaultValue) {
+        final CarrierConfigManager configManager = getCarrierConfigManager(mContext);
+        boolean ret = false;
+        if (configManager != null) {
+            final PersistableBundle bundle = configManager.getConfigForSubId(subId);
+            if (bundle != null) {
+                ret = bundle.getBoolean(key, defaultValue);
+            }
+        }
+        return ret;
+    }
+
+    protected CarrierConfigManager getCarrierConfigManager(Context mContext) {
+        return mContext.getSystemService(CarrierConfigManager.class);
+    }
+
+    /**
+     * Returns the current default voice subId obtained from SubscriptionManager
+     */
+    protected int getDefaultVoiceSubId() {
+        if (mSubscriptionManager == null) {
+            mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
+        }
+        return SubscriptionManager.getDefaultVoiceSubscriptionId();
+    }
+
+    /**
+     * Returns Intent of the activation app required to activate wifi calling or null if there is no
+     * need for activation.
+     */
+    protected Intent getWifiCallingCarrierActivityIntent(int subId) {
+        final CarrierConfigManager configManager = getCarrierConfigManager(mContext);
+        if (configManager == null) {
+            return null;
+        }
+
+        final PersistableBundle bundle = configManager.getConfigForSubId(subId);
+        if (bundle == null) {
+            return null;
+        }
+
+        final String carrierApp = bundle.getString(
+                CarrierConfigManager.KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING);
+        if (TextUtils.isEmpty(carrierApp)) {
+            return null;
+        }
+
+        final ComponentName componentName = ComponentName.unflattenFromString(carrierApp);
+        if (componentName == null) {
+            return null;
+        }
+
+        final Intent intent = new Intent();
+        intent.setComponent(componentName);
+        return intent;
+    }
+
+    private PendingIntent getBroadcastIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.setClass(mContext, SliceBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    /**
+     * Returns PendingIntent to start activity specified by action
+     */
+    private PendingIntent getActivityIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+    }
+
+    /**
+     * Returns carrier id name of the current Subscription
+     */
+    private String getSimCarrierName() {
+        final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+        final CharSequence carrierName = telephonyManager.getSimCarrierIdName();
+        if (carrierName == null) {
+            return mContext.getString(R.string.carrier);
+        }
+        return carrierName.toString();
+    }
+
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index f710613..4f7b3ba 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -106,7 +106,7 @@
 
     void startTether() {
         mSwitchBar.setEnabled(false);
-        mConnectivityManager.startTethering(TETHERING_WIFI, false /* showProvisioningUi */,
+        mConnectivityManager.startTethering(TETHERING_WIFI, true /* showProvisioningUi */,
                 mOnStartTetheringCallback, new Handler(Looper.getMainLooper()));
     }
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index f257f54..490a38e 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -18,7 +18,16 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
+import android.os.Bundle;
+import android.os.Vibrator;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -26,6 +35,8 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
@@ -38,11 +49,38 @@
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = RuntimeEnvironment.application;
         final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
-            .getNonIndexableKeys(context);
+                .getNonIndexableKeys(context);
         final List<String> keys = new ArrayList<>();
 
         keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings));
 
         assertThat(keys).containsAllIn(niks);
     }
-}
\ No newline at end of file
+
+    @Test
+    public void testUpdateVibrationSummary_shouldUpdateSummary() {
+        MockitoAnnotations.initMocks(this);
+        final Context mContext = RuntimeEnvironment.application;
+        final AccessibilitySettings mSettings = spy(new AccessibilitySettings());
+
+        final Preference mVibrationPreferenceScreen = new Preference(mContext);
+        doReturn(mVibrationPreferenceScreen).when(mSettings).findPreference(anyString());
+
+        doReturn(mContext).when(mSettings).getContext();
+
+        mVibrationPreferenceScreen.setKey("vibration_preference_screen");
+
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
+                Vibrator.VIBRATION_INTENSITY_OFF);
+
+        Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.HAPTIC_FEEDBACK_INTENSITY,
+                Vibrator.VIBRATION_INTENSITY_OFF);
+
+        mSettings.updateVibrationSummary(mVibrationPreferenceScreen);
+        assertThat(mVibrationPreferenceScreen.getSummary()).isEqualTo(
+                VibrationIntensityPreferenceController.getIntensityString(mContext,
+                        Vibrator.VIBRATION_INTENSITY_OFF));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java
index fe6d1a3..8392412 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.accessibility;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -30,7 +30,6 @@
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 
-import com.android.settings.accessibility.AccessibilitySlicePreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
@@ -85,7 +84,7 @@
         AccessibilitySlicePreferenceController controller =
                 new AccessibilitySlicePreferenceController(mContext, "fake_service/name");
 
-        assertThat(controller.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
index f87be57..72893b7 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
@@ -80,7 +80,7 @@
         doReturn(false).when(mController).isBandwidthControlEnabled();
 
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
index 64ad32b..5298fcd 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
@@ -91,7 +91,7 @@
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
 
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -101,7 +101,7 @@
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
 
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -110,7 +110,7 @@
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index e8e4032..97007f8 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.appinfo;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -84,7 +85,8 @@
         mController.capable = false;
         when(mUserManager.isManagedProfile()).thenReturn(false);
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                mController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -110,9 +112,9 @@
     public void handlePreferenceTreeClick_shouldStartDefaultAppSettings() {
         mController.handlePreferenceTreeClick(mPreference);
 
-        verify(mContext).startActivity(argThat(intent-> intent != null
+        verify(mContext).startActivity(argThat(intent -> intent != null
                 && intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT).equals(
-                        DefaultAppSettings.class.getName())
+                DefaultAppSettings.class.getName())
                 && intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
                 .getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY).equals("TestKey")));
     }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
index 0a54b82..e6cc831 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
@@ -71,7 +71,7 @@
         mController.setPackageName(null);
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -79,7 +79,7 @@
         mController.setPackageName(TEST_INTENT.getStringExtra(EXTRA_PACKAGE_NAME));
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -88,7 +88,7 @@
         mController.setPackageName(TEST_INTENT.getStringExtra(EXTRA_PACKAGE_NAME));
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index fbc698c..ced8fc4 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -15,11 +15,11 @@
  */
 package com.android.settings.bluetooth;
 
-import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
-
 import android.media.AudioManager;
+
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -73,6 +73,7 @@
     private AvailableMediaBluetoothDeviceUpdater mBluetoothDeviceUpdater;
     private Collection<CachedBluetoothDevice> cachedDevices;
     private ShadowAudioManager mShadowAudioManager;
+    private BluetoothDevicePreference mPreference;
 
     @Before
     public void setUp() {
@@ -93,6 +94,7 @@
         mBluetoothDeviceUpdater = spy(new AvailableMediaBluetoothDeviceUpdater(mDashboardFragment,
                 mDevicePreferenceCallback, mLocalManager));
         mBluetoothDeviceUpdater.setPrefContext(mContext);
+        mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
         doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
         doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
     }
@@ -150,62 +152,70 @@
     }
 
     @Test
-    public void onConnectionStateChanged_a2dpDeviceConnected_notInCall_addPreference() {
+    public void onProfileConnectionStateChanged_a2dpDeviceConnected_notInCall_addPreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
     }
 
     @Test
-    public void onConnectionStateChanged_a2dpDeviceConnected_inCall_removePreference() {
+    public void onProfileConnectionStateChanged_a2dpDeviceConnected_inCall_removePreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
+
     @Test
-    public void onConnectionStateChanged_hfpDeviceConnected_notInCall_removePreference() {
+    public void onProfileConnectionStateChanged_hfpDeviceConnected_notInCall_removePreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
 
     @Test
-    public void onConnectionStateChanged_hfpDeviceConnected_inCall_addPreference() {
+    public void onProfileConnectionStateChanged_hfpDeviceConnected_inCall_addPreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
     }
 
     @Test
-    public void onConnectionStateChanged_deviceDisconnected_removePreference() {
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_DISCONNECTED);
+    public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
+
+    @Test
+    public void onClick_Preference_setActive() {
+        mBluetoothDeviceUpdater.onPreferenceClick(mPreference);
+
+        verify(mCachedBluetoothDevice).setActive();
+    }
 }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index 53fc1e6..2f77af6 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -156,6 +156,11 @@
         }
 
         @Override
+        public int getProfileId() {
+            return 0;
+        }
+
+        @Override
         public int getOrdinal() {
             return 0;
         }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index 56e638a..483df01 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -16,6 +16,7 @@
 package com.android.settings.bluetooth;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -23,11 +24,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
-
 import android.media.AudioManager;
+
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -75,6 +76,7 @@
 
     private Collection<CachedBluetoothDevice> cachedDevices;
     private ShadowAudioManager mShadowAudioManager;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
@@ -151,60 +153,61 @@
     }
 
     @Test
-    public void onConnectionStateChanged_a2dpDeviceConnected_inCall_addPreference() {
+    public void onProfileConnectionStateChanged_a2dpDeviceConnected_inCall_addPreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
     }
 
     @Test
-    public void onConnectionStateChanged_a2dpDeviceConnected_notInCall_removePreference() {
+    public void onProfileConnectionStateChanged_a2dpDeviceConnected_notInCall_removePreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
+
     @Test
-    public void onConnectionStateChanged_hfpDeviceConnected_inCall_removePreference() {
+    public void onProfileConnectionStateChanged_hfpDeviceConnected_inCall_removePreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
 
     @Test
-    public void onConnectionStateChanged_hfpDeviceConnected_notInCall_addPreference() {
+    public void onProfileConnectionStateChanged_hfpDeviceConnected_notInCall_addPreference() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
         when(mBluetoothDeviceUpdater.
                 isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
         when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
 
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_CONNECTED);
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
     }
 
     @Test
-    public void onConnectionStateChanged_deviceDisconnected_removePreference() {
-        mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
-                BluetoothAdapter.STATE_DISCONNECTED);
+    public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index e0ba829..547727b 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 
@@ -57,7 +57,8 @@
     private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
 
     private Context mContext;
-    private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
+    private SavedBluetoothDeviceUpdater mBluetoothDeviceUpdater;
+    private BluetoothDevicePreference mPreference;
 
     @Before
     public void setUp() {
@@ -71,12 +72,13 @@
         mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mDashboardFragment,
                 mDevicePreferenceCallback, mLocalManager));
         mBluetoothDeviceUpdater.setPrefContext(mContext);
+        mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
         doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
         doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
     }
 
     @Test
-    public void testUpdate_filterMatch_addPreference() {
+    public void update_filterMatch_addPreference() {
         doReturn(BluetoothDevice.BOND_BONDED).when(mBluetoothDevice).getBondState();
         doReturn(false).when(mBluetoothDevice).isConnected();
 
@@ -86,7 +88,7 @@
     }
 
     @Test
-    public void testUpdate_filterNotMatch_removePreference() {
+    public void update_filterNotMatch_removePreference() {
         doReturn(BluetoothDevice.BOND_NONE).when(mBluetoothDevice).getBondState();
         doReturn(true).when(mBluetoothDevice).isConnected();
 
@@ -96,18 +98,25 @@
     }
 
     @Test
-    public void testOnConnectionStateChanged_deviceConnected_removePreference() {
-        mBluetoothDeviceUpdater
-            .onConnectionStateChanged(mCachedBluetoothDevice, BluetoothAdapter.STATE_CONNECTED);
+    public void onProfileConnectionStateChanged_deviceConnected_removePreference() {
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
     }
 
     @Test
-    public void testOnConnectionStateChanged_deviceDisconnected_addPreference() {
-        mBluetoothDeviceUpdater
-            .onConnectionStateChanged(mCachedBluetoothDevice, BluetoothAdapter.STATE_DISCONNECTED);
+    public void onProfileConnectionStateChanged_deviceDisconnected_addPreference() {
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
 
         verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
     }
+
+    @Test
+    public void onClick_Preference_setConnect() {
+        mBluetoothDeviceUpdater.onPreferenceClick(mPreference);
+
+        verify(mCachedBluetoothDevice).connect(true);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
index 15872d1..ecf024b 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
@@ -16,7 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -121,7 +121,7 @@
     public void addDevice_Availability_UnSupported() {
         mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
         assertThat(mAddDevicePreferenceController.getAvailabilityStatus())
-                .isEqualTo(DISABLED_UNSUPPORTED);
+                .isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
index 4e6d5e5..aeab451 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
@@ -16,9 +16,10 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
@@ -27,14 +28,21 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.media.AudioManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowAudioManager;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.BluetoothCallback;
+import com.android.settingslib.bluetooth.BluetoothEventManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,8 +51,13 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {
+        ShadowAudioManager.class,
+        ShadowBluetoothUtils.class}
+)
 public class AvailableMediaDeviceGroupControllerTest {
 
     private static final String PREFERENCE_KEY_1 = "pref_key_1";
@@ -59,11 +72,17 @@
     private PreferenceManager mPreferenceManager;
     @Mock
     private PackageManager mPackageManager;
+    @Mock
+    private BluetoothEventManager mEventManager;
+    @Mock
+    private LocalBluetoothManager mLocalManager;
 
     private PreferenceGroup mPreferenceGroup;
     private Context mContext;
     private Preference mPreference;
     private AvailableMediaDeviceGroupController mAvailableMediaDeviceGroupController;
+    private LocalBluetoothManager mLocalBluetoothManager;
+    private ShadowAudioManager mShadowAudioManager;
 
     @Before
     public void setUp() {
@@ -78,6 +97,11 @@
         doReturn(mPackageManager).when(mContext).getPackageManager();
         doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
 
+        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager;
+        mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext);
+        mShadowAudioManager = ShadowAudioManager.getShadow();
+        doReturn(mEventManager).when(mLocalBluetoothManager).getEventManager();
+
         mAvailableMediaDeviceGroupController = new AvailableMediaDeviceGroupController(mContext);
         mAvailableMediaDeviceGroupController.
                 setBluetoothDeviceUpdater(mAvailableMediaBluetoothDeviceUpdater);
@@ -127,6 +151,8 @@
         // register the callback in onStart()
         mAvailableMediaDeviceGroupController.onStart();
         verify(mAvailableMediaBluetoothDeviceUpdater).registerCallback();
+        verify(mLocalBluetoothManager.getEventManager()).registerCallback(
+                any(BluetoothCallback.class));
     }
 
     @Test
@@ -134,6 +160,8 @@
         // unregister the callback in onStop()
         mAvailableMediaDeviceGroupController.onStop();
         verify(mAvailableMediaBluetoothDeviceUpdater).unregisterCallback();
+        verify(mLocalBluetoothManager.getEventManager()).unregisterCallback(
+                any(BluetoothCallback.class));
     }
 
     @Test
@@ -141,7 +169,7 @@
         doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
 
         assertThat(mAvailableMediaDeviceGroupController.getAvailabilityStatus()).isEqualTo(
-                DISABLED_UNSUPPORTED);
+                UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -151,4 +179,22 @@
         assertThat(mAvailableMediaDeviceGroupController.getAvailabilityStatus()).isEqualTo(
                 AVAILABLE);
     }
+
+    @Test
+    public void setTitle_inCallState_showCallStateTitle() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        mAvailableMediaDeviceGroupController.onAudioModeChanged();
+
+        assertThat(mPreferenceGroup.getTitle()).isEqualTo(
+                mContext.getText(R.string.connected_device_available_call_title));
+    }
+
+    @Test
+    public void setTitle_notInCallState_showMediaStateTitle() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        mAvailableMediaDeviceGroupController.onAudioModeChanged();
+
+        assertThat(mPreferenceGroup.getTitle()).isEqualTo(
+                mContext.getText(R.string.connected_device_available_media_title));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
index 12fca1e..83763bb 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
@@ -54,7 +54,7 @@
     @Test
     public void getAvailabilityStatus_offWhenDisabled() {
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index 3039895..718acb9 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -16,7 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -39,7 +39,6 @@
 import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -157,7 +156,7 @@
         mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
 
         assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
-                DISABLED_UNSUPPORTED);
+                UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
index 71c1010..2e40bf5 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
@@ -16,7 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.doReturn;
@@ -91,7 +91,7 @@
     public void testGetAvailabilityStatus_noBluetoothFeature_returnUnSupported() {
         doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
         assertThat(mSavedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
-                DISABLED_UNSUPPORTED);
+                UNSUPPORTED_ON_DEVICE);
     }
     @Test
     public void testGetAvailabilityStatus_BluetoothFeature_returnSupported() {
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
index 3074d9e..eec4e37 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
@@ -16,10 +16,10 @@
 package com.android.settings.core;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
 import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
-import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyString;
@@ -73,8 +73,16 @@
     }
 
     @Test
-    public void isAvailable_availableStatusUnsupported_returnsFalse() {
-        mPreferenceController.setAvailability(DISABLED_UNSUPPORTED);
+    public void isAvailable_availableStatusUnsupportedOnDevice_returnsFalse() {
+        mPreferenceController.setAvailability(UNSUPPORTED_ON_DEVICE);
+
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+
+    @Test
+    public void isAvailable_availableStatusConditionallyUnavailable_returnsFalse() {
+        mPreferenceController.setAvailability(CONDITIONALLY_UNAVAILABLE);
 
         assertThat(mPreferenceController.isAvailable()).isFalse();
     }
@@ -94,13 +102,6 @@
     }
 
     @Test
-    public void isAvailable_availableStatusUnavailable_returnsFalse() {
-        mPreferenceController.setAvailability(UNAVAILABLE_UNKNOWN);
-
-        assertThat(mPreferenceController.isAvailable()).isFalse();
-    }
-
-    @Test
     public void isSupported_availableStatusAvailable_returnsTrue() {
         mPreferenceController.setAvailability(AVAILABLE);
 
@@ -109,7 +110,7 @@
 
     @Test
     public void isSupported_availableStatusUnsupported_returnsFalse() {
-        mPreferenceController.setAvailability(DISABLED_UNSUPPORTED);
+        mPreferenceController.setAvailability(UNSUPPORTED_ON_DEVICE);
 
         assertThat(mPreferenceController.isSupported()).isFalse();
     }
@@ -129,13 +130,6 @@
     }
 
     @Test
-    public void isSupported_availableStatusUnavailable_returnsTrue() {
-        mPreferenceController.setAvailability(UNAVAILABLE_UNKNOWN);
-
-        assertThat(mPreferenceController.isSupported()).isTrue();
-    }
-
-    @Test
     public void getSliceType_shouldReturnIntent() {
         assertThat(mPreferenceController.getSliceType()).isEqualTo(SliceData.SliceType.INTENT);
     }
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index 8682ac1..9e5a2b7 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -18,7 +18,8 @@
 
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -342,7 +343,7 @@
 
         when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
         when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
deleted file mode 100644
index bdaad0a..0000000
--- a/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import static com.android.settings.development.BluetoothDelayReportsPreferenceController
-        .BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class BluetoothDelayReportsPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private BluetoothDelayReportsPreferenceController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = spy(new BluetoothDelayReportsPreferenceController(mContext));
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-            .thenReturn(mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void onPreferenceChanged_settingDisabled_turnOnDelayReports() {
-        mController.onPreferenceChange(mPreference, true /* new value */);
-
-        final boolean mode = SystemProperties.getBoolean(
-                BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
-
-        assertThat(mode).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChanged_settingDisabled_turnOffDelayReports() {
-        mController.onPreferenceChange(mPreference, false /* new value */);
-
-        final boolean mode = SystemProperties.getBoolean(
-                BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-    }
-
-    @Test
-    public void updateState_settingDisabled_preferenceShouldBeChecked() {
-        SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY,
-                Boolean.toString(true));
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
-        SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY,
-                Boolean.toString(false));
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsDisabled();
-
-        final boolean mode = SystemProperties.getBoolean(
-                BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-        assertThat(mPreference.isEnabled()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
deleted file mode 100644
index f91bd44..0000000
--- a/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.development;
-
-import static com.android.settings.development.BluetoothInbandRingingPreferenceController.BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class BluetoothInbandRingingPreferenceControllerTest {
-
-    @Mock
-    private SwitchPreference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private Context mContext;
-    private BluetoothInbandRingingPreferenceController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = spy(new BluetoothInbandRingingPreferenceController(mContext));
-        doReturn(true).when(mController).isInbandRingingSupported();
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
-                mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void isAvailable_inbandRingingNotSupported_shouldReturnFalse() {
-        doReturn(false).when(mController).isInbandRingingSupported();
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_inbandRingingSupported_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChanged_settingEnabled_turnOnBluetoothSnoopLog() {
-        mController.onPreferenceChange(mPreference, true /* new value */);
-
-        final boolean mode = SystemProperties
-            .getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
-
-        assertThat(mode).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChanged_settingDisabled_turnOffBluetoothSnoopLog() {
-        mController.onPreferenceChange(mPreference, false /* new value */);
-
-        final boolean mode = SystemProperties
-            .getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-    }
-
-    @Test
-    public void updateState_settingEnabled_preferenceShouldBeChecked() {
-        SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, Boolean.toString(true));
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
-        SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, Boolean.toString(false));
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsDisabled();
-
-        final boolean mode = SystemProperties
-            .getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index 9272b46..da32ce8 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -131,7 +131,6 @@
     @Config(shadows = {
             ShadowPictureColorModePreferenceController.class,
             ShadowAdbPreferenceController.class,
-            ShadowBluetoothInbandRingingPreferenceController.class,
             ShadowClearAdbKeysPreferenceController.class
     })
     public void searchIndex_pageEnabled_shouldNotAddKeysToNonIndexable() {
@@ -282,15 +281,6 @@
         }
     }
 
-    @Implements(BluetoothInbandRingingPreferenceController.class)
-    public static class ShadowBluetoothInbandRingingPreferenceController {
-
-        @Implementation
-        public boolean isAvailable() {
-            return true;
-        }
-    }
-
     @Implements(ClearAdbKeysPreferenceController.class)
     public static class ShadowClearAdbKeysPreferenceController {
 
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index e1c4b70..624b07f 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -77,7 +77,7 @@
         when(mConfig.alwaysOnAvailableForUser(anyInt())).thenReturn(false);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                AmbientDisplayAlwaysOnPreferenceController.DISABLED_UNSUPPORTED);
+                AmbientDisplayAlwaysOnPreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
index 5815f42..f0ce95f 100644
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -104,7 +104,7 @@
     @Test
     public void testGetAvailabilityStatus() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
-                .DISABLED_UNSUPPORTED);
+                .CONDITIONALLY_UNAVAILABLE);
 
         enableAutoRotationPreference();
 
@@ -114,7 +114,7 @@
         disableAutoRotationPreference();
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
-                .DISABLED_UNSUPPORTED);
+                .CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
index 8df4a31..6942fd8 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
@@ -22,6 +22,7 @@
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
+import com.android.settingslib.drawer.CategoryKey;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -45,4 +46,10 @@
 
         assertThat(indexedXml).contains(R.xml.night_display_settings);
     }
+
+    @Test
+    public void getCategoryKey_isCategoryNightDisplay() {
+        NightDisplaySettings settings = new NightDisplaySettings();
+        assertThat(settings.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NIGHT_DISPLAY);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
index 441f5b6..730b833 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.fingerprint;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
@@ -84,7 +84,7 @@
     public void getAvailabilityStatus_noFingerprintManger_DISABLED() {
         when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
index 241f550..c66e6aa 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
@@ -91,7 +91,7 @@
         doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.DISABLED_UNSUPPORTED);
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 3fdbe83..4583dd1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -15,8 +15,11 @@
  */
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -70,14 +73,14 @@
     }
 
     @Test
-    public void testOnReceive_batteryDataChanged_dataUpdated() {
+    public void testOnReceive_batteryLevelChanged_dataUpdated() {
         mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
 
         assertThat(mBatteryBroadcastReceiver.mBatteryLevel)
             .isEqualTo(Utils.getBatteryPercentage(mChargingIntent));
         assertThat(mBatteryBroadcastReceiver.mBatteryStatus)
             .isEqualTo(Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
-        verify(mBatteryListener).onBatteryChanged();
+        verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_LEVEL);
     }
 
     @Test
@@ -85,7 +88,7 @@
         mBatteryBroadcastReceiver.onReceive(mContext,
                 new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
 
-        verify(mBatteryListener).onBatteryChanged();
+        verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_SAVER);
     }
 
     @Test
@@ -100,7 +103,7 @@
 
         assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(batteryLevel);
         assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(batteryStatus);
-        verify(mBatteryListener, never()).onBatteryChanged();
+        verify(mBatteryListener, never()).onBatteryChanged(anyInt());
     }
 
     @Test
@@ -115,6 +118,6 @@
         assertThat(mBatteryBroadcastReceiver.mBatteryStatus)
             .isEqualTo(Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
         // 2 times because register will force update the battery
-        verify(mBatteryListener, times(2)).onBatteryChanged();
+        verify(mBatteryListener, times(2)).onBatteryChanged(BatteryUpdateType.MANUAL);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index dc34016..4fd3a82 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -581,18 +581,6 @@
     }
 
     @Test
-    public void testIsAppHeavilyUsed_usageMoreThanThreshold_returnTrue() {
-        assertThat(mBatteryUtils.isAppHeavilyUsed(mBatteryStatsHelper, mUserManager, UID,
-                10 /* threshold */ )).isTrue();
-    }
-
-    @Test
-    public void testIsAppHeavilyUsed_usageLessThanThreshold_returnFalse() {
-        assertThat(mBatteryUtils.isAppHeavilyUsed(mBatteryStatsHelper, mUserManager, UID,
-                DISCHARGE_AMOUNT /* threshold */ )).isFalse();
-    }
-
-    @Test
     public void testShouldHideAnomaly_systemAppWithLauncher_returnTrue() {
         final List<ResolveInfo> resolveInfos = new ArrayList<>();
         final ResolveInfo resolveInfo = new ResolveInfo();
@@ -624,6 +612,14 @@
     }
 
     @Test
+    public void testShouldHideAnomaly_AppInDozeList_returnTrue() {
+        doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
+        doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(new String[]{HIGH_SDK_PACKAGE});
+
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID)).isTrue();
+    }
+
+    @Test
     public void testShouldHideAnomaly_normalApp_returnFalse() {
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index 8029c55..1817325 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -18,27 +18,49 @@
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import android.app.AppOpsManager;
 import android.content.Context;
+import android.content.DialogInterface;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
 
 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;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 public class HighPowerDetailTest {
+    private static final int TEST_UID = 12000;
+    private static final String TEST_PACKAGE = "com.test.package";
 
     private FakeFeatureFactory mFeatureFactory;
+    private HighPowerDetail mFragment;
+
+    @Mock
+    private PowerWhitelistBackend mPowerWhitelistBackend;
+    @Mock
+    private BatteryUtils mBatteryUtils;
 
     @Before
     public void setUp() {
         mFeatureFactory = FakeFeatureFactory.setupForTest();
+
+        MockitoAnnotations.initMocks(this);
+        mFragment = spy(new HighPowerDetail());
+        mFragment.mBackend = mPowerWhitelistBackend;
+        mFragment.mBatteryUtils = mBatteryUtils;
+        mFragment.mPackageUid = TEST_UID;
+        mFragment.mPackageName = TEST_PACKAGE;
     }
 
     @Test
@@ -53,4 +75,13 @@
         verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW), eq("app"));
     }
+
+    @Test
+    public void onClick_appAddedToDozeWhitelist_getsUnrestricted() {
+        mFragment.mIsEnabled = true;
+        when(mPowerWhitelistBackend.isWhitelisted(TEST_PACKAGE)).thenReturn(false);
+        mFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
+        verify(mBatteryUtils).setForceAppStandby(TEST_UID, TEST_PACKAGE,
+                AppOpsManager.MODE_ALLOWED);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index 4a905b4..9b61e5f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -18,6 +18,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -86,7 +87,7 @@
     @Test
     public void testOptionsMenu_menuAppToggle_metricEventInvoked() {
         mFragment.mShowAllApps = false;
-        doNothing().when(mFragment).restartBatteryStatsLoader();
+        doNothing().when(mFragment).restartBatteryStatsLoader(anyInt());
 
         mFragment.onOptionsItemSelected(mToggleAppsMenu);
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
index d9f572d..eb683c0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
@@ -74,7 +74,7 @@
         }
 
         @Override
-        protected void refreshUi() {
+        protected void refreshUi(int refreshType) {
             // Do nothing
         }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index b48f00e..07341a1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -149,7 +149,7 @@
         mFragment.initFeatureProvider();
         mBatteryMeterView = new BatteryMeterView(mRealContext);
         mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
-        doNothing().when(mFragment).restartBatteryStatsLoader();
+        doNothing().when(mFragment).restartBatteryStatsLoader(anyInt());
         doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();
         doReturn(MENU_ADVANCED_BATTERY).when(mAdvancedPageMenu).getItemId();
 
@@ -317,15 +317,6 @@
     }
 
     @Test
-    public void restartBatteryStatsLoader_notClearHeader_quickUpdateNotInvoked() {
-        mFragment.mBatteryHeaderPreferenceController = mBatteryHeaderPreferenceController;
-
-        mFragment.restartBatteryStatsLoader(false /* clearHeader */);
-
-        verify(mBatteryHeaderPreferenceController, never()).quickUpdateHeaderPreference();
-    }
-
-    @Test
     public void optionsMenu_advancedPageEnabled() {
         when(mFeatureFactory.powerUsageFeatureProvider.isPowerAccountingToggleEnabled())
                 .thenReturn(true);
@@ -360,7 +351,18 @@
         when(mFragment.mBatteryTipPreferenceController.needUpdate()).thenReturn(false);
         mFragment.updateBatteryTipFlag(new Bundle());
 
-        mFragment.refreshUi();
+        mFragment.refreshUi(BatteryBroadcastReceiver.BatteryUpdateType.MANUAL);
+
+        verify(mFragment, never()).restartBatteryTipLoader();
+    }
+
+    @Test
+    public void refreshUi_batteryLevelChanged_doNotUpdateBatteryTip() {
+        mFragment.mBatteryTipPreferenceController = mock(BatteryTipPreferenceController.class);
+        when(mFragment.mBatteryTipPreferenceController.needUpdate()).thenReturn(true);
+        mFragment.updateBatteryTipFlag(new Bundle());
+
+        mFragment.refreshUi(BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_LEVEL);
 
         verify(mFragment, never()).restartBatteryTipLoader();
     }
@@ -371,7 +373,7 @@
         when(mFragment.mBatteryTipPreferenceController.needUpdate()).thenReturn(true);
         mFragment.updateBatteryTipFlag(new Bundle());
 
-        mFragment.refreshUi();
+        mFragment.refreshUi(BatteryBroadcastReceiver.BatteryUpdateType.MANUAL);
 
         verify(mFragment).restartBatteryTipLoader();
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
index b91c5e1..717ba83 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
@@ -103,7 +103,7 @@
         doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.DISABLED_UNSUPPORTED);
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     private void putSmartBatteryValue(int value) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index d6fad34..8df1f21 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -23,11 +23,14 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -37,12 +40,12 @@
 
 import android.app.StatsManager;
 import android.app.job.JobInfo;
+import android.app.job.JobParameters;
 import android.app.job.JobScheduler;
+import android.app.job.JobWorkItem;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
 import android.os.Process;
 import android.os.StatsDimensionsValue;
 import android.os.UserManager;
@@ -52,18 +55,22 @@
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
+import org.robolectric.android.controller.ServiceController;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowJobScheduler;
 
 import java.util.ArrayList;
@@ -71,6 +78,7 @@
 import java.util.concurrent.TimeUnit;
 
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowConnectivityManager.class, ShadowPowerWhitelistBackend.class})
 public class AnomalyDetectionJobServiceTest {
     private static final int UID = 12345;
     private static final String SYSTEM_PACKAGE = "com.android.system";
@@ -81,8 +89,6 @@
     private static final int ANOMALY_TYPE = 6;
     private static final long VERSION_CODE = 15;
     @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
     private UserManager mUserManager;
     @Mock
     private BatteryDatabaseManager mBatteryDatabaseManager;
@@ -92,6 +98,10 @@
     private PowerWhitelistBackend mPowerWhitelistBackend;
     @Mock
     private StatsDimensionsValue mStatsDimensionsValue;
+    @Mock
+    private JobParameters mJobParameters;
+    @Mock
+    private JobWorkItem mJobWorkItem;
 
     private BatteryTipPolicy mPolicy;
     private Bundle mBundle;
@@ -110,11 +120,14 @@
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         when(mBatteryUtils.getAppLongVersionCode(any())).thenReturn(VERSION_CODE);
 
-        mAnomalyDetectionJobService = spy(new AnomalyDetectionJobService());
+        final ServiceController<AnomalyDetectionJobService> controller =
+                Robolectric.buildService(AnomalyDetectionJobService.class);
+        mAnomalyDetectionJobService = spy(controller.get());
+        doNothing().when(mAnomalyDetectionJobService).jobFinished(any(), anyBoolean());
     }
 
     @Test
-    public void testScheduleCleanUp() {
+    public void scheduleCleanUp() {
         AnomalyDetectionJobService.scheduleAnomalyDetection(application, new Intent());
 
         ShadowJobScheduler shadowJobScheduler =
@@ -129,11 +142,11 @@
     }
 
     @Test
-    public void testSaveAnomalyToDatabase_systemWhitelisted_doNotSave() {
+    public void saveAnomalyToDatabase_systemWhitelisted_doNotSave() {
         doReturn(UID).when(mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
-        doReturn(true).when(mPowerWhitelistBackend).isSysWhitelistedExceptIdle(any(String[].class));
+        doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(any(String[].class));
 
-        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper,
+        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
                 mPowerWhitelistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider,
@@ -144,7 +157,7 @@
     }
 
     @Test
-    public void testSaveAnomalyToDatabase_systemApp_doNotSaveButLog() {
+    public void saveAnomalyToDatabase_systemApp_doNotSaveButLog() {
         final ArrayList<String> cookies = new ArrayList<>();
         cookies.add(SUBSCRIBER_COOKIES_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
@@ -154,7 +167,7 @@
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
         doReturn(true).when(mBatteryUtils).shouldHideAnomaly(any(), anyInt());
 
-        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper,
+        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
                 mPowerWhitelistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider,
@@ -170,11 +183,11 @@
     }
 
     @Test
-    public void testSaveAnomalyToDatabase_systemUid_doNotSave() {
+    public void saveAnomalyToDatabase_systemUid_doNotSave() {
         doReturn(Process.SYSTEM_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
-        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper,
+        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
                 mPowerWhitelistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
@@ -185,11 +198,11 @@
     }
 
     @Test
-    public void testSaveAnomalyToDatabase_uidNull_doNotSave() {
+    public void saveAnomalyToDatabase_uidNull_doNotSave() {
         doReturn(AnomalyDetectionJobService.UID_NULL).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
-        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper,
+        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
                 mPowerWhitelistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
@@ -200,7 +213,7 @@
     }
 
     @Test
-    public void testSaveAnomalyToDatabase_normalAppWithAutoRestriction_save() {
+    public void saveAnomalyToDatabase_normalAppWithAutoRestriction_save() {
         final ArrayList<String> cookies = new ArrayList<>();
         cookies.add(SUBSCRIBER_COOKIES_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
@@ -209,7 +222,7 @@
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
-        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper,
+        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
                 mPowerWhitelistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
@@ -224,9 +237,8 @@
                 Pair.create(MetricsProto.MetricsEvent.FIELD_APP_VERSION_CODE, VERSION_CODE));
     }
 
-
     @Test
-    public void testSaveAnomalyToDatabase_normalAppWithoutAutoRestriction_save() {
+    public void saveAnomalyToDatabase_normalAppWithoutAutoRestriction_save() {
         final ArrayList<String> cookies = new ArrayList<>();
         cookies.add(SUBSCRIBER_COOKIES_NOT_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
@@ -235,7 +247,7 @@
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
-        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper,
+        mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
                 mPowerWhitelistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
@@ -251,7 +263,7 @@
     }
 
     @Test
-    public void testExtractUidFromStatsDimensionsValue_extractCorrectUid() {
+    public void extractUidFromStatsDimensionsValue_extractCorrectUid() {
         // Build an integer dimensions value.
         final StatsDimensionsValue intValue = mock(StatsDimensionsValue.class);
         when(intValue.isValueType(INT_VALUE_TYPE)).thenReturn(true);
@@ -270,7 +282,7 @@
     }
 
     @Test
-    public void testExtractUidFromStatsDimensionsValue_wrongFormat_returnNull() {
+    public void extractUidFromStatsDimensionsValue_wrongFormat_returnNull() {
         // Build a float dimensions value
         final StatsDimensionsValue floatValue = mock(StatsDimensionsValue.class);
         when(floatValue.isValueType(FLOAT_VALUE_TYPE)).thenReturn(true);
@@ -280,4 +292,32 @@
         assertThat(mAnomalyDetectionJobService.extractUidFromStatsDimensionsValue(
                 floatValue)).isEqualTo(AnomalyDetectionJobService.UID_NULL);
     }
+
+    @Test
+    public void stopJobWhileDequeuingWork_shouldNotCrash() {
+        when(mJobParameters.dequeueWork()).thenThrow(new SecurityException());
+
+        mAnomalyDetectionJobService.onStopJob(mJobParameters);
+
+        // Should not crash even job is stopped
+        mAnomalyDetectionJobService.dequeueWork(mJobParameters);
+    }
+
+    @Test
+    public void stopJobWhileCompletingWork_shouldNotCrash() {
+        doThrow(new SecurityException()).when(mJobParameters).completeWork(any());
+
+        mAnomalyDetectionJobService.onStopJob(mJobParameters);
+
+        // Should not crash even job is stopped
+        mAnomalyDetectionJobService.completeWork(mJobParameters, mJobWorkItem);
+    }
+
+    @Test
+    public void restartWorkAfterBeenStopped_jobStarted() {
+        mAnomalyDetectionJobService.onStopJob(mJobParameters);
+        mAnomalyDetectionJobService.onStartJob(mJobParameters);
+
+        assertThat(mAnomalyDetectionJobService.mIsJobCanceled).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index 1de1e48..a02bdc2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -113,7 +113,7 @@
         ShadowAlertDialog shadowDialog = shadowOf(dialog);
 
         assertThat(shadowDialog.getMessage()).isEqualTo(
-                mContext.getString(R.string.battery_tip_dialog_message, 1, "60 minutes ago"));
+                mContext.getString(R.string.battery_tip_dialog_message, 1));
     }
 
     @Test
@@ -199,7 +199,7 @@
     }
 
     @Test
-    public void testOnCreateDialog_summaryTipWithEstimation_fireDialogWithEstimation() {
+    public void testOnCreateDialog_summaryTip_fireDialog() {
         doReturn(AVERAGE_TIME_MS).when(mSummaryTip).getAverageTimeMs();
         mDialogFragment = BatteryTipDialogFragment.newInstance(mSummaryTip, METRICS_KEY);
 
@@ -209,20 +209,8 @@
         ShadowAlertDialog shadowDialog = shadowOf(dialog);
 
         assertThat(shadowDialog.getMessage()).isEqualTo(
-                "Based on your usage, your battery usually lasts about 1 hr when fully charged"
-                        + ".\n\nIf you need to extend your battery life, turn on Battery Saver.");
-    }
-
-    @Test
-    public void testOnCreateDialog_summaryTipWithoutEstimation_fireDialogWithoutEstimation() {
-        mDialogFragment = BatteryTipDialogFragment.newInstance(mSummaryTip, METRICS_KEY);
-
-        FragmentTestUtil.startFragment(mDialogFragment);
-
-        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
-        ShadowAlertDialog shadowDialog = shadowOf(dialog);
-
-        assertThat(shadowDialog.getMessage()).isEqualTo(
-                "If you need to extend your battery life, turn on Battery Saver");
+                "Your apps are using a normal amount of battery. If apps use too much battery, "
+                        + "your phone will suggest actions you can take.\n\nYou can always turn"
+                        + " on Battery Saver if you’re running low on battery.");
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
index b50cc40..b0d6a7d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -48,9 +48,9 @@
             BatteryTip.TipType.APP_RESTRICTION,
             BatteryTip.TipType.BATTERY_SAVER,
             BatteryTip.TipType.HIGH_DEVICE_USAGE,
+            BatteryTip.TipType.LOW_BATTERY,
             BatteryTip.TipType.SUMMARY,
-            BatteryTip.TipType.SMART_BATTERY_MANAGER,
-            BatteryTip.TipType.LOW_BATTERY};
+            BatteryTip.TipType.SMART_BATTERY_MANAGER};
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private BatteryStatsHelper mBatteryStatsHelper;
     @Mock
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
index 654b247..547e0eb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
@@ -48,7 +48,8 @@
             + ",excessive_bg_drain_percentage=25"
             + ",test_battery_saver_tip=true"
             + ",test_high_usage_tip=false"
-            + ",test_smart_battery_tip=true";
+            + ",test_smart_battery_tip=true"
+            + ",test_low_battery_tip=true";
     private Context mContext;
 
     @Before
@@ -80,6 +81,7 @@
         assertThat(batteryTipPolicy.testBatterySaverTip).isTrue();
         assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
         assertThat(batteryTipPolicy.testSmartBatteryTip).isTrue();
+        assertThat(batteryTipPolicy.testLowBatteryTip).isTrue();
     }
 
     @Test
@@ -99,12 +101,13 @@
         assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
         assertThat(batteryTipPolicy.reducedBatteryEnabled).isFalse();
         assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(50);
-        assertThat(batteryTipPolicy.lowBatteryEnabled).isFalse();
-        assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(16);
+        assertThat(batteryTipPolicy.lowBatteryEnabled).isTrue();
+        assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(3);
         assertThat(batteryTipPolicy.dataHistoryRetainDay).isEqualTo(30);
         assertThat(batteryTipPolicy.excessiveBgDrainPercentage).isEqualTo(10);
         assertThat(batteryTipPolicy.testBatterySaverTip).isFalse();
         assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
         assertThat(batteryTipPolicy.testSmartBatteryTip).isFalse();
+        assertThat(batteryTipPolicy.testLowBatteryTip).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
index 90d00fc..ba829b1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
@@ -37,6 +37,7 @@
 import android.text.format.DateUtils;
 
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
@@ -181,7 +182,9 @@
         assertThat(preferenceGroup.getPreferenceCount()).isEqualTo(1);
 
         final Preference preference = preferenceGroup.getPreference(0);
-        assertThat(preference.getTitle()).isEqualTo("Battery is in good shape");
-        assertThat(preference.getSummary()).isEqualTo("Apps are running normally");
+        assertThat(preference.getTitle()).isEqualTo(
+                mContext.getString(R.string.battery_tip_summary_title));
+        assertThat(preference.getSummary()).isEqualTo(
+                mContext.getString(R.string.battery_tip_summary_summary));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
index 7a25555..459c4e2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
@@ -29,6 +29,7 @@
 import com.android.settings.fuelgauge.batterytip.actions.RestrictAppAction;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip;
+import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -51,6 +52,7 @@
     private InstrumentedPreferenceFragment mFragment;
     private RestrictAppTip mRestrictAppTip;
     private EarlyWarningTip mEarlyWarningTip;
+    private LowBatteryTip mLowBatteryTip;
 
     @Before
     public void setUp() {
@@ -59,7 +61,11 @@
         FakeFeatureFactory.setupForTest();
         doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
         mRestrictAppTip = spy(new RestrictAppTip(BatteryTip.StateType.NEW, new ArrayList<>()));
-        mEarlyWarningTip = spy(new EarlyWarningTip(BatteryTip.StateType.NEW, true));
+        mEarlyWarningTip = spy(
+                new EarlyWarningTip(BatteryTip.StateType.NEW, true /* powerSaveModeOn */));
+        mLowBatteryTip = spy(
+                new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */,
+                        "" /* summary */));
     }
 
     @Test
@@ -93,4 +99,20 @@
         assertThat(BatteryTipUtils.getActionForBatteryTip(mEarlyWarningTip, mSettingsActivity,
                 mFragment)).isInstanceOf(OpenBatterySaverAction.class);
     }
+
+    @Test
+    public void testGetActionForBatteryTip_typeLowBatteryStateNew_returnActionBatterySaver() {
+        when(mLowBatteryTip.getState()).thenReturn(BatteryTip.StateType.NEW);
+
+        assertThat(BatteryTipUtils.getActionForBatteryTip(mLowBatteryTip, mSettingsActivity,
+                mFragment)).isInstanceOf(BatterySaverAction.class);
+    }
+
+    @Test
+    public void testGetActionForBatteryTip_typeLowBatteryStateHandled_returnActionOpen() {
+        when(mLowBatteryTip.getState()).thenReturn(BatteryTip.StateType.HANDLED);
+
+        assertThat(BatteryTipUtils.getActionForBatteryTip(mLowBatteryTip, mSettingsActivity,
+                mFragment)).isInstanceOf(OpenBatterySaverAction.class);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
index 1f4affa..9764559 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
@@ -17,12 +17,15 @@
 package com.android.settings.fuelgauge.batterytip.detectors;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.spy;
 
-import android.text.format.DateUtils;
+import android.content.Context;
+import android.os.PowerManager;
 
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -31,8 +34,12 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowPowerManager;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.concurrent.TimeUnit;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 public class LowBatteryDetectorTest {
 
@@ -40,36 +47,68 @@
     private BatteryInfo mBatteryInfo;
     private BatteryTipPolicy mPolicy;
     private LowBatteryDetector mLowBatteryDetector;
+    private ShadowPowerManager mShadowPowerManager;
+    private Context mContext;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
         mPolicy = spy(new BatteryTipPolicy(RuntimeEnvironment.application));
+        mContext = RuntimeEnvironment.application;
+        mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
         ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true);
+        ReflectionHelpers.setField(mPolicy, "lowBatteryHour", 3);
+        mBatteryInfo.discharging = true;
 
-        mLowBatteryDetector = new LowBatteryDetector(mPolicy, mBatteryInfo);
+        mLowBatteryDetector = new LowBatteryDetector(mContext, mPolicy, mBatteryInfo);
     }
 
     @Test
     public void testDetect_disabledByPolicy_tipInvisible() {
         ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", false);
+        mShadowPowerManager.setIsPowerSaveMode(true);
 
         assertThat(mLowBatteryDetector.detect().isVisible()).isFalse();
     }
 
     @Test
-    public void testDetect_shortBatteryLife_tipVisible() {
-        mBatteryInfo.discharging = true;
-        mBatteryInfo.remainingTimeUs = DateUtils.MINUTE_IN_MILLIS;
+    public void testDetect_enabledByTest_tipNew() {
+        ReflectionHelpers.setField(mPolicy, "testLowBatteryTip", true);
 
-        assertThat(mLowBatteryDetector.detect().isVisible()).isTrue();
+        assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
     }
 
     @Test
-    public void testDetect_longBatteryLife_tipInvisible() {
-        mBatteryInfo.discharging = true;
-        mBatteryInfo.remainingTimeUs = DateUtils.DAY_IN_MILLIS;
+    public void testDetect_lowBattery_tipNew() {
+        mBatteryInfo.batteryLevel = 3;
+        mBatteryInfo.remainingTimeUs = TimeUnit.DAYS.toMillis(1);
+        assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
+
+        mBatteryInfo.batteryLevel = 50;
+        mBatteryInfo.remainingTimeUs = TimeUnit.MINUTES.toMillis(1);
+        assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
+    }
+
+    @Test
+    public void testDetect_batterySaverOn_tipHandled() {
+        mShadowPowerManager.setIsPowerSaveMode(true);
+
+        assertThat(mLowBatteryDetector.detect().getState())
+                .isEqualTo(BatteryTip.StateType.HANDLED);
+    }
+
+    @Test
+    public void testDetect_charging_tipInvisible() {
+        mBatteryInfo.discharging = false;
+
+        assertThat(mLowBatteryDetector.detect().isVisible()).isFalse();
+    }
+
+    @Test
+    public void testDetect_noEarlyWarning_tipInvisible() {
+        mBatteryInfo.remainingTimeUs = TimeUnit.DAYS.toMicros(1);
+        mBatteryInfo.batteryLevel = 100;
 
         assertThat(mLowBatteryDetector.detect().isVisible()).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
new file mode 100644
index 0000000..359d260
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.fuelgauge.batterytip.tips;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class LowBatteryTipTest {
+
+    private static final CharSequence SUMMARY = "Only 15 minutes left";
+
+    @Mock
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+    private Context mContext;
+    private LowBatteryTip mLowBatteryTip;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mLowBatteryTip = new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */,
+                SUMMARY);
+    }
+
+    @Test
+    public void testParcelable() {
+        Parcel parcel = Parcel.obtain();
+        mLowBatteryTip.writeToParcel(parcel, mLowBatteryTip.describeContents());
+        parcel.setDataPosition(0);
+
+        final LowBatteryTip parcelTip = new LowBatteryTip(parcel);
+
+        assertThat(parcelTip.isPowerSaveModeOn()).isFalse();
+        assertThat(parcelTip.getSummary(mContext)).isEqualTo(SUMMARY);
+    }
+
+    @Test
+    public void getSummary_tipHandled_showSummary() {
+        mLowBatteryTip.mState = BatteryTip.StateType.HANDLED;
+
+        assertThat(mLowBatteryTip.getSummary(mContext)).isEqualTo("Some features may be limited");
+    }
+
+    @Test
+    public void getSummary_tipNew_showSummary() {
+        mLowBatteryTip.mState = BatteryTip.StateType.NEW;
+
+        assertThat(mLowBatteryTip.getSummary(mContext)).isEqualTo(SUMMARY);
+    }
+
+    @Test
+    public void log_lowBatteryActionWithCorrectState() {
+        mLowBatteryTip.log(mContext, mMetricsFeatureProvider);
+
+        verify(mMetricsFeatureProvider).action(mContext,
+                MetricsProto.MetricsEvent.ACTION_LOW_BATTERY_TIP, BatteryTip.StateType.NEW);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index d4b7706..df40ba5 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -204,7 +204,7 @@
 
         @Override
         public int getAvailabilityStatus() {
-            return mIsPrefAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
+            return mIsPrefAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java
new file mode 100644
index 0000000..29d2c19
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.drawer.CategoryKey;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class GestureSettingsTest {
+
+    @Test
+    public void getCategoryKey_isCategoryGestures() {
+        GestureSettings settings = new GestureSettings();
+        assertThat(settings.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_GESTURES);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
index 360609b..4107b73 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
@@ -18,35 +18,32 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
 import android.os.UserManager;
 import android.provider.Settings;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowPackageManager;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
 public class SwipeUpPreferenceControllerTest {
 
     private Context mContext;
@@ -58,11 +55,21 @@
 
     @Before
     public void setUp() {
+        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+                true);
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_swipe_up_gesture_default, true);
+
         mContext = RuntimeEnvironment.application;
         mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
         mController = new SwipeUpPreferenceController(mContext, KEY_SWIPE_UP);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void testIsGestureAvailable_matchingServiceExists_shouldReturnTrue() {
         final ComponentName recentsComponentName = ComponentName.unflattenFromString(
@@ -75,19 +82,45 @@
     }
 
     @Test
+    public void testIsGestureAvailable_overlayDisabled_matchingServiceExists_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(R.bool.config_swipe_up_gesture_setting_available,
+                false);
+
+        final ComponentName recentsComponentName = ComponentName.unflattenFromString(
+                mContext.getString(com.android.internal.R.string.config_recentsComponentName));
+        final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
+                .setPackage(recentsComponentName.getPackageName());
+        mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
+
+        assertThat(SwipeUpPreferenceController.isGestureAvailable(mContext)).isFalse();
+    }
+
+    @Test
     public void testIsGestureAvailable_noMatchingServiceExists_shouldReturnFalse() {
         assertThat(SwipeUpPreferenceController.isGestureAvailable(mContext)).isFalse();
     }
 
     @Test
-    public void testIsChecked_configIsSet_shouldReturnTrue() {
+    public void testIsChecked_defaultIsTrue_shouldReturnTrue() {
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void testIsChecked_defaultIsFalse_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_swipe_up_gesture_default, false);
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void testIsChecked_setCheckedTrue_shouldReturnTrue() {
         // Set the setting to be enabled.
         mController.setChecked(true);
         assertThat(mController.isChecked()).isTrue();
     }
 
     @Test
-    public void testIsChecked_configIsNotSet_shouldReturnFalse() {
+    public void testIsChecked_setCheckedFalse_shouldReturnFalse() {
         // Set the setting to be disabled.
         mController.setChecked(false);
         assertThat(mController.isChecked()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index 61283fa..e5ecd6d 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -17,7 +17,8 @@
 package com.android.settings.inputmethod;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -89,7 +90,7 @@
         when(mInputDevice.isVirtual()).thenReturn(false);
         when(mInputDevice.getVibrator().hasVibrator()).thenReturn(false);
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
@@ -98,14 +99,14 @@
         when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
         when(mInputDevice.isVirtual()).thenReturn(true);
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_hasNoDevice_shouldReturnDisabled() {
         when(mInputManager.getInputDeviceIds()).thenReturn(new int[] {});
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
@@ -113,7 +114,7 @@
     public void getAvailabilityStatus_ifDisabled_shouldReturnDisabled() {
         mController = new GameControllerPreferenceController(mContext, "testkey");
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index e9ffa8a..dfea6fb 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -28,7 +28,10 @@
 
 import android.app.AlertDialog;
 import android.app.Fragment;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.net.ConnectivityManager;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -150,4 +153,36 @@
             assertThat(mSaveButton.isEnabled()).named("provider: " + invalid).isFalse();
         }
     }
+
+    @Test
+    public void testOnClick_positiveButtonClicked_saveData() {
+        // Set the default settings to OFF
+        final ContentResolver contentResolver = mContext.getContentResolver();
+        Settings.Global.putString(contentResolver, Settings.Global.PRIVATE_DNS_MODE,
+                ConnectivityManager.PRIVATE_DNS_MODE_OFF);
+
+        mPreference.mMode = ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
+        mPreference.onClick(null, DialogInterface.BUTTON_POSITIVE);
+
+        // Change to OPPORTUNISTIC
+        assertThat(Settings.Global.getString(contentResolver,
+                Settings.Global.PRIVATE_DNS_MODE)).isEqualTo(
+                ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC);
+    }
+
+    @Test
+    public void testOnClick_negativeButtonClicked_doNothing() {
+        // Set the default settings to OFF
+        final ContentResolver contentResolver = mContext.getContentResolver();
+        Settings.Global.putString(contentResolver, Settings.Global.PRIVATE_DNS_MODE,
+                ConnectivityManager.PRIVATE_DNS_MODE_OFF);
+
+        mPreference.mMode = ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
+        mPreference.onClick(null, DialogInterface.BUTTON_NEGATIVE);
+
+        // Still equal to OFF
+        assertThat(Settings.Global.getString(contentResolver,
+                Settings.Global.PRIVATE_DNS_MODE)).isEqualTo(
+                ConnectivityManager.PRIVATE_DNS_MODE_OFF);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
index f999194..12ecbfe 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
@@ -18,8 +18,6 @@
 
 import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
 
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
 import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
 import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
 
diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
new file mode 100644
index 0000000..bed45e5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowAudioManager;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowAudioManager.class})
+public class CallVolumePreferenceControllerTest {
+    private static final String TEST_KEY = "Test_Key";
+
+    @Mock
+    private AudioHelper mHelper;
+
+    private Context mContext;
+    private CallVolumePreferenceController mController;
+    private ShadowAudioManager mShadowAudioManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new CallVolumePreferenceController(mContext, TEST_KEY);
+        mController.setAudioHelper(mHelper);
+        mShadowAudioManager = ShadowAudioManager.getShadow();
+    }
+
+    @Test
+    public void getAvailabilityStatus_singleVolume_shouldReturnDisable() {
+        when(mHelper.isSingleVolume()).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_notSingleVolume_shouldReturnAvailable() {
+        when(mHelper.isSingleVolume()).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getMuteIcon_shouldEqualToOriginalIcon() {
+        assertThat(mController.getMuteIcon()).isEqualTo(R.drawable.ic_local_phone_24_lib);
+    }
+
+    @Test
+    public void getAudioStream_onBluetoothScoOff_shouldEqualToStreamVoiceCall() {
+        mShadowAudioManager.setBluetoothScoOn(false);
+
+        assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_VOICE_CALL);
+    }
+
+    @Test
+    public void getAudioStream_onBluetoothScoOn_shouldEqualToStreamBtSco() {
+        mShadowAudioManager.setBluetoothScoOn(true);
+
+        assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_BLUETOOTH_SCO);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
index 675ac57..8fef5fc 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
@@ -169,7 +169,7 @@
 
         @Override
         public int getAvailabilityStatus() {
-            return mAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
+            return mAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
         }
 
         @Override
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
index c32f96a..5955aa8 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
@@ -50,17 +50,20 @@
     }
 
     @Test
-    public void setStream_shouldSetMaxAndProgress() {
+    public void setStream_shouldSetMinMaxAndProgress() {
         final int stream = 5;
         final int max = 17;
+        final int min = 1;
         final int progress = 4;
         when(mAudioManager.getStreamMaxVolume(stream)).thenReturn(max);
+        when(mAudioManager.getStreamMinVolumeInt(stream)).thenReturn(min);
         when(mAudioManager.getStreamVolume(stream)).thenReturn(progress);
         doCallRealMethod().when(mPreference).setStream(anyInt());
 
         mPreference.setStream(stream);
 
         verify(mPreference).setMax(max);
+        verify(mPreference).setMin(min);
         verify(mPreference).setProgress(progress);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index 5b2782f..39e9271 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -134,13 +134,13 @@
     public void testGetCallsSettingSummary_contacts() {
         Policy policy = new Policy(Policy.PRIORITY_CATEGORY_ALARMS | Policy.PRIORITY_CATEGORY_CALLS,
                 Policy.PRIORITY_SENDERS_CONTACTS, 0, 0);
-        assertThat(mBuilder.getCallsSettingSummary(policy)).isEqualTo("From contacts only");
+        assertThat(mBuilder.getCallsSettingSummary(policy)).isEqualTo("From contacts");
     }
 
     @Test
     public void testGetCallsSettingSummary_repeatCallers() {
         Policy policy = new Policy(Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, 0, 0, 0);
-        assertThat(mBuilder.getCallsSettingSummary(policy)).isEqualTo("From repeat callers only");
+        assertThat(mBuilder.getCallsSettingSummary(policy)).isEqualTo("From repeat callers");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
new file mode 100644
index 0000000..7a45d7f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ZenModeStarredContactsPreferenceControllerTest {
+
+    private ZenModeStarredContactsPreferenceController mCallsController;
+    private ZenModeStarredContactsPreferenceController mMessagesController;
+
+    @Mock
+    private ZenModeBackend mBackend;
+    @Mock
+    private NotificationManager mNotificationManager;
+    @Mock
+    private ListPreference mockPref;
+    @Mock
+    private NotificationManager.Policy mPolicy;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private Intent testIntent;
+    @Mock
+    private ComponentName mComponentName;
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+        mContext = shadowApplication.getApplicationContext();
+        when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+        when(testIntent.resolveActivity(any())).thenReturn(mComponentName);
+
+        mCallsController = new ZenModeStarredContactsPreferenceController(
+                mContext, mock(Lifecycle.class), PRIORITY_CATEGORY_CALLS);
+        ReflectionHelpers.setField(mCallsController, "mBackend", mBackend);
+        ReflectionHelpers.setField(mCallsController, "mStarredContactsIntent", testIntent);
+        when(mPreferenceScreen.findPreference(mCallsController.getPreferenceKey()))
+                .thenReturn(mockPref);
+        mCallsController.displayPreference(mPreferenceScreen);
+
+        mMessagesController = new ZenModeStarredContactsPreferenceController(
+                mContext, mock(Lifecycle.class), PRIORITY_CATEGORY_MESSAGES);
+        ReflectionHelpers.setField(mMessagesController, "mBackend", mBackend);
+        ReflectionHelpers.setField(mMessagesController, "mStarredContactsIntent", testIntent);
+        when(mPreferenceScreen.findPreference(mMessagesController.getPreferenceKey()))
+                .thenReturn(mockPref);
+        mMessagesController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void isAvailable_noCallers() {
+        when(mBackend.isPriorityCategoryEnabled(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenReturn(false);
+        assertThat(mCallsController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_anyCallers() {
+        when(mBackend.isPriorityCategoryEnabled(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenReturn(true);
+        when(mBackend.getPriorityCallSenders())
+                .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+
+
+        assertThat(mCallsController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_starredCallers() {
+        when(mBackend.isPriorityCategoryEnabled(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+                .thenReturn(true);
+        when(mBackend.getPriorityCallSenders())
+                .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+
+        assertThat(mCallsController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noMessages() {
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES)).thenReturn(false);
+        assertThat(mMessagesController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_anyMessages() {
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES)).thenReturn(true);
+        when(mBackend.getPriorityMessageSenders())
+                .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+
+        assertThat(mMessagesController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_starredMessageContacts() {
+        when(mBackend.isPriorityCategoryEnabled(
+                NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES)).thenReturn(true);
+        when(mBackend.getPriorityMessageSenders())
+                .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+
+        assertThat(mMessagesController.isAvailable()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
index 56fa1c2..b1692bc 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
@@ -88,23 +88,14 @@
     }
 
     @Test
-    public void isAvailable_menuOff_noVisEffects() {
+    public void isAvailable_noVisEffects() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0);
-        mController.mShowMenuSelected = false;
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_menuOn_noVisEffects() {
-        mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0);
-        mController.mShowMenuSelected = true;
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
-    public void isAvailable_menuOn_visEffects() {
+    public void isAvailable_visEffects() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.mShowMenuSelected = false;
         assertThat(mController.isAvailable()).isTrue();
     }
 
@@ -150,18 +141,4 @@
         verify(mockPref).setOnGearClickListener(any());
         verify(mockPref).setOnRadioButtonClickListener(any());
     }
-
-    @Test
-    public void select() {
-        int interruptiveSuppressed = SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
-                | SUPPRESSED_EFFECT_AMBIENT
-                | SUPPRESSED_EFFECT_LIGHTS
-                | SUPPRESSED_EFFECT_PEEK;
-        mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.select();
-        verify(mBackend).savePolicy(anyInt(), anyInt(), anyInt(), eq(interruptiveSuppressed));
-        verify(mFeatureFactory.metricsFeatureProvider).action(eq(mContext),
-                eq(ACTION_ZEN_CUSTOM),
-                eq(true));
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
index 7bc9371..e09dc0d 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
@@ -18,16 +18,12 @@
 
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
-import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_ANY;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
-import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
+
+import static com.android.settings.notification.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD;
+import static com.android.settings.notification.ZenOnboardingActivity
+        .PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME;
+import static com.android.settings.notification.ZenOnboardingActivity.isSuggestionComplete;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -39,20 +35,22 @@
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.Settings;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 public class ZenOnboardingActivityTest {
@@ -64,6 +62,9 @@
 
     ZenOnboardingActivity mActivity;
 
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
@@ -75,6 +76,11 @@
         mActivity.setMetricsLogger(mMetricsLogger);
 
         mActivity.setupUI();
+
+        mContext = RuntimeEnvironment.application;
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        when(mFeatureFactory.suggestionsFeatureProvider.getSharedPrefs(any(Context.class)))
+                .thenReturn(getSharedPreferences());
     }
 
     @Test
@@ -83,10 +89,11 @@
     }
 
     @Test
-    public void save() {
+    public void saveNewSetting() {
         Policy policy = new Policy(PRIORITY_CATEGORY_ALARMS, 0, 0, SUPPRESSED_EFFECT_SCREEN_ON);
         when(mNm.getNotificationPolicy()).thenReturn(policy);
 
+        mActivity.mNewSetting.performClick();
         mActivity.save(null);
 
         verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
@@ -104,24 +111,83 @@
     }
 
     @Test
-    public void close() {
-        Policy policy = new Policy(
-                PRIORITY_CATEGORY_ALARMS, PRIORITY_SENDERS_ANY, 0,
-                SUPPRESSED_EFFECT_SCREEN_ON
-                        | SUPPRESSED_EFFECT_SCREEN_OFF
-                        | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
-                        | SUPPRESSED_EFFECT_LIGHTS
-                        | SUPPRESSED_EFFECT_PEEK
-                        | SUPPRESSED_EFFECT_STATUS_BAR
-                        | SUPPRESSED_EFFECT_BADGE
-                        | SUPPRESSED_EFFECT_AMBIENT
-                        | SUPPRESSED_EFFECT_NOTIFICATION_LIST);
+    public void keepCurrentSetting() {
+        Policy policy = new Policy(PRIORITY_CATEGORY_ALARMS, 0, 0, SUPPRESSED_EFFECT_SCREEN_ON);
         when(mNm.getNotificationPolicy()).thenReturn(policy);
 
-        mActivity.close(null);
+        mActivity.mKeepCurrentSetting.performClick();
+        mActivity.save(null);
 
         verify(mMetricsLogger).action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
-
         verify(mNm, never()).setNotificationPolicy(any());
     }
+
+    @Test
+    public void isSuggestionComplete_zenUpdated() {
+        setZenUpdated(true);
+        setShowSettingsSuggestion(false);
+        setWithinTimeThreshold(true);
+        assertThat(isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void isSuggestionComplete_withinTimeThreshold() {
+        setZenUpdated(false);
+        setShowSettingsSuggestion(false);
+        setWithinTimeThreshold(true);
+        assertThat(isSuggestionComplete(mContext)).isFalse();
+    }
+
+    @Test
+    public void isSuggestionComplete_showSettingsSuggestionTrue() {
+        setZenUpdated(false);
+        setShowSettingsSuggestion(true);
+        setWithinTimeThreshold(false);
+        assertThat(isSuggestionComplete(mContext)).isFalse();
+    }
+
+    @Test
+    public void isSuggestionComplete_showSettingsSuggestionFalse_notWithinTimeThreshold() {
+        setZenUpdated(false);
+        setShowSettingsSuggestion(false);
+        setWithinTimeThreshold(false);
+        assertThat(isSuggestionComplete(mContext)).isTrue();
+    }
+
+    private void setZenUpdated(boolean updated) {
+        int zenUpdated = 0;
+        if (updated) {
+            zenUpdated = 1;
+        }
+
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.ZEN_SETTINGS_UPDATED, zenUpdated);
+    }
+
+    private void setWithinTimeThreshold(boolean withinTime) {
+        long firstTime = System.currentTimeMillis();
+
+        if (withinTime) {
+            firstTime -= ALWAYS_SHOW_THRESHOLD / 2;
+        } else {
+            firstTime -= ALWAYS_SHOW_THRESHOLD * 2;
+        }
+
+        getSharedPreferences().edit().putLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME,
+               firstTime).commit();
+    }
+
+    private void setShowSettingsSuggestion(boolean show) {
+        int showZenSuggestion = 0;
+        if (show) {
+            showZenSuggestion = 1;
+        }
+
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_ZEN_SETTINGS_SUGGESTION, showZenSuggestion);
+    }
+
+    private SharedPreferences getSharedPreferences() {
+        return mContext.getSharedPreferences("test_zen_sugg", Context.MODE_PRIVATE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 0fda33e..a0bd33a 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -18,20 +18,17 @@
 package com.android.settings.slices;
 
 import static android.content.ContentResolver.SCHEME_CONTENT;
-
 import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.app.slice.SliceManager;
-import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
+import android.os.StrictMode;
 import android.provider.SettingsSlicesContract;
 
 import com.android.settings.testutils.DatabaseTestUtils;
@@ -44,29 +41,30 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 
-import androidx.slice.Slice;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 
+import androidx.slice.Slice;
+
 /**
  * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider)
  */
 @RunWith(SettingsRobolectricTestRunner.class)
 public class SettingsSliceProviderTest {
 
-    private final String KEY = "KEY";
-    private final String INTENT_PATH = SettingsSlicesContract.PATH_SETTING_INTENT + "/" + KEY;
-    private final String ACTION_PATH = SettingsSlicesContract.PATH_SETTING_ACTION + "/" + KEY;
-    private final String TITLE = "title";
-    private final String SUMMARY = "summary";
-    private final String SCREEN_TITLE = "screen title";
-    private final String FRAGMENT_NAME = "fragment name";
-    private final int ICON = 1234; // I declare a thumb war
-    private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
-    private final String PREF_CONTROLLER = FakeToggleController.class.getName();
+    private static final String KEY = "KEY";
+    private static final String INTENT_PATH =
+            SettingsSlicesContract.PATH_SETTING_INTENT + "/" + KEY;
+    private static final String TITLE = "title";
+    private static final String SUMMARY = "summary";
+    private static final String SCREEN_TITLE = "screen title";
+    private static final String FRAGMENT_NAME = "fragment name";
+    private static final int ICON = 1234; // I declare a thumb war
+    private static final Uri URI = Uri.parse("content://com.android.settings.slices/test");
+    private static final String PREF_CONTROLLER = FakeToggleController.class.getName();
+
     private Context mContext;
     private SettingsSliceProvider mProvider;
     private SQLiteDatabase mDb;
@@ -152,6 +150,18 @@
     }
 
     @Test
+    public void onBindSlice_shouldNotOverrideStrictMode() {
+        final StrictMode.ThreadPolicy oldThreadPolicy = StrictMode.getThreadPolicy();
+        SliceData data = getDummyData();
+        mProvider.mSliceWeakDataCache.put(data.getUri(), data);
+        mProvider.onBindSlice(data.getUri());
+
+        final StrictMode.ThreadPolicy newThreadPolicy = StrictMode.getThreadPolicy();
+
+        assertThat(newThreadPolicy.toString()).isEqualTo(oldThreadPolicy.toString());
+    }
+
+    @Test
     public void testLoadSlice_cachedEntryRemovedOnUnpin() {
         SliceData data = getDummyData();
         mProvider.mSliceDataCache.put(data.getUri(), data);
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index c7bf043..f03f88e 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -211,7 +211,7 @@
         // Disable Setting
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeToggleController.AVAILABILITY_KEY,
-                BasePreferenceController.DISABLED_UNSUPPORTED);
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
         // Insert Fake Toggle into Database
         final String key = "key";
@@ -245,7 +245,7 @@
         // Disable Setting
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeSliderController.AVAILABILITY_KEY,
-                BasePreferenceController.DISABLED_UNSUPPORTED);
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
         // Insert Fake Slider into Database
         final String key = "key";
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 20bb5a0..bd589bf 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -24,6 +24,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
+import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -329,7 +330,7 @@
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
-                BasePreferenceController.DISABLED_UNSUPPORTED);
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
 
@@ -372,12 +373,12 @@
     }
 
     @Test
-    public void testUnavailableUnknownSlice_validTitleSummary() {
+    public void testConditionallyUnavailableSlice_validTitleSummary() {
         final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
-                BasePreferenceController.UNAVAILABLE_UNKNOWN);
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
 
@@ -405,6 +406,16 @@
         assertThat(intentData).isEqualTo(expectedUri);
     }
 
+    @Test
+    public void getSettingsIntent_createsIntentToSettings() {
+        final Intent intent = new Intent(Settings.ACTION_SETTINGS);
+        final PendingIntent expectedIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
+
+        final PendingIntent settingsIntent = SliceBuilderUtils.getSettingsIntent(mContext);
+
+        assertThat(expectedIntent).isEqualTo(settingsIntent);
+    }
+
     private SliceData getDummyData() {
         return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH);
     }
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index 87ada36..674d629 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -56,7 +56,6 @@
     private static final String FAKE_TITLE = "title";
     private static final String FAKE_SUMMARY = "summary";
     private static final String FAKE_SCREEN_TITLE = "screen_title";
-    private static final String FAKE_KEYWORDS = "a, b, c";
     private static final String FAKE_FRAGMENT_CLASSNAME = FakeIndexProvider.class.getName();
     private static final String FAKE_CONTROLLER_NAME = FakePreferenceController.class.getName();
     private static final String ACCESSIBILITY_FRAGMENT = AccessibilitySettings.class.getName();
@@ -118,7 +117,7 @@
         assertThat(fakeSlice.getTitle()).isEqualTo(FAKE_TITLE);
         assertThat(fakeSlice.getSummary()).isEqualTo(FAKE_SUMMARY);
         assertThat(fakeSlice.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
-        assertThat(fakeSlice.getKeywords()).isEqualTo(FAKE_KEYWORDS);
+        assertThat(fakeSlice.getKeywords()).isNull();
         assertThat(fakeSlice.getIconResource()).isNotNull();
         assertThat(fakeSlice.getUri()).isNull();
         assertThat(fakeSlice.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_CLASSNAME);
diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
index e0877e4..272fd20 100644
--- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
@@ -17,8 +17,17 @@
 package com.android.settings.sound;
 
 
+import static android.media.AudioManager.DEVICE_OUT_BLUETOOTH_SCO;
+import static android.media.AudioManager.STREAM_RING;
+import static android.media.AudioManager.STREAM_VOICE_CALL;
+import static android.media.AudioSystem.DEVICE_OUT_ALL_SCO;
+import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP;
+import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;
+import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
+import static android.media.AudioSystem.STREAM_MUSIC;
+
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -28,6 +37,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import static org.robolectric.Shadows.shadowOf;
+
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
@@ -48,7 +59,8 @@
 import com.android.settingslib.bluetooth.A2dpProfile;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.BluetoothEventManager;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HeadsetProfile;
+import com.android.settingslib.bluetooth.HearingAidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
 
@@ -59,7 +71,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowBluetoothDevice;
 
@@ -77,19 +88,24 @@
     private static final String TEST_KEY = "Test_Key";
     private static final String TEST_DEVICE_NAME_1 = "Test_A2DP_BT_Device_NAME_1";
     private static final String TEST_DEVICE_NAME_2 = "Test_A2DP_BT_Device_NAME_2";
-    private static final String TEST_DEVICE_ADDRESS_1 = "00:07:80:78:A4:69";
-    private static final String TEST_DEVICE_ADDRESS_2 = "00:00:00:00:00:00";
+    private static final String TEST_DEVICE_ADDRESS_1 = "00:A1:A1:A1:A1:A1";
+    private static final String TEST_DEVICE_ADDRESS_2 = "00:B2:B2:B2:B2:B2";
+    private static final String TEST_DEVICE_ADDRESS_3 = "00:C3:C3:C3:C3:C3";
+    private final static long HISYNCID1 = 10;
+    private final static long HISYNCID2 = 11;
 
     @Mock
     private LocalBluetoothManager mLocalManager;
     @Mock
     private BluetoothEventManager mBluetoothEventManager;
     @Mock
-    private CachedBluetoothDevice mCachedBluetoothDevice;
-    @Mock
     private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
     @Mock
     private A2dpProfile mA2dpProfile;
+    @Mock
+    private HeadsetProfile mHeadsetProfile;
+    @Mock
+    private HearingAidProfile mHearingAidProfile;
 
     private Context mContext;
     private PreferenceScreen mScreen;
@@ -99,10 +115,13 @@
     private BluetoothManager mBluetoothManager;
     private BluetoothAdapter mBluetoothAdapter;
     private BluetoothDevice mBluetoothDevice;
-    private ShadowBluetoothDevice mShadowBluetoothDevice;
+    private BluetoothDevice mLeftBluetoothHapDevice;
+    private BluetoothDevice mRightBluetoothHapDevice;
     private LocalBluetoothManager mLocalBluetoothManager;
     private AudioSwitchPreferenceController mController;
-    private List<BluetoothDevice> mConnectedDevices;
+    private List<BluetoothDevice> mProfileConnectedDevices;
+    private List<BluetoothDevice> mHearingAidActiveDevices;
+    private List<BluetoothDevice> mEmptyDevices;
 
     @Before
     public void setUp() {
@@ -118,20 +137,27 @@
         when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
         when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
         when(mLocalBluetoothProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile);
+        when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);
+        when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile);
 
         mBluetoothManager = new BluetoothManager(mContext);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
 
-        mBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1);
-        mShadowBluetoothDevice = Shadows.shadowOf(mBluetoothDevice);
-        mShadowBluetoothDevice.setName(TEST_DEVICE_NAME_1);
-        when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
+        mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));
+        when(mBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_1);
+        when(mBluetoothDevice.isConnected()).thenReturn(true);
+
+        mLeftBluetoothHapDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2));
+        when(mLeftBluetoothHapDevice.isConnected()).thenReturn(true);
+        mRightBluetoothHapDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_3));
+        when(mRightBluetoothHapDevice.isConnected()).thenReturn(true);
 
         mController = new AudioSwitchPreferenceControllerTestable(mContext, TEST_KEY);
         mScreen = spy(new PreferenceScreen(mContext, null));
         mPreference = new ListPreference(mContext);
-        mConnectedDevices = new ArrayList<>(1);
-        mConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices = new ArrayList<>();
+        mHearingAidActiveDevices = new ArrayList<>(2);
+        mEmptyDevices = new ArrayList<>(2);
 
         when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mScreen.getContext()).thenReturn(mContext);
@@ -155,7 +181,7 @@
     @Test
     public void getAvailabilityStatus_whenNotVisible_isDisable() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, false);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
@@ -179,7 +205,8 @@
 
     @Test
     public void onPreferenceChange_toThisDevice_shouldSetDefaultSummary() {
-        mController.mConnectedDevices = mConnectedDevices;
+        mController.mConnectedDevices.clear();
+        mController.mConnectedDevices.add(mBluetoothDevice);
 
         mController.onPreferenceChange(mPreference,
                 mContext.getText(R.string.media_output_default_summary));
@@ -194,7 +221,8 @@
      */
     @Test
     public void onPreferenceChange_toBtDevice_shouldSetBtDeviceName() {
-        mController.mConnectedDevices = mConnectedDevices;
+        mController.mConnectedDevices.clear();
+        mController.mConnectedDevices.add(mBluetoothDevice);
 
         mController.onPreferenceChange(mPreference, TEST_DEVICE_ADDRESS_1);
 
@@ -210,12 +238,11 @@
         ShadowBluetoothDevice shadowBluetoothDevice;
         BluetoothDevice secondBluetoothDevice;
         secondBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2);
-        shadowBluetoothDevice = Shadows.shadowOf(secondBluetoothDevice);
+        shadowBluetoothDevice = shadowOf(secondBluetoothDevice);
         shadowBluetoothDevice.setName(TEST_DEVICE_NAME_2);
-        List<BluetoothDevice> connectedDevices = new ArrayList<>(2);
-        connectedDevices.add(mBluetoothDevice);
-        connectedDevices.add(secondBluetoothDevice);
-        mController.mConnectedDevices = connectedDevices;
+        mController.mConnectedDevices.clear();
+        mController.mConnectedDevices.add(mBluetoothDevice);
+        mController.mConnectedDevices.add(secondBluetoothDevice);
 
         mController.onPreferenceChange(mPreference, TEST_DEVICE_ADDRESS_2);
 
@@ -223,16 +250,263 @@
     }
 
     /**
-     * mConnectedDevices is Null.
+     * mConnectedDevices is empty.
      * onPreferenceChange should return false.
      */
     @Test
     public void onPreferenceChange_connectedDeviceIsNull_shouldReturnFalse() {
-        mController.mConnectedDevices = null;
+        mController.mConnectedDevices.clear();
 
         assertThat(mController.onPreferenceChange(mPreference, TEST_DEVICE_ADDRESS_1)).isFalse();
     }
 
+    /**
+     * Audio stream output to bluetooth sco headset which is the subset of all sco device.
+     * isStreamFromOutputDevice should return true.
+     */
+    @Test
+    public void isStreamFromOutputDevice_outputDeviceIsBtScoHeadset_shouldReturnTrue() {
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_SCO_HEADSET);
+
+        assertThat(mController.isStreamFromOutputDevice(STREAM_MUSIC, DEVICE_OUT_ALL_SCO)).isTrue();
+    }
+
+    /**
+     * Audio stream is not STREAM_MUSIC or STREAM_VOICE_CALL.
+     * findActiveDevice should return null.
+     */
+    @Test
+    public void findActiveDevice_streamIsRing_shouldReturnNull() {
+        assertThat(mController.findActiveDevice(STREAM_RING)).isNull();
+    }
+
+    /**
+     * Audio stream is STREAM_MUSIC and output device is A2dp bluetooth device.
+     * findActiveDevice should return A2dp active device.
+     */
+    @Test
+    public void findActiveDevice_streamMusicToA2dpDevice_shouldReturnActiveA2dpDevice() {
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_A2DP);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        when(mHeadsetProfile.getActiveDevice()).thenReturn(mLeftBluetoothHapDevice);
+        when(mA2dpProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+
+        assertThat(mController.findActiveDevice(STREAM_MUSIC)).isEqualTo(mBluetoothDevice);
+    }
+
+    /**
+     * Audio stream is STREAM_VOICE_CALL and output device is Hands free profile bluetooth device.
+     * findActiveDevice should return Hands free profile active device.
+     */
+    @Test
+    public void findActiveDevice_streamVoiceCallToHfpDevice_shouldReturnActiveHfpDevice() {
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_SCO);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        when(mHeadsetProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mA2dpProfile.getActiveDevice()).thenReturn(mLeftBluetoothHapDevice);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+
+        assertThat(mController.findActiveDevice(STREAM_VOICE_CALL)).isEqualTo(mBluetoothDevice);
+    }
+
+    /**
+     * Audio stream is STREAM_MUSIC or STREAM_VOICE_CALL and output device is hearing aid profile
+     * bluetooth device. And left side of HAP device is active.
+     * findActiveDevice should return hearing aid device active device.
+     */
+    @Test
+    public void findActiveDevice_streamToHapDeviceLeftActiveDevice_shouldReturnActiveHapDevice() {
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mController.mConnectedDevices.clear();
+        mController.mConnectedDevices.add(mBluetoothDevice);
+        mController.mConnectedDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.add(null);
+        when(mHeadsetProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mA2dpProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+
+        assertThat(mController.findActiveDevice(STREAM_MUSIC)).isEqualTo(mLeftBluetoothHapDevice);
+        assertThat(mController.findActiveDevice(STREAM_VOICE_CALL)).isEqualTo(
+                mLeftBluetoothHapDevice);
+    }
+
+    /**
+     * Audio stream is STREAM_MUSIC or STREAM_VOICE_CALL and output device is hearing aid profile
+     * bluetooth device. And right side of HAP device is active.
+     * findActiveDevice should return hearing aid device active device.
+     */
+    @Test
+    public void findActiveDevice_streamToHapDeviceRightActiveDevice_shouldReturnActiveHapDevice() {
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mController.mConnectedDevices.clear();
+        mController.mConnectedDevices.add(mBluetoothDevice);
+        mController.mConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(null);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHeadsetProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mA2dpProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+
+        assertThat(mController.findActiveDevice(STREAM_MUSIC)).isEqualTo(mRightBluetoothHapDevice);
+        assertThat(mController.findActiveDevice(STREAM_VOICE_CALL)).isEqualTo(
+                mRightBluetoothHapDevice);
+    }
+
+    /**
+     * Audio stream is STREAM_MUSIC or STREAM_VOICE_CALL and output device is hearing aid
+     * profile bluetooth device. And both are active device.
+     * findActiveDevice should return only return the active device in mConnectedDevices.
+     */
+    @Test
+    public void findActiveDevice_streamToHapDeviceTwoActiveDevice_shouldReturnActiveHapDevice() {
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mController.mConnectedDevices.clear();
+        mController.mConnectedDevices.add(mBluetoothDevice);
+        mController.mConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHeadsetProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mA2dpProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+
+        assertThat(mController.findActiveDevice(STREAM_MUSIC)).isEqualTo(mRightBluetoothHapDevice);
+        assertThat(mController.findActiveDevice(STREAM_VOICE_CALL)).isEqualTo(
+                mRightBluetoothHapDevice);
+    }
+
+    /**
+     * Audio stream is STREAM_MUSIC or STREAM_VOICE_CALL and output device is hearing aid
+     * profile bluetooth device. And none of them are active.
+     * findActiveDevice should return null.
+     */
+    @Test
+    public void findActiveDevice_streamToOtherDevice_shouldReturnActiveHapDevice() {
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mController.mConnectedDevices.clear();
+        mController.mConnectedDevices.add(mBluetoothDevice);
+        mController.mConnectedDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        when(mHeadsetProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mA2dpProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+
+        assertThat(mController.findActiveDevice(STREAM_MUSIC)).isNull();
+        assertThat(mController.findActiveDevice(STREAM_VOICE_CALL)).isNull();
+    }
+
+    /**
+     * Two hearing aid devices with different HisyncId
+     * getConnectedHearingAidDevices should add both device to list.
+     */
+    @Test
+    public void getConnectedHearingAidDevices_deviceHisyncIdIsDifferent_shouldAddBothToList() {
+        mEmptyDevices.clear();
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID2);
+
+        mEmptyDevices.addAll(mController.getConnectedHearingAidDevices());
+
+        assertThat(mEmptyDevices).containsExactly(mLeftBluetoothHapDevice,
+                mRightBluetoothHapDevice);
+    }
+
+    /**
+     * Two hearing aid devices with same HisyncId
+     * getConnectedHearingAidDevices should only add first device to list.
+     */
+    @Test
+    public void getConnectedHearingAidDevices_deviceHisyncIdIsSame_shouldAddOneToList() {
+        mEmptyDevices.clear();
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mEmptyDevices.addAll(mController.getConnectedHearingAidDevices());
+
+        assertThat(mEmptyDevices).containsExactly(mLeftBluetoothHapDevice);
+    }
+
+    /**
+     * One A2dp device is connected.
+     * getConnectedA2dpDevices should add this device to list.
+     */
+    @Test
+    public void getConnectedA2dpDevices_oneConnectedA2dpDevice_shouldAddDeviceToList() {
+        mEmptyDevices.clear();
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+
+        mEmptyDevices.addAll(mController.getConnectedA2dpDevices());
+
+        assertThat(mEmptyDevices).containsExactly(mBluetoothDevice);
+    }
+
+    /**
+     * More than one A2dp devices are connected.
+     * getConnectedA2dpDevices should add all devices to list.
+     */
+    @Test
+    public void getConnectedA2dpDevices_moreThanOneConnectedA2dpDevice_shouldAddDeviceToList() {
+        mEmptyDevices.clear();
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+
+        mEmptyDevices.addAll(mController.getConnectedA2dpDevices());
+
+        assertThat(mEmptyDevices).containsExactly(mBluetoothDevice, mLeftBluetoothHapDevice);
+    }
+
+    /**
+     * One hands free profile device is connected.
+     * getConnectedA2dpDevices should add this device to list.
+     */
+    @Test
+    public void getConnectedHfpDevices_oneConnectedHfpDevice_shouldAddDeviceToList() {
+        mEmptyDevices.clear();
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        when(mHeadsetProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+
+        mEmptyDevices.addAll(mController.getConnectedHfpDevices());
+
+        assertThat(mEmptyDevices).containsExactly(mBluetoothDevice);
+    }
+
+    /**
+     * More than one hands free profile devices are connected.
+     * getConnectedA2dpDevices should add all devices to list.
+     */
+    @Test
+    public void getConnectedHfpDevices_moreThanOneConnectedHfpDevice_shouldAddDeviceToList() {
+        mEmptyDevices.clear();
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        when(mHeadsetProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+
+        mEmptyDevices.addAll(mController.getConnectedHfpDevices());
+
+        assertThat(mEmptyDevices).containsExactly(mBluetoothDevice, mLeftBluetoothHapDevice);
+    }
+
     private class AudioSwitchPreferenceControllerTestable extends
             AudioSwitchPreferenceController {
         AudioSwitchPreferenceControllerTestable(Context context, String key) {
diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
index 0692c9c..db09eab 100644
--- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
@@ -17,12 +17,16 @@
 package com.android.settings.sound;
 
 
+import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO;
+import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
 import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -41,8 +45,8 @@
 import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 import com.android.settings.testutils.shadow.ShadowMediaRouter;
 import com.android.settingslib.bluetooth.BluetoothEventManager;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.HeadsetProfile;
+import com.android.settingslib.bluetooth.HearingAidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
 
@@ -53,7 +57,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowBluetoothDevice;
 
@@ -69,21 +72,27 @@
 )
 public class HandsFreeProfileOutputPreferenceControllerTest {
     private static final String TEST_KEY = "Test_Key";
-    private static final String TEST_DEVICE_NAME_1 = "Test_HAP_BT_Device_NAME_1";
-    private static final String TEST_DEVICE_NAME_2 = "Test_HAP_BT_Device_NAME_2";
-    private static final String TEST_DEVICE_ADDRESS_1 = "00:07:80:78:A4:69";
-    private static final String TEST_DEVICE_ADDRESS_2 = "00:00:00:00:00:00";
+    private static final String TEST_DEVICE_NAME_1 = "Test_HFP_BT_Device_NAME_1";
+    private static final String TEST_DEVICE_NAME_2 = "Test_HFP_BT_Device_NAME_2";
+    private static final String TEST_HAP_DEVICE_NAME_1 = "Test_HAP_BT_Device_NAME_1";
+    private static final String TEST_HAP_DEVICE_NAME_2 = "Test_HAP_BT_Device_NAME_2";
+    private static final String TEST_DEVICE_ADDRESS_1 = "00:A1:A1:A1:A1:A1";
+    private static final String TEST_DEVICE_ADDRESS_2 = "00:B2:B2:B2:B2:B2";
+    private static final String TEST_DEVICE_ADDRESS_3 = "00:C3:C3:C3:C3:C3";
+    private static final String TEST_DEVICE_ADDRESS_4 = "00:D4:D4:D4:D4:D4";
+    private final static long HISYNCID1 = 10;
+    private final static long HISYNCID2 = 11;
 
     @Mock
     private LocalBluetoothManager mLocalManager;
     @Mock
     private BluetoothEventManager mBluetoothEventManager;
     @Mock
-    private CachedBluetoothDevice mCachedBluetoothDevice;
-    @Mock
     private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
     @Mock
     private HeadsetProfile mHeadsetProfile;
+    @Mock
+    private HearingAidProfile mHearingAidProfile;
 
     private Context mContext;
     private PreferenceScreen mScreen;
@@ -93,10 +102,13 @@
     private BluetoothManager mBluetoothManager;
     private BluetoothAdapter mBluetoothAdapter;
     private BluetoothDevice mBluetoothDevice;
-    private ShadowBluetoothDevice mShadowBluetoothDevice;
+    private BluetoothDevice mSecondBluetoothDevice;
+    private BluetoothDevice mLeftBluetoothHapDevice;
+    private BluetoothDevice mRightBluetoothHapDevice;
     private LocalBluetoothManager mLocalBluetoothManager;
     private AudioSwitchPreferenceController mController;
-    private List<BluetoothDevice> mConnectedDevices;
+    private List<BluetoothDevice> mProfileConnectedDevices;
+    private List<BluetoothDevice> mHearingAidActiveDevices;
 
     @Before
     public void setUp() {
@@ -112,19 +124,32 @@
         when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
         when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
         when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile);
+        when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);
 
         mBluetoothManager = new BluetoothManager(mContext);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
-        mBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1);
-        mShadowBluetoothDevice = Shadows.shadowOf(mBluetoothDevice);
-        mShadowBluetoothDevice.setName(TEST_DEVICE_NAME_1);
-        when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
+
+        mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));
+        when(mBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_1);
+        when(mBluetoothDevice.isConnected()).thenReturn(true);
+
+        mSecondBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2));
+        when(mSecondBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_2);
+        when(mSecondBluetoothDevice.isConnected()).thenReturn(true);
+
+        mLeftBluetoothHapDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_3));
+        when(mLeftBluetoothHapDevice.getName()).thenReturn(TEST_HAP_DEVICE_NAME_1);
+        when(mLeftBluetoothHapDevice.isConnected()).thenReturn(true);
+
+        mRightBluetoothHapDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_4));
+        when(mRightBluetoothHapDevice.getName()).thenReturn(TEST_HAP_DEVICE_NAME_2);
+        when(mRightBluetoothHapDevice.isConnected()).thenReturn(true);
 
         mController = new HandsFreeProfileOutputPreferenceController(mContext, TEST_KEY);
         mScreen = spy(new PreferenceScreen(mContext, null));
         mPreference = new ListPreference(mContext);
-        mConnectedDevices = new ArrayList<>(1);
-        mConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices = new ArrayList<>();
+        mHearingAidActiveDevices = new ArrayList<>(2);
 
         when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mScreen.getContext()).thenReturn(mContext);
@@ -140,8 +165,26 @@
         ShadowBluetoothUtils.reset();
     }
 
+    /**
+     * During a call, bluetooth device with HisyncId.
+     * HearingAidProfile should set active device to this device.
+     */
     @Test
-    public void setActiveBluetoothDevice_duringACalling_shouldSetBtDeviceActive() {
+    public void setActiveBluetoothDevice_btDeviceWithHisyncId_shouldSetBtDeviceActive() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);
+
+        verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);
+    }
+
+    /**
+     * During a call, Bluetooth device without HisyncId.
+     * HeadsetProfile should set active device to this device.
+     */
+    @Test
+    public void setActiveBluetoothDevice_btDeviceWithoutHisyncId_shouldSetBtDeviceActive() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
 
         mController.setActiveBluetoothDevice(mBluetoothDevice);
@@ -149,23 +192,60 @@
         verify(mHeadsetProfile).setActiveDevice(mBluetoothDevice);
     }
 
+    /**
+     * During a call, set active device to "this device".
+     * HeadsetProfile should set to null.
+     * HearingAidProfile should set to null.
+     */
+    @Test
+    public void setActiveBluetoothDevice_setNull_shouldSetNullToBothProfiles() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+
+        mController.setActiveBluetoothDevice(null);
+
+        verify(mHeadsetProfile).setActiveDevice(null);
+        verify(mHearingAidProfile).setActiveDevice(null);
+    }
+
+    /**
+     * In normal mode
+     * HeadsetProfile should not set active device.
+     */
+    @Test
+    public void setActiveBluetoothDevice_inNormalMode_shouldNotSetActiveDeviceToHeadsetProfile() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+
+        mController.setActiveBluetoothDevice(mBluetoothDevice);
+
+        verify(mHeadsetProfile, times(0)).setActiveDevice(any(BluetoothDevice.class));
+    }
+
+    /**
+     * Default status
+     * Preference should be invisible
+     * Summary should be default summary
+     */
     @Test
     public void updateState_shouldSetSummary() {
         mController.updateState(mPreference);
 
+        assertThat(mPreference.isVisible()).isFalse();
         assertThat(mPreference.getSummary()).isEqualTo(
                 mContext.getText(R.string.media_output_default_summary));
     }
 
     /**
-     * One Headset Bluetooth device is available and activated
+     * One Hands Free Profile Bluetooth device is available and activated
      * Preference should be visible
-     * Preference summary should be activate device name
+     * Preference summary should be the activated device name
      */
     @Test
     public void updateState_oneHeadsetsAvailableAndActivated_shouldSetDeviceName() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        when(mHeadsetProfile.getConnectedDevices()).thenReturn(mConnectedDevices);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_SCO);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        when(mHeadsetProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
         when(mHeadsetProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
 
         mController.updateState(mPreference);
@@ -175,29 +255,25 @@
     }
 
     /**
-     * More than one Headset Bluetooth devices are available, and second device is active.
+     * More than one Hands Free Profile Bluetooth devices are available, and second
+     * device is active.
      * Preference should be visible
-     * Preference summary should be activate device name
+     * Preference summary should be the activated device name
      */
     @Test
-    public void updateState_moreThanOneHapBtDevicesAreAvailable_shouldSetActivatedDeviceName() {
-        ShadowBluetoothDevice shadowBluetoothDevice;
+    public void updateState_moreThanOneHfpBtDevicesAreAvailable_shouldSetActivatedDeviceName() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        BluetoothDevice secondBluetoothDevice;
-        secondBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2);
-        shadowBluetoothDevice = Shadows.shadowOf(secondBluetoothDevice);
-        shadowBluetoothDevice.setName(TEST_DEVICE_NAME_2);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_SCO);
         List<BluetoothDevice> connectedDevices = new ArrayList<>(2);
         connectedDevices.add(mBluetoothDevice);
-        connectedDevices.add(secondBluetoothDevice);
-
+        connectedDevices.add(mSecondBluetoothDevice);
         when(mHeadsetProfile.getConnectedDevices()).thenReturn(connectedDevices);
-        when(mHeadsetProfile.getActiveDevice()).thenReturn(secondBluetoothDevice);
+        when(mHeadsetProfile.getActiveDevice()).thenReturn(mSecondBluetoothDevice);
 
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        assertThat(mPreference.getSummary()).isEqualTo(secondBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(mSecondBluetoothDevice.getName());
     }
 
     /**
@@ -209,8 +285,10 @@
     @Test
     public void updateState_withAvailableDevicesWiredHeadsetActivated_shouldSetDefaultSummary() {
         mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-        mShadowAudioManager.setStream(DEVICE_OUT_USB_HEADSET);
-        when(mHeadsetProfile.getConnectedDevices()).thenReturn(mConnectedDevices);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_USB_HEADSET);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        when(mHeadsetProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
         when(mHeadsetProfile.getActiveDevice()).thenReturn(
                 mBluetoothDevice); // BT device is still activated in this case
 
@@ -238,4 +316,150 @@
         assertThat(mPreference.getSummary()).isEqualTo(
                 mContext.getText(R.string.media_output_default_summary));
     }
+
+    /**
+     * One hearing aid profile Bluetooth device is available and active.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     */
+    @Test
+    public void updateState_oneHapBtDeviceAreAvailable_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mLeftBluetoothHapDevice.getName());
+    }
+
+    /**
+     * More than one hearing aid profile Bluetooth devices are available, and second
+     * device is active.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     */
+    @Test
+    public void updateState_moreThanOneHapBtDevicesAreAvailable_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID2);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mRightBluetoothHapDevice.getName());
+    }
+
+    /**
+     * Both hearing aid profile and hands free profile Bluetooth devices are available, and
+     * two hearing aid profile devices with same HisyncId. Both of HAP device are active,
+     * "left" side HAP device is added first.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     * ConnectedDevice should not contain second HAP device with same HisyncId
+     */
+    @Test
+    public void updateState_hapBtDeviceWithSameId_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        //with same HisyncId, only the first one will remain in UI.
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mLeftBluetoothHapDevice.getName());
+        assertThat(mController.mConnectedDevices.contains(mLeftBluetoothHapDevice)).isTrue();
+        assertThat(mController.mConnectedDevices.contains(mRightBluetoothHapDevice)).isFalse();
+    }
+
+    /**
+     * Both hearing aid profile and hands free profile Bluetooth devices are available, and
+     * two hearing aid profile devices with same HisyncId. Both of HAP device are active,
+     * "right" side HAP device is added first.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     * ConnectedDevice should not contain second HAP device with same HisyncId
+     */
+    @Test
+    public void updateState_hapBtDeviceWithSameIdButDifferentOrder_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        //with same HisyncId, only the first one will remain in UI.
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mController.mConnectedDevices.contains(mRightBluetoothHapDevice)).isTrue();
+        assertThat(mController.mConnectedDevices.contains(mLeftBluetoothHapDevice)).isFalse();
+        assertThat(mPreference.getSummary()).isEqualTo(mRightBluetoothHapDevice.getName());
+    }
+
+    /**
+     * Both hearing aid profile and hands free profile  Bluetooth devices are available, and
+     * two hearing aid profile devices with different HisyncId. One of HAP device is active.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     * ConnectedDevice should contain both HAP device with different HisyncId
+     */
+    @Test
+    public void updateState_hapBtDeviceWithDifferentId_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(null);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID2);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mRightBluetoothHapDevice.getName());
+        assertThat(mController.mConnectedDevices).containsExactly(mBluetoothDevice,
+                mLeftBluetoothHapDevice, mRightBluetoothHapDevice);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index b62e6b3..b777239 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -17,13 +17,17 @@
 package com.android.settings.sound;
 
 
+import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP;
+import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
 import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX;
 import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -43,7 +47,7 @@
 import com.android.settings.testutils.shadow.ShadowMediaRouter;
 import com.android.settingslib.bluetooth.A2dpProfile;
 import com.android.settingslib.bluetooth.BluetoothEventManager;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HearingAidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
 
@@ -54,7 +58,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowBluetoothDevice;
 
@@ -72,19 +75,25 @@
     private static final String TEST_KEY = "Test_Key";
     private static final String TEST_DEVICE_NAME_1 = "Test_A2DP_BT_Device_NAME_1";
     private static final String TEST_DEVICE_NAME_2 = "Test_A2DP_BT_Device_NAME_2";
-    private static final String TEST_DEVICE_ADDRESS_1 = "00:07:80:78:A4:69";
-    private static final String TEST_DEVICE_ADDRESS_2 = "00:00:00:00:00:00";
+    private static final String TEST_HAP_DEVICE_NAME_1 = "Test_HAP_BT_Device_NAME_1";
+    private static final String TEST_HAP_DEVICE_NAME_2 = "Test_HAP_BT_Device_NAME_2";
+    private static final String TEST_DEVICE_ADDRESS_1 = "00:A1:A1:A1:A1:A1";
+    private static final String TEST_DEVICE_ADDRESS_2 = "00:B2:B2:B2:B2:B2";
+    private static final String TEST_DEVICE_ADDRESS_3 = "00:C3:C3:C3:C3:C3";
+    private static final String TEST_DEVICE_ADDRESS_4 = "00:D4:D4:D4:D4:D4";
+    private final static long HISYNCID1 = 10;
+    private final static long HISYNCID2 = 11;
 
     @Mock
     private LocalBluetoothManager mLocalManager;
     @Mock
     private BluetoothEventManager mBluetoothEventManager;
     @Mock
-    private CachedBluetoothDevice mCachedBluetoothDevice;
-    @Mock
     private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
     @Mock
     private A2dpProfile mA2dpProfile;
+    @Mock
+    private HearingAidProfile mHearingAidProfile;
 
     private Context mContext;
     private PreferenceScreen mScreen;
@@ -94,10 +103,13 @@
     private BluetoothManager mBluetoothManager;
     private BluetoothAdapter mBluetoothAdapter;
     private BluetoothDevice mBluetoothDevice;
-    private ShadowBluetoothDevice mShadowBluetoothDevice;
+    private BluetoothDevice mSecondBluetoothDevice;
+    private BluetoothDevice mLeftBluetoothHapDevice;
+    private BluetoothDevice mRightBluetoothHapDevice;
     private LocalBluetoothManager mLocalBluetoothManager;
     private AudioSwitchPreferenceController mController;
-    private List<BluetoothDevice> mConnectedDevices;
+    private List<BluetoothDevice> mProfileConnectedDevices;
+    private List<BluetoothDevice> mHearingAidActiveDevices;
 
     @Before
     public void setUp() {
@@ -113,19 +125,32 @@
         when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
         when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
         when(mLocalBluetoothProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile);
+        when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);
 
         mBluetoothManager = new BluetoothManager(mContext);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
-        mBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1);
-        mShadowBluetoothDevice = Shadows.shadowOf(mBluetoothDevice);
-        mShadowBluetoothDevice.setName(TEST_DEVICE_NAME_1);
-        when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
+
+        mBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_1));
+        when(mBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_1);
+        when(mBluetoothDevice.isConnected()).thenReturn(true);
+
+        mSecondBluetoothDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2));
+        when(mSecondBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME_2);
+        when(mSecondBluetoothDevice.isConnected()).thenReturn(true);
+
+        mLeftBluetoothHapDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_3));
+        when(mLeftBluetoothHapDevice.getName()).thenReturn(TEST_HAP_DEVICE_NAME_1);
+        when(mLeftBluetoothHapDevice.isConnected()).thenReturn(true);
+
+        mRightBluetoothHapDevice = spy(mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_4));
+        when(mRightBluetoothHapDevice.getName()).thenReturn(TEST_HAP_DEVICE_NAME_2);
+        when(mRightBluetoothHapDevice.isConnected()).thenReturn(true);
 
         mController = new MediaOutputPreferenceController(mContext, TEST_KEY);
         mScreen = spy(new PreferenceScreen(mContext, null));
         mPreference = new ListPreference(mContext);
-        mConnectedDevices = new ArrayList<>(1);
-        mConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices = new ArrayList<>();
+        mHearingAidActiveDevices = new ArrayList<>(2);
 
         when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mScreen.getContext()).thenReturn(mContext);
@@ -141,8 +166,26 @@
         ShadowBluetoothUtils.reset();
     }
 
+    /**
+     * In normal mode, bluetooth device with HisyncId.
+     * HearingAidProfile should set active device to this device.
+     */
     @Test
-    public void setActiveBluetoothDevice_withoutRingAndCall_shouldSetBtDeviceActive() {
+    public void setActiveBluetoothDevice_btDeviceWithHisyncId_shouldSetBtDeviceActive() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);
+
+        verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);
+    }
+
+    /**
+     * In normal mode, bluetooth device without HisyncId.
+     * A2dpProfile should set active device to this device.
+     */
+    @Test
+    public void setActiveBluetoothDevice_btDeviceWithoutHisyncId_shouldSetBtDeviceActive() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
 
         mController.setActiveBluetoothDevice(mBluetoothDevice);
@@ -150,16 +193,50 @@
         verify(mA2dpProfile).setActiveDevice(mBluetoothDevice);
     }
 
+    /**
+     * In normal mode, set active device to "this device".
+     * A2dpProfile should set to null.
+     * HearingAidProfile should set to null.
+     */
+    @Test
+    public void setActiveBluetoothDevice_setNull_shouldSetNullToBothProfiles() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+
+        mController.setActiveBluetoothDevice(null);
+
+        verify(mA2dpProfile).setActiveDevice(null);
+        verify(mHearingAidProfile).setActiveDevice(null);
+    }
+
+    /**
+     * During a call
+     * A2dpProfile should not set active device.
+     */
+    @Test
+    public void setActiveBluetoothDevice_duringACall_shouldNotSetActiveDeviceToA2dpProfile() {
+        mShadowAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+
+        mController.setActiveBluetoothDevice(mBluetoothDevice);
+
+        verify(mA2dpProfile, times(0)).setActiveDevice(any(BluetoothDevice.class));
+    }
+
+    /**
+     * Default status
+     * Preference should be invisible
+     * Summary should be default summary
+     */
     @Test
     public void updateState_shouldSetSummary() {
         mController.updateState(mPreference);
 
+        assertThat(mPreference.isVisible()).isFalse();
         assertThat(mPreference.getSummary()).isEqualTo(
                 mContext.getText(R.string.media_output_default_summary));
     }
 
     /**
-     * On going call state:
+     * During a call
      * Preference should be invisible
      * Default string should be "Unavailable during calls"
      */
@@ -199,7 +276,7 @@
      */
     @Test
     public void updateState_mediaStreamIsCapturedByCast_shouldDisableAndSetDefaultSummary() {
-        mShadowAudioManager.setStream(DEVICE_OUT_REMOTE_SUBMIX);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_REMOTE_SUBMIX);
 
         mController.updateState(mPreference);
 
@@ -211,12 +288,15 @@
     /**
      * One A2DP Bluetooth device is available and active.
      * Preference should be visible
-     * Preference summary should be activate device name
+     * Preference summary should be the activated device name
      */
     @Test
     public void updateState_oneA2dpBtDeviceAreAvailable_shouldSetActivatedDeviceName() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
-        when(mA2dpProfile.getConnectedDevices()).thenReturn(mConnectedDevices);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_A2DP);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
         when(mA2dpProfile.getActiveDevice()).thenReturn(mBluetoothDevice);
 
         mController.updateState(mPreference);
@@ -228,27 +308,22 @@
     /**
      * More than one A2DP Bluetooth devices are available, and second device is active.
      * Preference should be visible
-     * Preference summary should be activate device name
+     * Preference summary should be the activated device name
      */
     @Test
     public void updateState_moreThanOneA2DpBtDevicesAreAvailable_shouldSetActivatedDeviceName() {
-        ShadowBluetoothDevice shadowBluetoothDevice;
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
-        BluetoothDevice secondBluetoothDevice;
-        secondBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS_2);
-        shadowBluetoothDevice = Shadows.shadowOf(secondBluetoothDevice);
-        shadowBluetoothDevice.setName(TEST_DEVICE_NAME_2);
-        List<BluetoothDevice> connectedDevices = new ArrayList<>(2);
-        connectedDevices.add(mBluetoothDevice);
-        connectedDevices.add(secondBluetoothDevice);
-
-        when(mA2dpProfile.getConnectedDevices()).thenReturn(connectedDevices);
-        when(mA2dpProfile.getActiveDevice()).thenReturn(secondBluetoothDevice);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_BLUETOOTH_A2DP);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices.add(mSecondBluetoothDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mA2dpProfile.getActiveDevice()).thenReturn(mSecondBluetoothDevice);
 
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        assertThat(mPreference.getSummary()).isEqualTo(secondBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(mSecondBluetoothDevice.getName());
     }
 
     /**
@@ -259,16 +334,18 @@
     @Test
     public void updateState_a2dpDevicesAvailableWiredHeadsetIsActivated_shouldSetDefaultSummary() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
-        mShadowAudioManager.setStream(DEVICE_OUT_USB_HEADSET);
-        when(mA2dpProfile.getConnectedDevices()).thenReturn(mConnectedDevices);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_USB_HEADSET);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
         when(mA2dpProfile.getActiveDevice()).thenReturn(
                 mBluetoothDevice); // BT device is still activated in this case
 
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        String defaultString = mContext.getString(R.string.media_output_default_summary);
-        assertThat(mPreference.getSummary()).isEqualTo(defaultString);
+        assertThat(mPreference.getSummary()).isEqualTo(
+                mContext.getString(R.string.media_output_default_summary));
     }
 
 
@@ -280,13 +357,161 @@
     @Test
     public void updateState_a2dpDevicesAvailableCurrentDeviceActivated_shouldSetDefaultSummary() {
         mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
-        when(mA2dpProfile.getConnectedDevices()).thenReturn(mConnectedDevices);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        when(mA2dpProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
         when(mA2dpProfile.getActiveDevice()).thenReturn(null);
 
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        String defaultString = mContext.getString(R.string.media_output_default_summary);
-        assertThat(mPreference.getSummary()).isEqualTo(defaultString);
+        assertThat(mPreference.getSummary()).isEqualTo(
+                mContext.getString(R.string.media_output_default_summary));
+    }
+
+    /**
+     * One hearing aid profile Bluetooth device is available and active.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     */
+    @Test
+    public void updateState_oneHapBtDeviceAreAvailable_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mLeftBluetoothHapDevice.getName());
+    }
+
+    /**
+     * More than one hearing aid profile Bluetooth devices are available, and second
+     * device is active.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     */
+    @Test
+    public void updateState_moreThanOneHapBtDevicesAreAvailable_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID2);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mRightBluetoothHapDevice.getName());
+    }
+
+    /**
+     * Both hearing aid profile and A2dp Bluetooth devices are available, and two hearing aid
+     * profile devices with same HisyncId are active. Both of HAP device are active,
+     * "left" side HAP device is added first.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     * ConnectedDevice should not contain second HAP device with same HisyncId
+     */
+    @Test
+    public void updateState_hapBtDeviceWithSameId_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        //with same HisyncId, first one will remain in UI.
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mLeftBluetoothHapDevice.getName());
+        assertThat(mController.mConnectedDevices.contains(mLeftBluetoothHapDevice)).isTrue();
+        assertThat(mController.mConnectedDevices.contains(mRightBluetoothHapDevice)).isFalse();
+    }
+
+    /**
+     * Both hearing aid profile and A2dp Bluetooth devices are available, and two hearing aid
+     * profile devices with same HisyncId. Both of HAP device are active,
+     * "right" side HAP device is added first.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     * ConnectedDevice should not contain second HAP device with same HisyncId
+     */
+    @Test
+    public void updateState_hapBtDeviceWithSameIdButDifferentOrder_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        //with same HisyncId, first one will remain in UI.
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(mLeftBluetoothHapDevice);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID1);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mRightBluetoothHapDevice.getName());
+        assertThat(mController.mConnectedDevices.contains(mRightBluetoothHapDevice)).isTrue();
+        assertThat(mController.mConnectedDevices.contains(mLeftBluetoothHapDevice)).isFalse();
+    }
+
+    /**
+     * Both hearing aid profile and A2dp Bluetooth devices are available, and two hearing aid
+     * profile devices with different HisyncId. One of HAP device is active.
+     * Preference should be visible
+     * Preference summary should be the activated device name
+     * ConnectedDevice should contain both HAP device with different HisyncId
+     */
+    @Test
+    public void updateState_hapBtDeviceWithDifferentId_shouldSetActivatedDeviceName() {
+        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
+        mShadowAudioManager.setOutputDevice(DEVICE_OUT_HEARING_AID);
+        mProfileConnectedDevices.clear();
+        mProfileConnectedDevices.add(mBluetoothDevice);
+        mProfileConnectedDevices.add(mLeftBluetoothHapDevice);
+        mProfileConnectedDevices.add(mRightBluetoothHapDevice);
+        mHearingAidActiveDevices.clear();
+        mHearingAidActiveDevices.add(null);
+        mHearingAidActiveDevices.add(mRightBluetoothHapDevice);
+        when(mHearingAidProfile.getConnectedDevices()).thenReturn(mProfileConnectedDevices);
+        when(mHearingAidProfile.getActiveDevices()).thenReturn(mHearingAidActiveDevices);
+        when(mHearingAidProfile.getHiSyncId(mLeftBluetoothHapDevice)).thenReturn(HISYNCID1);
+        when(mHearingAidProfile.getHiSyncId(mRightBluetoothHapDevice)).thenReturn(HISYNCID2);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(mRightBluetoothHapDevice.getName());
+        assertThat(mController.mConnectedDevices).containsExactly(mBluetoothDevice,
+                mLeftBluetoothHapDevice, mRightBluetoothHapDevice);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index bb14667..c6583c7 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -30,6 +30,8 @@
 import com.android.settings.Settings;
 import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
 import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.notification.ZenOnboardingActivity;
+import com.android.settings.notification.ZenSuggestionActivity;
 import com.android.settings.support.NewDeviceIntroSuggestionActivity;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
@@ -83,6 +85,14 @@
     }
 
     @Test
+    public void zenSuggestion_isValid() {
+        assertSuggestionEquals(
+                ZenSuggestionActivity.class.getName(),
+                R.string.zen_suggestion_title,
+                R.string.zen_suggestion_summary);
+    }
+
+    @Test
     public void newDeviceIntroSuggestion_isValid() {
         assertSuggestionEquals(
             NewDeviceIntroSuggestionActivity.class.getName(),
diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
index 1597568..8b03376 100644
--- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
@@ -19,7 +19,10 @@
 import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PERMANENT_DISMISS_THRESHOLD;
 import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_COMPLETE;
 import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME;
+
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity.TIPS_PACKAGE_NAME;
 import static com.android.settings.support.NewDeviceIntroSuggestionActivity.isSuggestionComplete;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
@@ -27,6 +30,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
 
 import com.android.settings.R;
@@ -65,6 +69,40 @@
     }
 
     @Test
+    public void isSuggestionComplete_TipsNotExistsAndNotExpiredAndCanOpenUrl_shouldReturnFalse() {
+        mShadowPackageManager.removePackage(TIPS_PACKAGE_NAME);
+
+        when(mMockContext.getResources()
+                .getBoolean(R.bool.config_new_device_intro_suggestion_supported))
+                .thenReturn(true);
+
+        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
+                .thenReturn("https://com.android.settings");
+        final Intent intent = NewDeviceIntroSuggestionActivity.getLaunchIntent(mContext);
+        mShadowPackageManager.addResolveInfoForIntent(intent, new ResolveInfo());
+
+        assertThat(isSuggestionComplete(mContext)).isFalse();
+    }
+
+    @Test
+    public void isSuggestionComplete_TipsExistsAndNotExpiredAndCanOpenUrl_shouldReturnTrue() {
+        final PackageInfo mockInfo = new PackageInfo();
+        mockInfo.packageName = TIPS_PACKAGE_NAME;
+        mShadowPackageManager.addPackage(mockInfo);
+
+        when(mMockContext.getResources()
+                .getBoolean(R.bool.config_new_device_intro_suggestion_supported))
+                .thenReturn(true);
+
+        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
+                .thenReturn("https://com.android.settings");
+        final Intent intent = NewDeviceIntroSuggestionActivity.getLaunchIntent(mContext);
+        mShadowPackageManager.addResolveInfoForIntent(intent, new ResolveInfo());
+
+        assertThat(isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
     public void isSuggestionComplete_notSupported_shouldReturnTrue() {
         when(mMockContext.getResources()
                 .getBoolean(R.bool.config_new_device_intro_suggestion_supported))
@@ -78,7 +116,7 @@
         final long currentTime = System.currentTimeMillis();
 
         getSharedPreferences().edit().putLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME,
-                currentTime - 2 * PERMANENT_DISMISS_THRESHOLD);
+                currentTime - 2 * PERMANENT_DISMISS_THRESHOLD).commit();
         assertThat(isSuggestionComplete(mContext)).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index a7840e8..529e32d 100644
--- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -19,10 +19,10 @@
 import static android.app.slice.Slice.HINT_TITLE;
 import static android.app.slice.SliceItem.FORMAT_TEXT;
 
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
 import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
-import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -30,7 +30,9 @@
 import android.content.Context;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import androidx.slice.Slice;
 import androidx.slice.SliceItem;
@@ -151,8 +153,8 @@
         final int availabilityStatus = SliceBuilderUtils.getPreferenceController(context,
                 sliceData).getAvailabilityStatus();
         switch (availabilityStatus) {
-            case DISABLED_UNSUPPORTED:
-            case UNAVAILABLE_UNKNOWN:
+            case UNSUPPORTED_ON_DEVICE:
+            case CONDITIONALLY_UNAVAILABLE:
                 assertThat(primaryPendingIntent).isEqualTo(
                         SliceBuilderUtils.getSettingsIntent(context));
                 break;
@@ -188,7 +190,10 @@
 
     private static void assertKeywords(SliceMetadata metadata, SliceData data) {
         final List<String> keywords = metadata.getSliceKeywords();
-        final List<String> expectedKeywords = Arrays.asList(data.getKeywords().split(","));
+        final Set<String> expectedKeywords = new HashSet<>(
+                Arrays.asList(data.getKeywords().split(",")));
+        expectedKeywords.add(data.getTitle());
+        expectedKeywords.add(data.getScreenTitle().toString());
         assertThat(keywords).containsExactlyElementsIn(expectedKeywords);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java
index 0de2156..3c37145 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java
@@ -41,8 +41,9 @@
 @Implements(value = AudioManager.class, inheritImplementationMethods = true)
 public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManager {
     private int mRingerMode;
-    private int mStream;
-    private boolean mMusicActiveRemotely = false;
+    private int mDeviceCodes;
+    private boolean mMusicActiveRemotely;
+    private boolean mBluetoothScoOn;
     private ArrayList<AudioDeviceCallback> mDeviceCallbacks = new ArrayList();
 
     @Implementation
@@ -79,8 +80,8 @@
         return mMusicActiveRemotely;
     }
 
-    public void setStream(int stream) {
-        mStream = stream;
+    public void setOutputDevice(int deviceCodes) {
+        mDeviceCodes = deviceCodes;
     }
 
     @Implementation
@@ -94,7 +95,7 @@
             case STREAM_NOTIFICATION:
             case STREAM_DTMF:
             case STREAM_ACCESSIBILITY:
-                return mStream;
+                return mDeviceCodes;
             default:
                 return 0;
         }
@@ -104,4 +105,11 @@
     public void reset() {
         mDeviceCallbacks.clear();
     }
+
+    public void setBluetoothScoOn(boolean bluetoothScoOn) {
+        mBluetoothScoOn = bluetoothScoOn;
+    }
+
+    @Implementation
+    public boolean isBluetoothScoOn() { return mBluetoothScoOn; }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java
new file mode 100644
index 0000000..4500b23
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+
+import org.robolectric.annotation.Implements;
+
+@Implements(PowerWhitelistBackend.class)
+public class ShadowPowerWhitelistBackend {
+    public void __constructor__() {
+        // Do nothing
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java
index c53f771..c0d61d2 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java
@@ -28,26 +28,26 @@
 
 @Implements(RestrictedLockUtils.class)
 public class ShadowRestrictedLockUtils {
-    private static boolean isRestricted;
-    private static String[] restrictedPkgs;
-    private static boolean adminSupportDetailsIntentLaunched;
-    private static int keyguardDisabledFeatures;
+    private static boolean sIsRestricted;
+    private static String[] sRestrictedPkgs;
+    private static boolean sAdminSupportDetailsIntentLaunched;
+    private static int sKeyguardDisabledFeatures;
 
     @Resetter
     public static void reset() {
-        isRestricted = false;
-        restrictedPkgs = null;
-        adminSupportDetailsIntentLaunched = false;
-        keyguardDisabledFeatures = 0;
+        sIsRestricted = false;
+        sRestrictedPkgs = null;
+        sAdminSupportDetailsIntentLaunched = false;
+        sKeyguardDisabledFeatures = 0;
     }
 
     @Implementation
     public static EnforcedAdmin checkIfMeteredDataRestricted(Context context,
             String packageName, int userId) {
-        if (isRestricted) {
+        if (sIsRestricted) {
             return new EnforcedAdmin();
         }
-        if (ArrayUtils.contains(restrictedPkgs, packageName)) {
+        if (ArrayUtils.contains(sRestrictedPkgs, packageName)) {
             return new EnforcedAdmin();
         }
         return null;
@@ -55,32 +55,44 @@
 
     @Implementation
     public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
-        adminSupportDetailsIntentLaunched = true;
+        sAdminSupportDetailsIntentLaunched = true;
     }
 
     @Implementation
     public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context,
             int features, final @UserIdInt int userId) {
-        return (keyguardDisabledFeatures & features) == 0 ? null : new EnforcedAdmin();
+        return (sKeyguardDisabledFeatures & features) == 0 ? null : new EnforcedAdmin();
+    }
+
+    @Implementation
+    public static boolean hasBaseUserRestriction(Context context,
+            String userRestriction, int userId) {
+        return sIsRestricted;
+    }
+
+    @Implementation
+    public static EnforcedAdmin checkIfRestrictionEnforced(Context context,
+            String userRestriction, int userId) {
+        return sIsRestricted ? new EnforcedAdmin() : null;
     }
 
     public static boolean hasAdminSupportDetailsIntentLaunched() {
-        return adminSupportDetailsIntentLaunched;
+        return sAdminSupportDetailsIntentLaunched;
     }
 
     public static void clearAdminSupportDetailsIntentLaunch() {
-        adminSupportDetailsIntentLaunched = false;
+        sAdminSupportDetailsIntentLaunched = false;
     }
 
     public static void setRestricted(boolean restricted) {
-        isRestricted = restricted;
+        sIsRestricted = restricted;
     }
 
     public static void setRestrictedPkgs(String... pkgs) {
-        restrictedPkgs = pkgs;
+        sRestrictedPkgs = pkgs;
     }
 
     public static void setKeyguardDisabledFeatures(int features) {
-        keyguardDisabledFeatures = features;
+        sKeyguardDisabledFeatures = features;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index d445c0d..ddbc851 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -268,6 +268,19 @@
         assertThat(hiddenSpinner.isEnabled()).isTrue();
     }
 
+
+    @Test
+    public void hiddenSpinner_visibilityUpdatesCorrectly() {
+        View hiddenSpinner = mView.findViewById(R.id.hidden_settings);
+        assertThat(hiddenSpinner.isEnabled()).isFalse();
+        assertThat(hiddenSpinner.getVisibility()).isEqualTo(View.GONE);
+
+        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
+                WifiConfigUiBase.MODE_CONNECT);
+        assertThat(hiddenSpinner.isEnabled()).isTrue();
+        assertThat(hiddenSpinner.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
     public class TestWifiConfigController extends WifiConfigController {
 
         private TestWifiConfigController(
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index 66cbd30..75c9bb1 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -25,6 +27,7 @@
 import android.net.wifi.WifiManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
 import com.android.settings.widget.SwitchWidgetController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -33,8 +36,10 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowRestrictedLockUtils.class)
 public class WifiEnablerTest {
 
     @Mock
@@ -59,8 +64,6 @@
         when(mWifiManager.setWifiEnabled(true)).thenReturn(true);
         when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED);
 
-        mEnabler.onSwitchToggled(true);
-
-        verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
+        assertThat(mEnabler.onSwitchToggled(true)).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
index 3f8ee5a..cea86bf 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -36,6 +36,7 @@
 
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -48,6 +49,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowRestrictedLockUtils.class)
 public class WifiMasterSwitchPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
new file mode 100644
index 0000000..ac3ff3f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.calling;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+import static android.app.slice.Slice.HINT_TITLE;
+import static android.app.slice.SliceItem.FORMAT_TEXT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.telephony.CarrierConfigManager;
+
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.ims.ImsManager;
+import com.android.settings.R;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBroadcastReceiver;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settings.slices.SliceData;
+import com.android.settings.slices.SlicesFeatureProvider;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WifiCallingSliceHelperTest {
+
+    private Context mContext;
+    @Mock
+    private CarrierConfigManager mMockCarrierConfigManager;
+
+    @Mock
+    private ImsManager mMockImsManager;
+
+    private final Uri mWfcURI = Uri.parse("content://com.android.settings.slices/wifi_calling");
+
+    private FakeWifiCallingSliceHelper mWfcSliceHelper;
+    private SettingsSliceProvider mProvider;
+    private SliceBroadcastReceiver mReceiver;
+    private FakeFeatureFactory mFeatureFactory;
+    private SlicesFeatureProvider mSlicesFeatureProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+
+        //setup for SettingsSliceProvider tests
+        mProvider = spy(new SettingsSliceProvider());
+        doReturn(mContext).when(mProvider).getContext();
+
+        //setup for SliceBroadcastReceiver test
+        mReceiver = spy(new SliceBroadcastReceiver());
+
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
+
+        // Prevent crash in SliceMetadata.
+        Resources resources = spy(mContext.getResources());
+        doReturn(60).when(resources).getDimensionPixelSize(anyInt());
+        doReturn(resources).when(mContext).getResources();
+
+        mWfcSliceHelper = new FakeWifiCallingSliceHelper(mContext);
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+    }
+
+    @Test
+    public void test_CreateWifiCallingSlice_invalidSubId() {
+        mWfcSliceHelper.setDefaultVoiceSubId(-1);
+
+        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+
+        testWifiCallingSettingsUnavailableSlice(slice, null,
+                SliceBuilderUtils.getSettingsIntent(mContext));
+    }
+
+    @Test
+    public void test_CreateWifiCallingSlice_wfcNotSupported() {
+        doReturn(false).when(mMockImsManager).isWfcEnabledByPlatform();
+
+        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testWifiCallingSettingsUnavailableSlice(slice, null,
+                SliceBuilderUtils.getSettingsIntent(mContext));
+    }
+
+    @Test
+    public void test_CreateWifiCallingSlice_needsActivation() {
+        /* In cases where activation is needed and the user action
+        would be turning on the wifi calling (i.e. if wifi calling is
+        turned off) we need to guide the user to wifi calling settings
+        activity so the user can perform the activation there.(PrimaryAction)
+         */
+        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
+        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
+        doReturn(false).when(mMockImsManager).isWfcEnabledByUser();
+        doReturn(false).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
+        doReturn(null).when(mMockCarrierConfigManager).getConfigForSubId(1);
+        mWfcSliceHelper.setActivationAppIntent(new Intent()); // dummy Intent
+
+        final Slice slice  = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testWifiCallingSettingsUnavailableSlice(slice, null,
+                getActivityIntent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+    }
+
+    @Test
+    public void test_CreateWifiCallingSlice_success() {
+        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
+        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
+        doReturn(true).when(mMockImsManager).isWfcEnabledByUser();
+        doReturn(true).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
+        doReturn(null).when(mMockCarrierConfigManager).getConfigForSubId(1);
+
+        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testWifiCallingSettingsToggleSlice(slice, null);
+    }
+
+    @Test
+    public void test_SettingSliceProvider_getsRightSliceWifiCalling() {
+        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
+        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
+        doReturn(true).when(mMockImsManager).isWfcEnabledByUser();
+        doReturn(true).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
+        doReturn(null).when(mMockCarrierConfigManager).getConfigForSubId(1);
+        doReturn(mWfcSliceHelper).when(mSlicesFeatureProvider)
+              .getNewWifiCallingSliceHelper(mContext);
+
+        final Slice slice = mProvider.onBindSlice(mWfcURI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testWifiCallingSettingsToggleSlice(slice, null);
+    }
+
+    @Test
+    public void test_SliceBroadcastReceiver_toggleOffWifiCalling() {
+        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
+        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
+        doReturn(false).when(mMockImsManager).isWfcEnabledByUser();
+        doReturn(true).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
+        doReturn(mWfcSliceHelper).when(mSlicesFeatureProvider)
+              .getNewWifiCallingSliceHelper(mContext);
+        mWfcSliceHelper.setActivationAppIntent(null);
+
+        ArgumentCaptor<Boolean> mWfcSettingCaptor = ArgumentCaptor.forClass(Boolean.class);
+
+        // turn on Wifi calling setting
+        Intent intent = new Intent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED);
+        intent.putExtra(EXTRA_TOGGLE_STATE, true);
+
+        // change the setting
+        mReceiver.onReceive(mContext, intent);
+
+        verify((mMockImsManager)).setWfcSetting(mWfcSettingCaptor.capture());
+
+        // assert the change
+        assertThat(mWfcSettingCaptor.getValue()).isTrue();
+    }
+
+    private void testWifiCallingSettingsUnavailableSlice(Slice slice,
+            SliceData sliceData, PendingIntent expectedPrimaryAction) {
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+
+        //Check there is no toggle action
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).isEmpty();
+
+        // Check whether the primary action is to open wifi calling settings activity
+        final PendingIntent primaryPendingIntent =
+                metadata.getPrimaryAction().getAction();
+        assertThat(primaryPendingIntent).isEqualTo(expectedPrimaryAction);
+
+        // Check the title
+        final List<SliceItem> sliceItems = slice.getItems();
+        assertTitle(sliceItems, mContext.getString(R.string.wifi_calling_settings_title));
+    }
+
+    private void testWifiCallingSettingsToggleSlice(Slice slice,
+            SliceData sliceData) {
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).hasSize(1);
+
+        final SliceAction mainToggleAction = toggles.get(0);
+
+        // Check intent in Toggle Action
+        final PendingIntent togglePendingIntent = mainToggleAction.getAction();
+        final PendingIntent expectedToggleIntent = getBroadcastIntent(
+                WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED);
+        assertThat(togglePendingIntent).isEqualTo(expectedToggleIntent);
+
+        // Check primary intent
+        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+        final PendingIntent expectedPendingIntent =
+                getActivityIntent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_SETTINGS_ACTIVITY);
+        assertThat(primaryPendingIntent).isEqualTo(expectedPendingIntent);
+
+        // Check the title
+        final List<SliceItem> sliceItems = slice.getItems();
+        assertTitle(sliceItems, mContext.getString(R.string.wifi_calling_settings_title));
+    }
+
+    private PendingIntent getBroadcastIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.setClass(mContext, SliceBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    private PendingIntent getActivityIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+    }
+
+    private void assertTitle(List<SliceItem> sliceItems, String title) {
+        boolean hasTitle = false;
+        for (SliceItem item : sliceItems) {
+            List<SliceItem> titleItems = SliceQuery.findAll(item, FORMAT_TEXT, HINT_TITLE,
+                    null /* non-hints */);
+            if (titleItems == null) {
+                continue;
+            }
+
+            hasTitle = true;
+            for (SliceItem subTitleItem : titleItems) {
+                assertThat(subTitleItem.getText()).isEqualTo(title);
+            }
+        }
+        assertThat(hasTitle).isTrue();
+    }
+    private class FakeWifiCallingSliceHelper extends WifiCallingSliceHelper {
+        int mSubId = 1;
+
+        private Intent mActivationAppIntent;
+        FakeWifiCallingSliceHelper(Context context) {
+            super(context);
+            mActivationAppIntent = null;
+        }
+
+        @Override
+        protected CarrierConfigManager getCarrierConfigManager(Context mContext) {
+            return mMockCarrierConfigManager;
+        }
+
+        @Override
+        protected ImsManager getImsManager(int subId) {
+            return mMockImsManager;
+        }
+
+        protected int getDefaultVoiceSubId() {
+            return mSubId;
+        }
+
+        protected void setDefaultVoiceSubId(int id) {
+            mSubId = id;
+        }
+
+        @Override
+        protected Intent getWifiCallingCarrierActivityIntent(int subId) {
+            return mActivationAppIntent;
+        }
+
+        public void setActivationAppIntent(Intent intent) {
+            mActivationAppIntent = intent;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
index e618343..586c448 100644
--- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -69,9 +69,9 @@
     @Test
     public void testUpdateState() throws Exception {
         OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
-                "", "", OverlayInfo.STATE_ENABLED, 0);
+                "", "", OverlayInfo.STATE_ENABLED, 0, 0, true);
         OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
-                "", "", 0, 0);
+                "", "", 0, 0, 0, true);
         when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> {
             ApplicationInfo info = mock(ApplicationInfo.class);
             if ("com.android.Theme1".equals(inv.getArguments()[0])) {
@@ -105,9 +105,9 @@
     @Test
     public void testUpdateState_withStaticOverlay() throws Exception {
         OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
-                "", "", OverlayInfo.STATE_ENABLED, 0);
+                "", "", OverlayInfo.STATE_ENABLED, 0, 0, true);
         OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
-                "", "", OverlayInfo.STATE_ENABLED, 0);
+                "", "", OverlayInfo.STATE_ENABLED, 0, 0, true);
         when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> {
             ApplicationInfo info = mock(ApplicationInfo.class);
             if ("com.android.Theme1".equals(inv.getArguments()[0])) {
@@ -145,7 +145,7 @@
         when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
                 new PackageInfo());
         when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
-                .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0)));
+                .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, false)));
         assertThat(mPreferenceController.isAvailable()).isFalse();
     }
 
@@ -154,8 +154,8 @@
         when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
                  new PackageInfo());
         when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
-                .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0),
-                        new OverlayInfo("", "", "", "", 0, 0)));
+                .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, true),
+                        new OverlayInfo("", "", "", "", 0, 0, 0, true)));
         assertThat(mPreferenceController.isAvailable()).isTrue();
     }
 
diff --git a/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java b/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
new file mode 100644
index 0000000..e7c5d6e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.slices;
+
+import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SliceDeepLinkSpringBoardTest {
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void launcheDeepLinkIntent_shouldNotCrash() {
+        final Uri springBoardIntentUri = createDeepLink(
+                new Intent(SliceDeepLinkSpringBoard.ACTION_VIEW_SLICE)
+                        .setPackage(mContext.getPackageName())
+                        .putExtra(SliceDeepLinkSpringBoard.EXTRA_SLICE,
+                                "content://com.android.settings.slices/action/test_slice")
+                        .toUri(Intent.URI_ANDROID_APP_SCHEME));
+
+        final Intent deepLinkIntent = new Intent(Intent.ACTION_VIEW)
+                .setData(springBoardIntentUri)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        mContext.startActivity(deepLinkIntent);
+    }
+}