diff --git a/Android.mk b/Android.mk
index 683db50..61734fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,7 @@
     LOCAL_JACK_FLAGS := --multi-dex native
 endif
 
-include frameworks/opt/setupwizard/library/common.mk
+include frameworks/opt/setupwizard/library/common-full-support.mk
 include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ef0536f..620fbd2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2760,8 +2760,8 @@
 
         <activity android:name="ShowAdminSupportDetailsDialog"
                 android:theme="@style/Transparent"
-                android:excludeFromRecents="true">
-
+                android:excludeFromRecents="true"
+                android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.settings.SHOW_ADMIN_SUPPORT_DETAILS" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable-hdpi/msg_bubble_incoming.9.png b/res/drawable-hdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..7fed0a8
--- /dev/null
+++ b/res/drawable-hdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-hdpi/msg_bubble_outgoing.9.png b/res/drawable-hdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..8e7ccc0
--- /dev/null
+++ b/res/drawable-hdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/msg_bubble_incoming.9.png b/res/drawable-ldrtl-hdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..8e7ccc0
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/msg_bubble_outgoing.9.png b/res/drawable-ldrtl-hdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..7fed0a8
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/msg_bubble_incoming.9.png b/res/drawable-ldrtl-mdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..5ca9b14
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/msg_bubble_outgoing.9.png b/res/drawable-ldrtl-mdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..4e7e464
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/msg_bubble_incoming.9.png b/res/drawable-ldrtl-xhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..52cb936
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/msg_bubble_outgoing.9.png b/res/drawable-ldrtl-xhdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..0661fdb
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-xxhdpi/msg_bubble_incoming.9.png b/res/drawable-ldrtl-xxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..5d8fc74
--- /dev/null
+++ b/res/drawable-ldrtl-xxhdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-xxhdpi/msg_bubble_outgoing.9.png b/res/drawable-ldrtl-xxhdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..009c721
--- /dev/null
+++ b/res/drawable-ldrtl-xxhdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-xxxhdpi/msg_bubble_incoming.9.png b/res/drawable-ldrtl-xxxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..8378db5
--- /dev/null
+++ b/res/drawable-ldrtl-xxxhdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-ldrtl-xxxhdpi/msg_bubble_outgoing.9.png b/res/drawable-ldrtl-xxxhdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..f0d0d9e
--- /dev/null
+++ b/res/drawable-ldrtl-xxxhdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-mdpi/msg_bubble_incoming.9.png b/res/drawable-mdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..4e7e464
--- /dev/null
+++ b/res/drawable-mdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-mdpi/msg_bubble_outgoing.9.png b/res/drawable-mdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..5ca9b14
--- /dev/null
+++ b/res/drawable-mdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/msg_bubble_incoming.9.png b/res/drawable-xhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..0661fdb
--- /dev/null
+++ b/res/drawable-xhdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/msg_bubble_outgoing.9.png b/res/drawable-xhdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..52cb936
--- /dev/null
+++ b/res/drawable-xhdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/msg_bubble_incoming.9.png b/res/drawable-xxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..ab693b3
--- /dev/null
+++ b/res/drawable-xxhdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/msg_bubble_outgoing.9.png b/res/drawable-xxhdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..5b2a2ff
--- /dev/null
+++ b/res/drawable-xxhdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/msg_bubble_incoming.9.png b/res/drawable-xxxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000..34130fc
--- /dev/null
+++ b/res/drawable-xxxhdpi/msg_bubble_incoming.9.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/msg_bubble_outgoing.9.png b/res/drawable-xxxhdpi/msg_bubble_outgoing.9.png
new file mode 100644
index 0000000..cfd5734
--- /dev/null
+++ b/res/drawable-xxxhdpi/msg_bubble_outgoing.9.png
Binary files differ
diff --git a/res/drawable/conversation_message_icon.xml b/res/drawable/conversation_message_icon.xml
new file mode 100644
index 0000000..a1192ec
--- /dev/null
+++ b/res/drawable/conversation_message_icon.xml
@@ -0,0 +1,26 @@
+<!--
+    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.
+-->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+   <solid
+       android:color="#FF0000"/>
+
+   <size
+       android:width="42dp"
+        android:height="42dp"/>
+</shape>
diff --git a/res/layout/admin_support_details_content.xml b/res/layout/admin_support_details_content.xml
index f1c5d6e..52de743 100644
--- a/res/layout/admin_support_details_content.xml
+++ b/res/layout/admin_support_details_content.xml
@@ -13,15 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Layout used for displaying admin support details in empty preference fragments. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/admin_support_details"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="@*android:dimen/preference_fragment_padding_side"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:visibility="gone">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:id="@+id/admin_support_msg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -39,4 +31,4 @@
             android:textColor="?android:attr/colorAccent"
             android:clickable="true"
             android:background="?android:attr/selectableItemBackground" />
-</LinearLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml
index d9f71ae..c796cc4 100644
--- a/res/layout/admin_support_details_dialog.xml
+++ b/res/layout/admin_support_details_dialog.xml
@@ -46,23 +46,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-            <TextView android:id="@+id/admin_support_msg"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:text="@string/default_admin_support_msg"
-                    android:maxLength="200"
-                    android:autoLink="email|phone"
-                    android:textColor="?android:attr/textColorSecondary" />
-            <TextView android:id="@+id/admins_policies_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="@dimen/admin_details_dialog_link_padding_top"
-                    android:text="@string/admin_support_more_info"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:textColor="?android:attr/colorAccent"
-                    android:clickable="true"
-                    android:background="?android:attr/selectableItemBackground" />
+            <include layout="@layout/admin_support_details_content" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/res/layout/admin_support_details_empty_view.xml b/res/layout/admin_support_details_empty_view.xml
new file mode 100644
index 0000000..bbbbbbc
--- /dev/null
+++ b/res/layout/admin_support_details_empty_view.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<!-- Layout used for displaying admin support details in empty preference fragments. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/admin_support_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@*android:dimen/preference_fragment_padding_side"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:visibility="gone">
+    <include layout="@layout/admin_support_details_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/battery_usage_graph.xml b/res/layout/battery_usage_graph.xml
new file mode 100644
index 0000000..ddf7d93
--- /dev/null
+++ b/res/layout/battery_usage_graph.xml
@@ -0,0 +1,50 @@
+<?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"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/charge"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="36sp"
+        android:textColor="?android:attr/colorAccent" />
+
+    <TextView
+        android:id="@+id/estimation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorSecondary" />
+
+    <com.android.settingslib.graph.UsageView
+        android:id="@+id/battery_usage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        settings:sideLabels="@array/battery_labels"
+        android:colorAccent="?android:attr/colorAccent"
+        android:gravity="end"
+        settings:textColor="?android:attr/textColorSecondary" />
+
+</LinearLayout>
diff --git a/res/layout/conversation_message_content.xml b/res/layout/conversation_message_content.xml
new file mode 100644
index 0000000..7bc53e5
--- /dev/null
+++ b/res/layout/conversation_message_content.xml
@@ -0,0 +1,45 @@
+<?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:id="@+id/message_content"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
+    <com.android.settings.display.MessageBubbleBackground
+        android:id="@+id/message_text_and_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:minHeight="@dimen/conversation_message_contact_icon_size"
+        android:layout_marginTop="0dp" >
+
+        <TextView
+            android:id="@+id/message_text"
+            android:textSize="@dimen/conversation_message_text_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/message_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/conversation_status_text_size" />
+
+    </com.android.settings.display.MessageBubbleBackground>
+
+</LinearLayout>
diff --git a/res/layout/screen_zoom_preview_3.xml b/res/layout/conversation_message_icon.xml
similarity index 61%
copy from res/layout/screen_zoom_preview_3.xml
copy to res/layout/conversation_message_icon.xml
index 6fc7fd0..4ffd285 100644
--- a/res/layout/screen_zoom_preview_3.xml
+++ b/res/layout/conversation_message_icon.xml
@@ -14,7 +14,11 @@
      limitations under the License.
 -->
 
-<com.android.settings.display.AppGridView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/conversation_icon"
+    android:layout_width="@dimen/conversation_message_contact_icon_size"
+    android:layout_height="@dimen/conversation_message_contact_icon_size"
+    android:fontFamily="sans-serif"
+    android:textStyle="bold"
+    android:textSize="@dimen/conversation_message_contact_icon_text_size"
+    android:gravity="center" />
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index d675a19..42c9139 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -73,7 +73,7 @@
         android:gravity="center"
         android:visibility="gone" />
 
-    <include layout="@layout/admin_support_details_content" />
+    <include layout="@layout/admin_support_details_empty_view" />
 
     <RelativeLayout android:id="@+id/button_bar"
         android:layout_height="wrap_content"
diff --git a/res/layout/screen_zoom_preview_3.xml b/res/layout/preference_widget_summary.xml
similarity index 72%
rename from res/layout/screen_zoom_preview_3.xml
rename to res/layout/preference_widget_summary.xml
index 6fc7fd0..aa4c76b 100644
--- a/res/layout/screen_zoom_preview_3.xml
+++ b/res/layout/preference_widget_summary.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.settings.display.AppGridView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget_summary"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceSmall"
+    android:textColor="?android:attr/textColorSecondary" />
diff --git a/res/layout/preview_seek_bar_view_pager.xml b/res/layout/preview_seek_bar_view_pager.xml
index ac315b8..4badca4 100644
--- a/res/layout/preview_seek_bar_view_pager.xml
+++ b/res/layout/preview_seek_bar_view_pager.xml
@@ -24,7 +24,8 @@
         android:id="@+id/preview_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:attr/colorBackgroundFloating" />
+        android:background="?android:attr/colorBackgroundFloating"
+        android:importantForAccessibility="noHideDescendants"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index ca2ecca..62cd093 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- 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.
@@ -14,10 +14,52 @@
      limitations under the License.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scrollbars="none"
-    android:background="?android:attr/colorBackgroundFloating">
+    android:background="@color/conversation_background"
+    android:padding="@dimen/conversation_message_list_padding"
+    android:orientation="vertical" >
 
-</ScrollView>
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="false"
+        app:messageText="@string/screen_zoom_conversation_message_1"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_1"
+        app:iconText="@string/screen_zoom_conversation_icon_alex"
+        app:iconTextColor="@color/message_icon_text_outgoing"
+        app:iconBackgroundColor="@color/message_icon_background_outgoing" />
+
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="true"
+        app:messageText="@string/screen_zoom_conversation_message_2"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_2"
+        app:iconText="@string/screen_zoom_conversation_icon_pete"
+        app:iconTextColor="@color/message_icon_text_incoming"
+        app:iconBackgroundColor="@color/message_icon_background_incoming" />
+
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="false"
+        app:messageText="@string/screen_zoom_conversation_message_3"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_3"
+        app:iconText="@string/screen_zoom_conversation_icon_alex"
+        app:iconTextColor="@color/message_icon_text_outgoing"
+        app:iconBackgroundColor="@color/message_icon_background_outgoing" />
+
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="true"
+        app:messageText="@string/screen_zoom_conversation_message_4"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_4"
+        app:iconText="@string/screen_zoom_conversation_icon_pete"
+        app:iconTextColor="@color/message_icon_text_incoming"
+        app:iconBackgroundColor="@color/message_icon_background_incoming" />
+
+</LinearLayout>
diff --git a/res/layout/screen_zoom_preview_2.xml b/res/layout/screen_zoom_preview_2.xml
index ca2ecca..d9b748d 100644
--- a/res/layout/screen_zoom_preview_2.xml
+++ b/res/layout/screen_zoom_preview_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- 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.
@@ -13,11 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.settings.display.AppGridView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="none"
-    android:background="?android:attr/colorBackgroundFloating">
-
-</ScrollView>
+    android:layout_height="match_parent" />
diff --git a/res/layout/screen_zoom_preview_app_icon.xml b/res/layout/screen_zoom_preview_app_icon.xml
index a9b18b6..b5ab4ac 100644
--- a/res/layout/screen_zoom_preview_app_icon.xml
+++ b/res/layout/screen_zoom_preview_app_icon.xml
@@ -28,10 +28,10 @@
 
         <ImageView
             android:id="@android:id/icon1"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
             android:layout_marginBottom="4dp"
-            android:scaleType="centerInside" />
+            android:scaleType="fitCenter" />
 
         <TextView
             android:id="@android:id/text1"
diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
new file mode 100644
index 0000000..cf9a8bd
--- /dev/null
+++ b/res/layout/screen_zoom_preview_settings.xml
@@ -0,0 +1,219 @@
+<?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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="none"
+    android:background="?android:attr/colorBackgroundFloating">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <!-- Wifi Setting -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingStart="8dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/wifi_signal_dark"
+                android:tint="?android:attr/colorAccent"
+                android:scaleType="center" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingStart="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/wifi_settings"
+                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/wifi_display_status_not_available"
+                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                    android:textColor="?android:attr/textColorSecondary" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- Data usage Setting -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingStart="8dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_settings_data_usage"
+                android:tint="?android:attr/colorAccent"
+                android:scaleType="center" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingStart="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/data_usage_summary_title"
+                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/no_data_usage"
+                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                    android:textColor="?android:attr/textColorSecondary" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- Display Setting -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingStart="8dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_settings_display"
+                android:tint="?android:attr/colorAccent"
+                android:scaleType="center" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingStart="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/display_settings_title"
+                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/display_summary_on"
+                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                    android:textColor="?android:attr/textColorSecondary" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- Sound & Notification Setting -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingStart="8dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_settings_sound"
+                android:tint="?android:attr/colorAccent"
+                android:scaleType="center" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingStart="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sound_settings"
+                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sound_settings_example_summary"
+                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                    android:textColor="?android:attr/textColorSecondary" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- Apps Setting -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingStart="8dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_settings_applications"
+                android:tint="?android:attr/colorAccent"
+                android:scaleType="center" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingStart="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/applications_settings"
+                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/apps_summary_example"
+                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                    android:textColor="?android:attr/textColorSecondary" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 135c5a0..f5496f4 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -15,11 +15,11 @@
     limitations under the License.
 -->
 
-<com.android.setupwizardlib.SetupWizardLayout
+<com.android.setupwizardlib.SetupWizardPreferenceLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:id="@android:id/list_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout="@layout/suw_no_scroll_template"
     settings:suwBackgroundTile="@drawable/setup_illustration_tile"
     settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile" />
diff --git a/res/layout/suw_no_scroll_template_card.xml b/res/layout/suw_no_scroll_template_card.xml
deleted file mode 100644
index 3cdec90..0000000
--- a/res/layout/suw_no_scroll_template_card.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    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.
--->
-
-<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
-     RecyclerView. For other layouts that should be put inside a ScrollView, consider using
-     suw_template instead. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.android.setupwizardlib.view.Illustration
-        android:id="@+id/suw_layout_decor"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@drawable/suw_layout_background">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingLeft="@dimen/suw_card_port_margin_sides"
-            android:paddingRight="@dimen/suw_card_port_margin_sides">
-
-            <TextView
-                android:id="@+id/suw_layout_title"
-                style="@style/SuwCardTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="?attr/suwCardBackground"
-                android:elevation="@dimen/suw_card_elevation"
-                tools:ignore="UnusedAttribute">
-
-                <FrameLayout
-                    android:id="@+id/suw_layout_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <!-- Temporary solution to work with PreferenceFragment v14 -->
-                    <FrameLayout android:id="@android:id/list_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-
-                </FrameLayout>
-
-                <include layout="@layout/suw_progress_bar_stub" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </com.android.setupwizardlib.view.Illustration>
-
-    <com.android.setupwizardlib.view.NavigationBar
-        android:id="@+id/suw_layout_navigation_bar"
-        style="@style/SuwNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/suw_navbar_height" />
-
-</LinearLayout>
diff --git a/res/layout/suw_no_scroll_template_card_wide.xml b/res/layout/suw_no_scroll_template_card_wide.xml
deleted file mode 100644
index 73b9008..0000000
--- a/res/layout/suw_no_scroll_template_card_wide.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    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.
--->
-
-<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
-     RecyclerView. For other layouts that should be put inside a ScrollView, consider using
-     suw_template instead. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.android.setupwizardlib.view.Illustration
-        android:id="@+id/suw_layout_decor"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@drawable/suw_layout_background">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="start|top"
-            android:weightSum="16">
-
-            <TextView
-                android:id="@+id/suw_layout_title"
-                style="@style/SuwCardTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/suw_card_land_header_text_margin_top"
-                android:layout_weight="6" />
-
-            <FrameLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="8"
-                android:background="?attr/suwCardBackground"
-                android:elevation="@dimen/suw_card_elevation"
-                tools:ignore="UnusedAttribute">
-
-                <FrameLayout
-                    android:id="@+id/suw_layout_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <!-- Temporary solution to work with PreferenceFragment v14 -->
-                    <FrameLayout android:id="@android:id/list_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-
-                </FrameLayout>
-
-                <include layout="@layout/suw_progress_bar_stub" />
-
-            </FrameLayout>
-
-        </LinearLayout>
-
-    </com.android.setupwizardlib.view.Illustration>
-
-    <com.android.setupwizardlib.view.NavigationBar
-        android:id="@+id/suw_layout_navigation_bar"
-        style="@style/SuwNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/suw_navbar_height" />
-
-</LinearLayout>
diff --git a/res/layout/suw_no_scroll_template_header.xml b/res/layout/suw_no_scroll_template_header.xml
deleted file mode 100644
index 0291e55..0000000
--- a/res/layout/suw_no_scroll_template_header.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    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.
--->
-
-<!-- IMPORTANT NOTE: Even if this layout is used with a view that handles its scroll internally,
-     like WebView or RecyclerView, the illustration will not scroll away, since this view doesn't
-     know about the scrolling view at all. It is recommended that you add the illustration as a
-     header to the RecyclerView or avoid using this layout (e.g. use suw_no_scroll_template_short
-     instead of suw_no_scroll_template) -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <com.android.setupwizardlib.view.Illustration
-            android:id="@+id/suw_layout_decor"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/suw_layout_background"
-            android:elevation="@dimen/suw_title_area_elevation"
-            android:tag="stickyContainer"
-            tools:ignore="UnusedAttribute">
-
-            <TextView
-                android:id="@+id/suw_layout_title"
-                style="@style/SuwHeaderTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:tag="sticky" />
-
-        </com.android.setupwizardlib.view.Illustration>
-
-        <include layout="@layout/suw_progress_bar_stub" />
-
-        <FrameLayout
-            android:id="@+id/suw_layout_content"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <!-- Temporary solution to work with PreferenceFragment v14 -->
-            <FrameLayout android:id="@android:id/list_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-    <com.android.setupwizardlib.view.NavigationBar
-        android:id="@+id/suw_layout_navigation_bar"
-        style="@style/SuwNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/suw_navbar_height" />
-
-</LinearLayout>
diff --git a/res/layout/suw_no_scroll_template_header_collapsed.xml b/res/layout/suw_no_scroll_template_header_collapsed.xml
deleted file mode 100644
index 7eff625..0000000
--- a/res/layout/suw_no_scroll_template_header_collapsed.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    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.
--->
-
-<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
-     RecyclerView. For other layouts that should be put inside a ScrollView, consider using
-     suw_template instead. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:id="@+id/suw_layout_decor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/suw_layout_background"
-        android:elevation="@dimen/suw_title_area_elevation"
-        tools:ignore="UnusedAttribute">
-
-        <TextView
-            android:id="@+id/suw_layout_title"
-            style="@style/SuwHeaderTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-    </FrameLayout>
-
-    <include layout="@layout/suw_progress_bar_stub" />
-
-    <FrameLayout android:id="@+id/suw_layout_content"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <!-- Temporary solution to work with PreferenceFragment v14 -->
-        <FrameLayout android:id="@android:id/list_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
-
-    <com.android.setupwizardlib.view.NavigationBar
-        android:id="@+id/suw_layout_navigation_bar"
-        style="@style/SuwNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/suw_navbar_height" />
-
-</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b8a7333..232ca18 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Ontkoppel SD-kaart"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Vee USB-berging uit"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Vee SD-kaart uit"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Maak die teks op skerm kleiner of groter."</string>
     <string name="small_font" msgid="2295331917424072635">"Klein"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medium"</string>
     <string name="large_font" msgid="599055175160971446">"Groot"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ontsluit met vinger"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Raak eenvoudig die vingerafdruksensor om jou foon te ontsluit, aankope te magtig of by jou programme aan te meld. \n\n Wees versigtig wie se vingerafdrukke jy byvoeg – enige vingerafdrukke wat bygevoeg is, sal hierdie goed kan doen."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Let wel: Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Kom meer te wete"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Let wel: Jou vingerafdruk kan dalk minder veilig wees as \'n sterk patroon of PIN. "<annotation id="url">"Kom meer te wete"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Kanselleer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Gaan voort"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor, gesteel of skoongevee word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor, gesteel of uitgevee word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie foon te gebruik as dit verloor, gesteel of uitgevee word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor of gesteel word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor of gesteel word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie foon te gebruik as dit verloor of gesteel word nie."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Slaan in elk geval oor"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Gaan terug"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Vind die sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Vind die vingerafdruksensor op die agterkant van jou foon."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustrasie met toestel en ligging van vingerafdruksensor"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Jy kan tot <xliff:g id="COUNT">%d</xliff:g> vingerafdrukke byvoeg"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Verwyder alle vingerafdrukke?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Jy sal nie jou vingerafdrukke kan gebruik om jou foon te ontsluit, aankope te magtig of daarmee by programme aan te meld nie."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, verwyder"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Gebruik jou vingerafdruk om voort te gaan."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsie"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Beskerm jou toestel"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Ontsluit met jou vingerafdruk"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Kies skermslot"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Kies skermslot"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Beskerm jou foon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"\'n Vingerafdruk kan dalk minder veilig wees as \'n sterk patroon, PIN of wagwoord. Stel \'n rugsteunsluitskerm op om veilig te wees."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Keer ander mense om hierdie tablet sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Kies jou rugsteunmetode vir skermsluiting"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skermslot"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Verander slotskerm"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium tot hoë sekuriteit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wagwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hoë sekuriteit"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Nie nou nie"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Huidige skermslot"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Vingerafdruk + Patroon"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Vingerafdruk + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wagwoord moet minstens %d karakters hê"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN moet minstens %d syfers wees"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tik op Gaan voort wanneer jy klaar is"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Gaan voort"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wagwoord moet korter as <xliff:g id="NUMBER">%d</xliff:g> karakters wees."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN moet korter as <xliff:g id="NUMBER">%d</xliff:g> syfers wees."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(onveranderd)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Kies asseblief"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Veelvuldige sertifikate is bygevoeg)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Gebruik stelselsertifikate"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Moenie verskaf nie"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Moenie staaf nie"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Geen sertifikaat is gespesifiseer nie. Jou verbinding sal nie privaat wees nie."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Moet \'n domein spesifiseer."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Voer jou netwerkwagwoord in"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Stemmingvertoning"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Maak skerm wakker wanneer jy die toestel opstel of kennisgewings ontvang"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Maak teks groter of kleiner"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaart se sluitinstellings"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Stel SIM-kaart-slot"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaart-slot"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Toeganklikheid"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Toeganklikheidsinstellings"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Visie-instellings"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Jy kan hierdie toestel pasmaak om by jou behoeftes te pas. Hierdie toeganklikheidkenmerke kan later in Instellings verander word."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Skermleser hoofsaaklik vir mense wat blind of swaksiende is"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Stelsel"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Vertoon"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Onderskrifte"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Vergrotinggebaar"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tik 3 keer om te zoem"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Tik die skerm 3 keer met een vinger om in of uit te zoem.\n\nTerwyl jy ingezoem is, kan jy:\n"<ul>\n<li>"Rollees: Trek 2 of meer vingers oor die skerm"</li>\n<li>"Zoemvlak verstel: Knyp 2 of meer vingers saam of sprei hulle oop"</li></ul>\n\n"Tik 3 keer en hou in met die laaste tik om tydelik te zoem. Terwyl jy jou vinger op die skerm hou, trek dit om op die skerm rond te beweeg. Lig jou vinger om weer uit te zoem.\n\nLet wel: Vergrotinggebaar werk oral, behalwe op die sleutelbord en navigasiebalk."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Toeganklikheid-kortpad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aan"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Af"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Rugsteun toesteldata (soos Wi-Fi-wagwoorde en oproepgeskiedenis) en programdata (soos instellings en lêers wat deur programme geberg is) outomaties oor \'n afstand.\n\nWanneer jy outomatiese rugsteun aanskakel, word toestel- en programdata van tyd tot tyd oor \'n afstand gestoor. Programdata kan enige data wees wat \'n program gestoor het (op grond van ontwikkelaarinstellings), insluitend potensieel sensitiewe data, soos kontakte, boodskappe en foto\'s."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Toesteladministrasie-instellings"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Toesteladministrateur"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiveer"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Deïnstalleer"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiveer hierdie toesteladministrateur"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Deïnstalleer program"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiveer en deïnstalleer"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Toesteladministrateurs"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Geen toesteladministrateurs beskikbaar nie"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Persoonlik"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Werk"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Geen beskikbare vertrouensagente nie"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktiveer toesteladministrateur?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiveer"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktiveer hierdie toesteladministrateur"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Toesteladministrateur"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"As die administrateur geaktiveer word, sal die program <xliff:g id="APP_NAME">%1$s</xliff:g> die volgende bewerkings kan doen:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Die administrateur is aktief en laat die program <xliff:g id="APP_NAME">%1$s</xliff:g> toe om die volgende bewerkings uit te voer:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Skakel foonoproepe en SMS aan?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Oproep- en SMS-geskiedenis sal met hierdie gebruiker gedeel word."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Noodinligting"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Toeganklik deur sluitskerm in die noodbeller"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Toeganklik vir enigiemand van die noodbeller af sonder dat jou foon ontsluit hoef te word."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Laat programme en inhoud toe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programme met beperkings"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Brei instellings vir program uit"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Verander tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> na net wekkers"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Verander na onderbreek altyd"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokkeer wanneer skerm aan is"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, op die skerm opspring of verskyn"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokkeer wanneer skerm af is"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, die skerm laat aanskakel of die kennisgewinglig laat flikker"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Af"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Wanneer skerm aan is"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wanneer skerm af is"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wanneer skerm aan of af is"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Voer administrateur-PIN in"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Maak die kameraprogram oop deur jou pols twee keer vinnig te draai"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Druk aan/af-skakelaar 2 keer vir kamera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Maak kamera vinnig oop sonder om jou skerm te ontsluit"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Vertoongrootte"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Maak items op die skerm groter of kleiner"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"skermdigtheid, skermzoem, skaal, skaalverandering"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Maak die items op jou skerm kleiner of groter. Sommige programme op jou skerm kan van posisie verander."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Voorskou"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Maak kleiner"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Maak groter"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fd1c8d5..5231627 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም ወደ መተግበሪያዎች ለመግባት በቀላሉ የጣት አሻራ ዳሳሹን ይንኩት። \n\n የማን ጣት አሻራዎች እንደሚያክሉ ላይ ይጠንቀቁ - ማንኛውም የታከሉ ጣት አሻራዎች እነዚህን ነገሮች ማድረግ ይችላሉ።"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ማስታወሻ፦ የጣት አሻራዎ ከጠንካራ ስርዓተ ጥለት ወይም ፒን ባነሰ መልኩ የተጠበቀ ሊሆን ይችላል።"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"ተጨማሪ ይወቁ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ማስታወሻ፦ የእርስዎ የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት ወይም ፒን ይልቅ ደኅንነቱ ያነሰ አስተማማኝ ነው። "<annotation id="url">"የበለጠ ለመረዳት"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ይቅር"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ቀጥል"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"የመሣሪያ ጥበቃ ባሕሪያት ገቢር አይሆኑም። ይህ ጡባዊ ከጠፋ፣ ከተሰረቀ ወይም ከተጸዳ ሌሎች እንዳይጠቀሙበት ለመከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"የመሣሪያ ጥበቃ ባሕሪያት ገቢር አይሆኑም። ይህ መሣሪያ ከጠፋ፣ ከተሰረቀ ወይም ከተጸዳ ሌሎች እንዳይጠቀሙበት ለመከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"የመሣሪያ ጥበቃ ባሕሪያት ገቢር አይሆኑም። ይህ ስልክ ከጠፋ፣ ከተሰረቀ ወይም ከተጸዳ ሌሎች እንዳይጠቀሙበት ለመከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"የመሣሪያ ጥበቃ ባሕሪያት አይነቁም። ይህ ጡባዊ ከጠፋ ወይም ከተሰረቀ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"የመሣሪያ ጥበቃ ባህሪያት ገቢር አይሆኑም። ይህ መሣሪያ ከጠፋ ወይም ከተሰረቀ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"የመሳሪያ ጥበቃ ባህሪያት አይነቁም። ይህ ስልክ ከጠፋ ወይም ከተሰረቀ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"ለማንኛውም ዝለል"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"ወደኋላ ተመለስ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ዳሳሹን ያግኙት"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"በስልክዎ ጀርባ ላይ ያለውን የጣት አሻራ ዳሳሹን ያግኙት።"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ከመሣሪያ እና የጣት አሻራ አነፍናፊ መገኛ አካባቢ መግለጫ ስዕል ጋር"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"እስከ <xliff:g id="COUNT">%d</xliff:g> የሚደርሱ የጣት አሻራዎችን ማከል ይችላሉ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ሁሉም የጣት አሻራዎች ይወገዱ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"ስልክዎን ለመክፈት፣ ለግዢዎች ፍቃድ ለመስጠት ወይም በጣት አሻራዎችዎ በመለያ ወደ መተግበሪያዎች ለመግባት የእርስዎን የጣት አሻራዎች መጠቀም አይችሉም።"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"መሣሪያዎን ይጠብቁ"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"በእርስዎ የጣት አሻራ ይክፈቱ"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"የማያ ገጽ መቆለፊያን ይምረጡ"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ለእርስዎ ስልክ ጥበቃ ይድርጉ"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት፣ ፒን ወይም የይለፍ ቃል ያነሰ ደኅንነቱ አስተማማኝ ነው። ደኅንነትዎ የተጠበቀ እንዲሆን ምትኬ የማያ ገጽ መቆለፊያ ያዘጋጁ።"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ጡባዊ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"የመሣሪያ ጥበቃ ማድረጊያ ባሕሪዎችን በማግበር ያለ እርስዎ ፈቃድ ሌሎች ይህን መሣሪያ እንዳይጠቀሙ ይከላከሉዋቸው። መጠቀም የሚፈልጉትን ማያ ገጽ መቆለፊያ ይምረጡ።"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ስልክ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"የምትኬ ቁልፍ ገጽ ስልትዎን ይምረጡ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ መቆለፊያ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ከመካከለኛ እስከ ከፍተኛ ጥበቃ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"አሁን አይደለም"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"አሁን ያለ ማያ ገጽ መቆለፊያ"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"የጣት አሻራ + ሥርዓተ ጥለት"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"የጣት አሻራ + ፒን"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"የይለፍ ቃል ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ፒን  ቢያንስ %d አሃዞች መሆን አለበት"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"ሲጨርሱ «ቀጥል»ን ነካ ያድርጉ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ቀጥል"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"የይለፍ ቃል ከ<xliff:g id="NUMBER">%d</xliff:g> ቁምፊዎች ያነሰ መሆን አለበት።"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ፒን  ከ<xliff:g id="NUMBER">%d</xliff:g> አሀዞች ያነሰ መሆን አለበት።"</string>
@@ -1929,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"በራስ-ሰር የመሣሪያ ውሂብ (እንደ Wi-Fi የይለፍ ቃሎች እና የጥሪ ታሪክ የመሳሰሉ) እና የመተግበሪያ ውሂብ (እንደ በመተግበሪያዎች የተቀመጡ ቅንብሮች እና ፋይሎች) በርቀት በምትኬ ያስቀምጡ።\n\nራስ-ሰር በምትኬ ማስቀመጥን ሲያበሩ፣ የመሣሪያ እና የመተግበሪያ ውሂብ በተወሰነ ክፍለ ጊዜ በርቀት ይቀመጣሉ። የመተግበሪያ ውሂብ (በገንቢ ቅንብሮች ላይ የሚመረኮዝ ሆኖ)፣ እንደ እውቂያዎች፣ መልዕክቶች፣ እና ፎቶዎች የመሳሰሉ አደጋ ሊያስክትሉ የሚችሉ ውሂብን ጨምሮ ማናቸውም መተግበሪያ ያስቀመጠው ውሂብ ሊሆን ይችላል።"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"መሣሪያ አስተዳደር ቅንብሮች"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"የመሳሪያ አስተዳደር"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"አቦዝን"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"አራግፍ"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ይህን መሣሪያ አስተዳዳሪ ገቢር እንዳይሆን አድርገው"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"መተግበሪያ አራግፍ"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"አቦዝን እና አራግፍ"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"መሣሪያ አስተዳዳሪዎች"</string>
     <string name="no_device_admins" msgid="702695100241728775">"የመሣሪያ አስተዳዳሪዎች የሉም"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"የግል"</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="6246742476064507965">"የመሣሪያ አስተዳዳሪ ይግበር?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"አግብር"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"የዚህን መሣሪያ አስተዳዳሪ አግብር"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"የመሳሪያ አስተዳደር"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ይህን አስተዳዳሪ ማንቃት <xliff:g id="APP_NAME">%1$s</xliff:g> መተግበሪያን የሚከተሉትን ክንውኖች ለማከናወን ይፈቅድለታል።"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ይህ አስተዳዳሪ ንቁ እና የሚከተሉትን ክንውኖች ለማካሄድ <xliff:g id="APP_NAME">%1$s</xliff:g> መተግበሪያን ይፈቅዳል።"</string>
@@ -2258,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"የስልክ ጥሪዎች እና ኤስኤምኤስ ይብሩ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"የጥሪ እና የኤስኤምኤስ ታሪክ ለዚህ ተጠቃሚ ይጋራል።"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"የአስቸኳይ ጊዜ መረጃ"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"በአስቸኳይ ጊዜ መደወያው ላይ ባለው የመቆለፊያ ማያ ገጽ በኩል ተደራሽ"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"የእርስዎ ስልክን መክፈት ሳያስፈልግ ከአስቸኳይ ጥሪ መደወያ በማንም ሰው ሊደርስ የሚችል"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"መተግበሪያዎችን እና ይዘትን ይፍቀዱ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ገደቦች ያሏቸው መተግበሪያዎች"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"የመተግበሪያዎች ቅንብሮችን ዘርጋ"</string>
@@ -2574,7 +2588,7 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"እስከ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ድረስ ብቻ ወደ ማንቂያዎች ይቀይሩ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ወደ ሁልጊዜ አቋርጥ ለውጥ"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"ማያ ገጹሲበራ አግድ"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"ማያ ገጹ ሲበራ አግድ"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"በ«አትረብሽ» ድምጻቸው የጠፉ ማሳወቂያዎች በማያ ገጽ ላይ ብቅ እንዳይሉ ከልክል"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"ማያ ገጹ ሲጠፋ"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"በ«አትረብሽ» ድምጻቸው የጠፉ ማሳወቂያዎች ማያ ገጹን እንዳያበሩ ወይም የማሳወቂያ ብርሃኑን እንዳያብለጨልጩ ከልክል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0199eb4..3f98ced 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -339,10 +339,17 @@
     <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_message" msgid="4747510337049957778">"المس مستشعر بصمات الإصبع لإلغاء تأمين هاتفك أو التفويض بعمليات شراء أو تسجيل الدخول إلى التطبيقات. \n\n توخ الحذر عند إضافة بصمات الأصابع، فإن أي بصمات أصابع تتم إضافتها ستتمكن من تنفيذ هذه المهام."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ملاحظة: يمكن أن يكون استخدام ميزة بصمة الإصبع أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"مزيد من المعلومات"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ملاحظة: ربما تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"إلغاء"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"متابعة"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز اللوحي في حال فقده أو سرقته أو محو بياناته."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز في حال فقده أو سرقته أو محو بياناته."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الهاتف في حال فقده أو سرقته أو محو بياناته."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز اللوحي في حال فقده أو سرقته."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز في حال فقده أو سرقته."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الهاتف في حال فقده أو سرقته."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"تخطٍ على أية حال"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"رجوع"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"العثور على المستشعر"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ضع مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"صورة توضيحية تبرز الجهاز وموقع جهاز استشعار بصمة الإصبع"</string>
@@ -376,6 +383,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> بصمات الإصبع"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"هل تريد إزالة جميع بصمات الإصبع؟"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"لن تتمكن من استخدام بصمات إصبعك لإلغاء قفل الهاتف، أو اعتماد عمليات الشراء، أو تسجيل الدخول إلى التطبيقات من خلالها."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -413,7 +422,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"حماية جهازك"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"إلغاء التأمين باستخدام بصمة الإصبع"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"اختيار قفل الشاشة"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"اختيار قفل الشاشة"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"حماية هاتفك"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ربما تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي أو كلمة مرور قوية. يمكنك إعداد شاشة تأمين احتياطية لتأمين نفسك."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"يمكنك منع الآخرين من استخدام هذا الجهاز اللوحي بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"يمكنك منع الآخرين من استخدام هذا الجهاز بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"يمكنك منع الآخرين من استخدام هذا الهاتف بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"اختيار الطريقة الاحتياطية لقفل الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغيير تأمين الشاشة"</string>
@@ -429,6 +442,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"من تأمين متوسط إلى عال"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"كلمة المرور"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"تأمين عال"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ليس الآن"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"قفل الشاشة الحالي"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"بصمة الإصبع والنقش"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"بصمة الإصبع ورقم التعريف الشخصي"</string>
@@ -481,7 +495,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"‏يجب أن تكون كلمة المرور %d من الأحرف على الأقل"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"‏يجب أن يكون رمز PIN %d من الأرقام على الأقل"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"انقر على \"متابعة\" عند الانتهاء."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"يجب أن تكون كلمة المرور أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأحرف."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"‏يجب أن يكون رمز PIN أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأرقام."</string>
@@ -735,13 +748,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(لم يتم التغيير)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"الرجاء التحديد"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(تمت إضافة عدة شهادات)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"استخدام شهادات النظام"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"عدم التوفير"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"عدم التحقق"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"لم يتم تحديد أية شهادات. لن يكون اتصالك خاصًا."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"يجب تحديد نطاق."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS متاح"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS متاح)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"أدخل كلمة مرور الشبكة"</string>
@@ -1995,15 +2006,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"‏بإمكانك الاحتفاظ تلقائيًا بنسخة احتياطية من بيانات الجهاز (مثل كلمات مرور Wi-Fi وسجل المكالمات) وبيانات التطبيقات (مثل الإعدادات والملفات التي تخزنها التطبيقات) عن بُعد.\n\nعند تشغيل الاحتفاظ التلقائي بنسخة احتياطية، يتم بشكل دوري حفظ بيانات الجهاز وبيانات التطبيقات عن بُعد. ويمكن أن تكون بيانات التطبيقات أية بيانات تم حفظها في التطبيق (استنادًا إلى إعدادات مطور التطبيق) بما في ذلك البيانات المحتمل أن تكون حساسة مثل جهات الاتصال والرسائل والصور."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"إعدادات إدارة الجهاز"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"مشرف الجهاز"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"إلغاء التنشيط"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"إلغاء التثبيت"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"إلغاء تنشيط مشرف هذا الجهاز"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"إلغاء تثبيت التطبيق"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"إلغاء التنشيط وإلغاء التثبيت"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"مشرفو الجهاز"</string>
     <string name="no_device_admins" msgid="702695100241728775">"ليس هناك مشرفو أجهزة متاحين"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"شخصي"</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="6246742476064507965">"هل تريد تنشيط مشرف الجهاز؟"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"تنشيط"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"تنشيط مشرف هذا الجهاز"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"مشرف الجهاز"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"سيؤدي تنشيط هذا المشرف إلى السماح للتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> بتنفيذ العمليات التالية:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"هذا المشرف نشط ويسمح للتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> بتنفيذ العمليات التالية:"</string>
@@ -2324,7 +2336,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏تشغيل المكالمات الهاتفية والرسائل القصيرة SMS؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏ستتم مشاركة سجل المكالمات والرسائل القصيرة SMS مع هذا المستخدم."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"معلومات الطوارئ"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"يمكن الوصول من خلال شاشة التأمين في برنامج اتصال الطوارئ"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"يمكن لأي شخص الوصول من خلال طالب الطوارئ بدون إلغاء تأمين هاتفك"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"السماح بالتطبيقات والمحتوى"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"التطبيقات ذات القيود"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسيع إعدادات التطبيق"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 4c76ed8..f8b72a2 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD kartı çıxarın"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB yaddaşı silin"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD kartı silin"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Ekrandakı mətni kiçildin və ya böyüdün."</string>
     <string name="small_font" msgid="2295331917424072635">"Kiçik"</string>
     <string name="medium_font" msgid="2068475425515133701">"Orta"</string>
     <string name="large_font" msgid="599055175160971446">"Böyük"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Barmaq izi ilə kiliddən çıxarın"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. \n\n Kimi əlavə etdiyinizə diqqət edin - əlavə edilmiş hər hansı barmaq izi ilə bunları etmək mümkün olacaq."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Qeyd: Barmaq iziniz güclü nümunə kod və ya PIN koddan daha az etibarlı ola bilər."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Ətraflı məlumat"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Qeyd: Barmaq iziniz güclü model və ya PİN koddan daha az təhlükəsizdir. "<annotation id="url">"Daha ətraflı"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ləğv edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davam edin"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Cihazın qorunması xfunksiyaları aktivləşdirilməyəcəkdir. İtərsə, oğurlanarsa, yaxud silinərsə, başqalarının bu planşetdən istifadəsinə mane ola bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Cihazın qorunması xüsusiyyətləri aktivləşdirilməyəcəkdir. İtərsə, oğurlanarsa, yaxud təmizlənərsə, başqalarının bu cihazdan istifadəsinə mane ola bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Cihazın qorunması xüsusiyyətləri aktivləşdirilməyəcəkdir. İtərsə, oğurlanarsa, yaxud təmizlənərsə, başqalarının bu telefondan istifadəsinə mane ola bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Cihazın qorunması funksiyaları aktivləşməyəcək. İtərsə və ya oğurlanarsa, başqalarının bu planşetdən istifadəsinə mane ola bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Cihazın qorunması funksiyaları aktivləşməyəcək. İtərsə və ya oğurlanarsa, başqalarının bu cihazdan istifadəsinə mane ola bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Cihazın qorunması funksiyaları aktivləşməyəcək. İtərsə və ya oğurlanarsa, başqalarının bu telefondan istifadəsinə mane ola bilməyəcəksiniz."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Hər halda atla"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Geri qayıt"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensoru tapın"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Barmaq izi sensorunu telefonun arxasında tapın"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Cihaz və barmaq izi sensoru ilə illustrasiya"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> ədədə qədər barmaq izi əlavə edə bilərsiniz"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Bütün barmaq izləri silinsin?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Telefonunuzun kilidini açmaq, alış-verişə icazə vermək və ya onunla tətbiqlərə daxil olmaq üçün barmaq izinizi istifadə edə bilməyəcəksiniz."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Bəli, silin"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Davam etmək üçün barmaq izinizi istifadə edin."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifrələmə"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Cihazınızı qoruyun"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Barmaq iziniz ilə kilidi açın"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidi seçin"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Ekran kilidi seçin"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefonunuzu qoruyun"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Barmaq izi güclü nümunə kod və ya PIN koddan daha az təhlükəsizdir. Əmin olmaq üçün ekran kilidi yedəkləməsi quraşdırın."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu planşetdən istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu cihazdan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu telefondan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Yedəkləmə ekranı kilid metodunu seçin"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekran kilidlənməsini dəyişin"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Ortadan yüksək təhlükəsizliyə"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parol"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yüksək təhlükəsizlik"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"İndi yox"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Cari ekran kilidi"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Barmaq izi + Model"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Barmaq izi + PIN kod"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilid parolunu dəyişdirin"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parolda ən azı %d simvol olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PİN kodda ən azı %d rəqəm olmalıdır"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tamamlayan zaman \"Davam et\" seçiminə basın"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Dəvam et"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Şifrə <xliff:g id="NUMBER">%d</xliff:g> simvoldan az olmalıdır"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN <xliff:g id="NUMBER">%d</xliff:g> rəqəmdən az olmalıdır."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(dəyişilməyən)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Zəhmət olmasa, seçin"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Çoxsaylı sertifikat əlavə olundu)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Sistem sertifikatlarını istifadə edin"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Təmin etməyin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Düzgünlüyü yoxlamayın"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifikat təyin olunmayıb. Bağlantınız şəxsi olmayacaq."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domen göstərilməlidir."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Əlçatımlı WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mövcuddur)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Şəbəkə parolunuzu daxil edin"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ətraf mühit displeyi"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Cihazı seçdikdə və ya bildirişlər aldığınız zaman ekranın açılması"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Şrift ölçüsü"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Mətni kiçildin və ya böyüdün"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SİM kart kilidi parametrləri"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SİM kart kilidini ayarlayın"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SİM kart kilidi"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Giriş imkanı"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Əlçatımlılıq parametrləri"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görünüş Ayarları"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı ehtiyacınıza uyğun fərdiləşdirə bilərsiniz. Bu əlçatımlıq xüsusiyyətləri daha sonra Ayarlardan dəyişdirilə bilər."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Xidmətlər"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Ekran oxucusu əsasən korluq və aşağı görmə qabiliyyəti olan insanlar üçündür"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Displey"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Başlıqlar"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Büyütmə jesti"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Miqyası dəyişmək üçün 3 dəfə tıklayın"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Yaxınlaşdırmaq və ya uzaqlaşdırmaq üçün bir barmağınızla ekrana 3 dəfə tıklayın.\n\nYaxınlaşdığı zaman bunları edə bilərsiniz:\n"<ul>\n<li>"Sürüşdürmə: İki və daha artıq barmağı ekran üzərində sürüşdürün."</li>\n<li>"Zoom dərəcəsini təyin edin: İki və daha çox barmağı ekran üzərində sürüşdürərək bir-birinə yaxınlaşdırın və ya bir-birindən uzaqlaşdırın."</li></ul>\n\n"Siz həmçinin barmağınızın altında olanı üçqat tıklayaraq saxlamaqla müvəqqəti böyüdə bilərsiniz. Bu böyüdülmüş halda, barmağınızı ekranda sürüşdürərək müxtəlif hissələr axtara bilərsiniz. Barmağınızı ekrandan çəkən kimi ekran öncəki halına qayıdacaq.\n\nQeyd: Naviqasiya üçün üçqat tıklama klaviatura və naviqasiya panelindən başqa hər yerdə işləyir."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Əlçatımlılıq yarlığı"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aktiv"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Deaktiv"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Cihaz datası (Wi-Fi parolları və zəng tarixçəsi) və tətbiq datasını (tətbiqlər tərəfindən saxlanılan ayar və fayllar) uzaqdan avtomatik yedəkləyin.\n\nAvtomatik yedəkləməni aktiv etdikdə, cihaz və tətbiq datası dövri olaraq uzaqdan saxlanılacaq. Tətbiq datası tətbiqin yadda saxladığı (developer ayarlarından asılı olaraq) istənilən data ola bilər, buta kontant, mesaj və fotolar kimi həssas data da daxildir."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Cihaz administrasiya ayarları"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Cihaz administratoru"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiv edin"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Sistemdən sil"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Bu cihazın administratorunu deaktiv edin"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Tətbiqi sistemdən sil"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiv edin və Sistemdən silin"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Cihaz administratorları"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Cihaz administratorları mövcud deyil"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Şəxsi"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"İş"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Əlçatımlı əmanət agenti yoxdur"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Cihaz administratoru aktivləşdirilsin?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivləşdirin"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Bu cihazın administratorunu aktiv edin"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Cihaz administratoru"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Bu administratorun aktivləşdirilməsi <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinə aşağıdakı əməliyyatları yerinə yetirməyə imkan verəcək:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Bu administratov aktivdir və aşağıdakı əməliyyatları icra etmək üçün <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinə icazə verir:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon zəngləri &amp; SMS aktivləşdirilsin?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Zəng və SMS tarixçəsi bu istifadəçi ilə paylaşılacaq."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Təcili məlumat"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Ekran kilidi zamanı təcili nömrəyığma əlçatandır"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Telefon kilidini açmadan təcili nömrə yığan ilə hər kəs tərəfindən əlçatandır"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tətbiq və kontentə icazə ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Məhdudiyyətli Tətbiqlər"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Tətbiq üçün parametrləri genişləndirin"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Yalnız <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> vaxtınadək xəbərdarlıqları dəyişin"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Həmişə fasiləyə dəyişin"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Ekran aktiv olduğu zaman blok edin"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Baxışlardakı Narahat Etməyin vasitəsilə və ya ekranda görünən ilə səssiz edilmiş bildirişlərin qarşısını alın"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Ekran qapalı olduğu zaman blok edin"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Ekran yanarkən Narahat Etməyin vasitəsilə və ya işığın yanıb sönməsi ilə səssiz edilmiş bildirişlərin qarşısını alın"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Deaktiv"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Ekran açıq olduğu zaman"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran qapalı olduğu zaman"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran açıq və ya qapalı olduğu zaman"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildiriş ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihaz haqqında fikrinizi bildirin"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administrator PIN kodunu daxil edin"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Biləyinizi iki dəfə buraraq kamera tətbiqini açın"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera üçün yandırıb söndürmə düyməsinə iki dəfə basın"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ekranınızın kilidini açmadan kameranı cəld açın"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Ekran ölçüsü"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Ekrandakı elementləri böyüdün və ya kiçildin"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ekran yaxınlığı, ekran sıxlığı, miqyas, ölçmə"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Ekrandakı elementləri kiçildin və ya böyüdün. Ekranınızdakı bəzi tətbiqlər mövqeyini dəyişə bilər."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Önizləmə"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Kiçildin"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Böyüdün"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0027170..8c1608d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -333,10 +333,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključajte otiskom prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, ovlastili kupovine ili se prijavili u aplikacije. \n\n Vodite računa čije otiske prstiju dodajete – ove radnje će moći da se obave pomoću svih otisaka prstiju koje dodate."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Napomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Saznajte više"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Napomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a. "<annotation id="url">" Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj tablet u slučaju gubitka, krađe ili brisanja."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj uređaj u slučaju gubitka, krađe ili brisanja."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj telefon u slučaju gubitka, krađe ili brisanja."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj tablet u slučaju gubitka ili krađe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj uređaj u slučaju gubitka ili krađe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj telefon u slučaju gubitka ili krađe."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ipak preskoči"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Vrati se"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Pronađite senzor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Na poleđini uređaja pronađite senzor za otisak prsta."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
@@ -370,6 +377,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Maksimalan broj otisaka prstiju koji možete da dodate je <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ukloniti sve otiske prstiju?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Otiske prstiju nećete moći da koristite za otključavanje telefona, ovlašćivanje kupovina ili prijavljivanje u aplikacije pomoću njih."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Nastavite pomoću digitalnog otiska."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanje"</string>
@@ -407,7 +416,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite uređaj"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključajte pomoću otiska prsta"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje ekrana"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Izaberite zaključavanje ekrana"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite telefon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a ili lozinke. Podesite rezervni metod za zaključavanje ekrana da biste bili bezbedni."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Sprečite druge da koriste ovaj tablet bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Sprečite druge da koriste ovaj uređaj bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Sprečite druge da koriste ovaj telefon bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izaberite rezervni način za zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promena zaključ. ekrana"</string>
@@ -423,6 +436,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednji do visokog nivoa bezbednosti"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lozinka"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visok nivo bezbednosti"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ne sada"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Aktuelno zaključavanje ekrana"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Imprint + šablon"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Imprint + PIN"</string>
@@ -475,7 +489,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promena lozinke za otključavanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Minimalni broj znakova koji lozinka mora da sadrži je %d"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Minimalni broj cifara u PIN-u je %d"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Dodirnite Nastavi kada završite"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lozinka mora da ima manje od <xliff:g id="NUMBER">%d</xliff:g> znak(ov)a."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora da ima manje od <xliff:g id="NUMBER">%d</xliff:g> cifre(ara)."</string>
@@ -711,13 +724,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepromenjeno)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Izaberite"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Dodato je više sertifikata)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Koristi sertifikate sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne pružaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne proveravaj"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden nikakav sertifikat. Veza neće biti privatna."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Morate da navedete domen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite lozinku za mrežu"</string>
@@ -1947,15 +1958,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatski pravite rezervne kopije podataka uređaja (poput Wi-Fi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) daljinski.\n\nKada uključite automatsko pravljenje rezervnih kopija, podaci uređaja i aplikacija se povremeno čuvaju daljinski. Podaci aplikacija mogu da budu bilo koji podaci koje je aplikacija sačuvala (na osnovu podešavanja programera), uključujući potencijalno osetljive podatke kao što su kontakti, poruke i slike."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Podešavanja administracije uređaja"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator uređaja"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiviraj"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Deinstaliraj"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiviraj ovaj administrator uređaja"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Deinstaliraj aplikaciju"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiviraj i deinstaliraj"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratori uređaja"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nema dostupnih administratora uređaja"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Lični"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Posao"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Trust agents - Nedostupno"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Želite li da aktivirate administrator uređaja?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiviraj"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktiviraj ovaj administrator uređaja"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator uređaja"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktiviranjem ovog administratora omogućićete aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da obavi sledeće operacije:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Ovaj administrator je aktivan i omogućava da aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> obavi sledeće operacije:"</string>
@@ -2276,7 +2288,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Istorija poziva i SMS-ova će se deliti sa ovim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije o hitnom slučaju"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Dostupno preko zaključanog ekrana u aplikaciji za pozive u hitnim slučajevima"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Dostupno svakome u aplikaciji za pozive u hitnim slučajevima bez otključavanja telefona"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije sa ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi podešavanja aplikacije"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3016ed0..999157e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Деактивиране на SD карта"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Изтриване на USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Изтриване на SD картата"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Намаляване или уголемяване на текста на екрана."</string>
     <string name="small_font" msgid="2295331917424072635">"Малък"</string>
     <string name="medium_font" msgid="2068475425515133701">"Среден"</string>
     <string name="large_font" msgid="599055175160971446">"Голям"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"Трябва само да докоснете сензора за отпечатъци, за да отключите телефона си, да оторизирате покупка или да влезете в приложение.\n\nВнимавайте чии отпечатъци добавяте, защото съответните хора ще могат да правят тези неща."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Забележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Научете повече"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Забележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код. "<annotation id="url">"Научете повече"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Отказ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Напред"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този таблет от други хора, ако бъде изгубен, откраднат или данните му бъдат изтрити."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването му от други хора, ако бъде изгубено, откраднато или данните му бъдат изтрити."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този телефон от други хора, ако бъде изгубен, откраднат или данните му бъдат изтрити."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този таблет от други хора, ако бъде изгубен или откраднат."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването му от други хора, ако бъде изгубено или откраднато."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този телефон от други хора, ако бъде изгубен или откраднат."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Пропускане въпреки това"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Намиране на сензора"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Намерете сензора за отпечатък на гърба на телефона си."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Илюстрация с устройството и местоположението на сензора за отпечатък"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Можете да добавите до <xliff:g id="COUNT">%d</xliff:g> отпечатъка"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Да се премахнат ли вс. отпечатъци?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Няма да можете да използвате отпечатъците си, за да отключвате телефона си, да оторизирате покупки или да влизате в приложения."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Защитете устройството си"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Отключване с отпечатъка ви"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Закл. на екрана: Избор"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Защитете телефона си"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Отпечатъкът може да е по-малко сигурен в сравнение с надеждна фигура, ПИН код или парола. Настройте резервна опция за заключен екран, за да сте защитени."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Предотвратете използването на този таблет от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Предотвратете използването на това устройство от други хора без разрешението ви, като активирате функциите за защитата му. Изберете опцията за заключване на екрана, която искате да използвате."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Предотвратете използването на този телефон от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Изберете резервния си начин на заключване на екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заключване на екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промяна на заключването"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Средна до висока защита"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Парола"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Висока защита"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Не сега"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Текущо заключване на екрана"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Отпечатък + фигура"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Отпечатък + ПИН код"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Паролата трябва да е поне %d знака"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ПИН кодът трябва да е поне %d цифри"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Докоснете „Напред“, когато сте готови"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Напред"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Паролата трябва да е по-малко от <xliff:g id="NUMBER">%d</xliff:g> знака."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ПИН кодът трябва да е по-малко от <xliff:g id="NUMBER">%d</xliff:g> цифри.Ако прекъснете връзката"</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(непроменени)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Моля, изберете"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Добавени са няколко сертификата)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Използване на системни сертификати"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Без предоставяне"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Без удостоверяване"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Не е посочен сертификат. Връзката ви няма да бъде частна."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Трябва да посочите домейн."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Налице е WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Въведете паролата за мрежата"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Дисплей, открояващ важни неща"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Включване на екрана при вдигане на устройството или при получаване на известия"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Уголемяване или намаляване на текст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Заключване на SIM картата"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настройване на заключването"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Заключване на SIM картата"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Достъпност"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки за достъпност"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки при зрителни проблеми"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"В състояние сте да персонализирате устройството така, че да отговаря на нуждите ви. Тези функции за достъпност могат да бъдат променени по-късно от „Настройки“."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Услуги"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Екранен четец, предимно за хора със слепота и слабо зрение"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Дисплей"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Надписи"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Жест за увеличение"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Трикратно докосване за промяна на мащаба"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"За да увеличите или намалите мащаба, докоснете екрана три пъти с един пръст.\n\nПри увеличен мащаб можете:\n"<ul>\n<li>"Да превъртате: Плъзнете два или повече пръсти по екрана."</li>\n<li>"Да коригирате нивото на мащаба: Съберете заедно два или повече пръсти или ги разтворете."</li></ul>\n\n"За да увеличите временно мащаба, докоснете три пъти и задръжте при последното натискане. Докато задържате пръста си, го плъзнете, за да се придвижите по екрана. Вдигнете пръста си, за да се върнете към първоначалния мащаб.\n\nЗабележка: Жестът за увеличение работи навсякъде освен за клавиатурата и за лентата за навигация."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пряк път към ф-ята за достъпност"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Включено"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Изкл."</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Автоматично създаване на отдалечено резервно копие на данните на устройството (като пароли за Wi-Fi и история на обажданията) и тези на приложенията (като настройки и съхранявани от приложенията файлове).\n\nКогато включите автоматичното създаване на резервно копие, данните на устройството и на приложенията периодично се запазват отдалечено. Данните на приложенията могат да бъдат всяка запазвана от тях информация (въз основа на настройките за програмисти), включително потенциално поверителната, като например контакти, съобщения и снимки."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Административни настройки на устройство"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор на устройство"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Деактивиране"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Деинсталиране"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Деактивиране на този администратор на устройството"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Деинсталиране на приложението"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Деактивиране и деинсталиране"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Администратори на устройство"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Няма налични администратори на устройство"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Лично"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Служебно"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Няма налични trust agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Да се активира ли администраторът на устройството?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Активиране"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Активиране на този администратор на устройството"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Администратор на устройство"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Активирането на този администратор ще разреши на приложението <xliff:g id="APP_NAME">%1$s</xliff:g> да изпълнява следните действия:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Този администратор е активен и разрешава на приложението <xliff:g id="APP_NAME">%1$s</xliff:g> да изпълнява следните действия:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Да се включат ли телефонните обаждания и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историята на обажданията и SMS съобщенията ще се сподели с този потребител."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информация за спешни случаи"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Достъпна от клавиатурата за набиране на спешни номера на заключения екран"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Всеки има достъп от клавиатурата за набиране на спешни номера, без да отключва телефона ви"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активиране на режима „Само будилници“ до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Активиране на режима „Прекъсване винаги“"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Блокиране при включен екран"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Известията, блокирани чрез „Не безпокойте“, няма да се показват мимолетно, нито да изскачат на екрана"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Блокиране при изключен екран"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Известията, блокирани чрез „Не безпокойте“, няма да включват екрана или да задействат пулсиращата светлина"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Изключено"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"При включен екран"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"При изключен екран"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"При включен или изключен екран"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отзиви за устройството"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Въведете администраторския ПИН код"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Отворете приложението Камера с двукратно завъртане на китката си"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"За камерата натиснете бутона за захранване 2 пъти"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Бързо отваряйте камерата, без да отключвате екрана си"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Екранен размер"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Уголемяване или намаляване на елементите на екрана"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"плътност на дисплея, промяна на мащаба на екрана, мащаб, мащабиране"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Намаляване или уголемяване на елементите на екрана. Позицията на някои приложения може да се промени."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Визуализация"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Намаляване на размера"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Увеличаване на размера"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index ba4cb43..d72720e 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD কার্ড আনমাউন্ট করুন"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD কার্ড মুছে ফেলুন"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"স্ক্রীনের পাঠ্য ছোট বা বড় করুন।"</string>
     <string name="small_font" msgid="2295331917424072635">"ক্ষুদ্র"</string>
     <string name="medium_font" msgid="2068475425515133701">"মাঝারি"</string>
     <string name="large_font" msgid="599055175160971446">"বৃহত্‍"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"আপনার ফোন আনলক করতে, কেনাকাটায় অনুমতি দিতে বা অ্যাপ্লিকেশানগুলিতে সাইন ইন করতে শুধুমাত্র আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন। \n\n আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন - যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবে।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"দ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি শক্তিশালী প্যাটার্ন বা পিন এর চাইতে কম নিরাপদ হতে পারে।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"আরো জানুন"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"দ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি শক্তিশালী প্যাটার্ন বা পিন এর চাইতে কম নিরাপদ হতে পারে। "<annotation id="url">"আরো জানুন"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"বাতিল করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"চালিয়ে যান"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা হয়নি৷ যদি এই ট্যাবলেটটি হারিয়ে যায়, চুরি হয়ে যায় বা মুছে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা হয়নি৷ যদি এই ডিভাইসটি হারিয়ে যায়, চুরি হয়ে যায় বা মুছে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা হয়নি৷ যদি এই ফোনটি হারিয়ে যায়, চুরি হয়ে যায় বা মুছে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা যাবে না৷ যদি এই ট্যাবলেটটি হারিয়ে যায় বা চুরি হয়ে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা যাবে না৷ যদি এই ডিভাইসটি হারিয়ে যায় বা চুরি হয়ে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা যাবে না৷ যদি এই ফোনটি হারিয়ে যায় বা চুরি হয়ে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"তবুও এড়িয়ে যান"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"ফিরে যান"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"সেন্সরটি খুঁজুন"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"আপনার ফোনের পিছনে আঙ্গুলের ছাপ সেন্সরের অবস্থান নির্ণয় করুন৷"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ডিভাইস এবং আঙ্গুলের ছাপ সেন্সরের অবস্থানের সাথে চিত্রালংকরণ"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"আপনি <xliff:g id="COUNT">%d</xliff:g>টি পর্যন্ত আঙ্গুলের ছাপ যোগ করতে পারেন"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"সমস্ত আঙ্গুলের ছাপ সরাবেন?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"আপনি আপনার আঙ্গুলের ছাপগুলি দিয়ে আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে সাইন ইন করতে পারবেন না৷"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"আপনার ডিভাইস সুরক্ষিত করুন"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"আপনার আঙ্গুলের ছাপ দিয়ে আনলক করুন"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"স্ক্রীন লক চয়ন করুন"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"স্ক্রীন লক বাছুন"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"আপনার ফোন রক্ষা করুন"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"আঙ্গুলের ছাপ একটি শক্তিশালী প্যাটার্ন বা পিন এর চাইতে কম নিরাপদ হতে পারে। নিরাপদ রাখতে একটি ব্যাক আপ লক স্ক্রীন সেট আপ করুন৷"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ট্যাবলেটটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক চয়ন করুন৷"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ডিভাইসটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক চয়ন করুন৷"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ফোনটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক চয়ন করুন৷"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"আপনার ব্যাক আপ স্ক্রীন লক পদ্ধতি নির্বাচন করুন"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"স্ক্রীন লক"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"লক স্ক্রীন পরিবর্তন করুন"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"মাঝারি থেকে উচ্চ নিরাপত্তা"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"পাসওয়ার্ড"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"উচ্চ নিরাপত্তা"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"এখনই নয়"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"বর্তমান স্ক্রীন লক"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"আঙ্গুলের ছাপ + প্যাটার্ন"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"আঙ্গুলের ছাপ + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"আনলক পাসওয়ার্ড পরিবর্তন করুন"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"পাসওয়ার্ড অন্তত %d অক্ষরের হতে হবে"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"পিন কমপক্ষে %dটি সংখ্যার হতে হবে৷"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"সম্পন্ন হলে অবিরত থাকুন এ আলতো চাপুন"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"চালিয়ে যান"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"পাসওয়ার্ড <xliff:g id="NUMBER">%d</xliff:g>টি অক্ষরের থেকে কম হওয়া আবশ্যক।"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"পিন কমপক্ষে <xliff:g id="NUMBER">%d</xliff:g>টি সংখ্যার কম হতে হবে৷"</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(অপরিবর্তিত)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"অনুগ্রহ করে নির্বাচন করুন"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(একাধিক শংসাপত্র যোগ করা হয়েছে)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"সিস্টেমের শংসাপত্রগুলি ব্যবহার করুন"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"প্রদান করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"যাচাই করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"কোনো শংসাপত্র নির্দিষ্ট করা নেই৷ আপনার সংযোগ ব্যক্তিগত করা হবে না৷"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"একটি ডোমেন উল্লেখ করা আবশ্যক৷"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS উপলব্ধ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS উপলব্ধ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"আপনার নেটওয়ার্ক পাসওয়ার্ডটি লিখুন"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"অ্যামবিয়েন্ট প্রদর্শন"</string>
     <string name="doze_summary" msgid="7128970177894383698">"যখন আপনি ডিভাইস হাতে নেবেন বা বিজ্ঞপ্তিগুলি গ্রহণ করবেন তখন স্ক্রীন জাগায়"</string>
     <string name="title_font_size" msgid="4405544325522105222">"হরফের আকার"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"পাঠ্য বড় বা ছোট করুন"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"সিম কার্ড লক সেটিংস"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"সিম কার্ড লক সেট আপ করুন"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"সিম কার্ড লক"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"সহজ ব্যবহার"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"সহজ ব্যবহার সেটিংস"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"দৃষ্টির সেটিংস"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"আপনার প্রয়োজন অনুসারে আপনি এই ডিভাইসটি কাস্টমাইজ করতে পারেন৷ এই অ্যাক্সেসযোগ্যতার বৈশিষ্ট্যগুলি পরে সেটিংসে গিয়ে পরিবর্তন করা যাবে৷"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"পরিষেবাগুলি"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"স্ক্রীন রিডার প্রাথমিকভাবে অন্ধত্ব এবং কম দৃষ্টি সম্পন্ন ব্যক্তিদের জন্য"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"সিস্টেম"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"প্রদর্শন"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"ক্যাপশান"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"বিবর্ধন করার অঙ্গভঙ্গি"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"জুম করতে ৩ বার আলতো চাপ দিন"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"জুম বাড়াতে বা কমাতে একটি আঙুল দিয়ে স্ক্রীনে ৩ বার আলতো চাপুন৷\n\nজুম বাড়ানোর সময়, আপনি:\n"<ul>\n<li>"স্ক্রোল: স্ক্রীন জুড়ে ২টি বা তার বেশী আঙুল টেনে আনুন"</li>\n<li>"জুমের লেভেল সমন্বয় করতে: একসাথে ২টি বা তার বেশি আঙ্গুল এক জায়গায় টেনে এনে সেগুলিকে বিস্তৃত করুন"</li></ul>\n\n"অস্থায়ীভাবে জুম করতে, ৩ বার আলতো চাপ দিন এবং শেষ বার আলতো চাপার সময় ধরে রাখুন৷ আপনার আঙুলটি নীচের দিকে ধরে রেখে, সারা স্ক্রীন জু্ড়ে সরাতে টেনে আনুন৷ আবার জুম কমাতে আপনার আঙুলটি সরিয়ে নিন৷\n\nদ্রষ্টব্য: \'বিবর্ধন করার অঙ্গভঙ্গি\' কীবোর্ড ও নেভিগেশান দন্ড ছাড়া সর্বত্র কাজ করে৷"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"সহজ ব্যবহার শর্টকাট"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"চালু করুন"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"বন্ধ করুন"</string>
@@ -1690,12 +1694,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"কোনো পরিষেবা ইনস্টল করা নেই"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"কোনো বিবরণ প্রদান করা নেই।"</string>
     <string name="settings_button" msgid="3006713718908152930">"সেটিংস"</string>
-    <string name="print_settings" msgid="4742428530112487843">"মুদ্রণ"</string>
+    <string name="print_settings" msgid="4742428530112487843">"প্রিন্ট"</string>
     <plurals name="print_settings_title" formatted="false" msgid="6994238166067938432">
       <item quantity="one">%dটি মুদ্রণের কাজ</item>
       <item quantity="other">%dটি মুদ্রণের কাজ</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"মুদ্রণ পরিষেবাগুলি"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"প্রিন্ট পরিষেবাগুলি"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"কোনো পরিষেবা ইনস্টল করা নেই"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"কোনো মুদ্রক পাওয়া যায়নি"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"সেটিংস"</string>
@@ -1707,12 +1711,12 @@
     <string name="print_menu_item_search" msgid="7025589328240514553">"অনুসন্ধান করুন"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"মুদ্রকগুলি অনুসন্ধান করা হচ্ছে"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"পরিষেবা অক্ষমিত"</string>
-    <string name="print_print_jobs" msgid="3582094777756968793">"মুদ্রণ কাজগুলি"</string>
-    <string name="print_print_job" msgid="7563741676053287211">"মুদ্রণ কাজ"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"প্রিন্ট কাজগুলি"</string>
+    <string name="print_print_job" msgid="7563741676053287211">"প্রিন্ট কাজ"</string>
     <string name="print_restart" msgid="8373999687329384202">"পুনর্সূচনা"</string>
     <string name="print_cancel" msgid="3621199386568672235">"বাতিল"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> মুদ্রণ করা হচ্ছে"</string>
+    <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> প্রিন্ট করা হচ্ছে"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> বাতিল করা হচ্ছে"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> মুদ্রক ত্রুটি"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> মুদ্রক অবরুদ্ধ করা হয়েছে"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"দূরবর্তীভাবে ডিভাইস ডেটার (যেমন, Wi-Fi এর পাসওয়ার্ডগুলি এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশান ডেটার (যেমন অ্যাপ্লিকেশানগুলির দ্বারা সঞ্চিত সেটিংস এবং ফাইলগুলি)স্বয়ংক্রিয়ভাবে ব্যাক আপ নেওয়া হয়৷\n\nআপনি যখন স্বয়ংক্রিয় ব্যাক আপ চালু করুন তখন দূরবর্তীভাবে ডিভাইস এবং অ্যাপ্লিকেশানের ডেটা পর্যায়ক্রমে সংরক্ষিত হয়৷ অ্যাপ্লিকেশান ডেটা যেকোনো ডেটা হতে পারে যা অ্যাপ্লিকেশান সংরক্ষণ করে (বিকাশকারীর সেটিংস-এর উপর ভিত্তি করে), পরিচিতি, বার্তা এবং ফটোগুলির মত সম্ভাব্য সংবেদনশীল ডেটা অন্তর্ভুক্ত করে৷"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"ডিভাইস প্রশাসন সেটিংস"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"ডিভাইস প্রশাসক"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"নিষ্ক্রিয় করুন"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"আনইনস্টল করুন"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"এই ডিভাইসের প্রশাসককে নিষ্ক্রিয় করুন"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"অ্যাপ্লিকেশান আনইনস্টল করুন"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"নিষ্ক্রিয় এবং আনইনস্টল করুন"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"ডিভাইস প্রশাসক"</string>
     <string name="no_device_admins" msgid="702695100241728775">"কোনো উপলব্ধ ডিভাইস প্রশাসক নেই"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ব্যক্তিগত"</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="6246742476064507965">"ডিভাইস প্রশাসক সক্রিয় করবেন?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"সক্রিয় করুন"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"এই ডিভাইসের প্রশাসককে সক্রিয় করুন"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"ডিভাইস প্রশাসক"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"এই প্রশাসককে সক্রিয় করলে তা অ্যাপ্লিকেশান <xliff:g id="APP_NAME">%1$s</xliff:g> কে নিম্নলিখিত কার্যকলাপগুলি সঞ্চালনা করতে অনুমতি দেবে:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"এই প্রশাসক সক্রিয় এবং অ্যাপ্লিকেশান <xliff:g id="APP_NAME">%1$s</xliff:g>কে নিম্নলিখিত কার্যকলাপগুলি সঞ্চালনা করতে অনুমতি দেয়:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ফোন কলগুলিকে এবং SMS চালু করবেন?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"কল ও SMS ইতিহাস এই ব্যবহারকারীর সাথে শেয়ার করা হবে।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"জরুরি তথ্য"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"জরুরি ডায়ালারের মধ্যে লক স্ক্রীনের মাধ্যমে অ্যাক্সেসযোগ্য"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"আপনার ফোনটিকে আনলক না করেই যে কোনো ব্যক্তিকে জরুরীভিত্তিক ডায়ালার থেকে কল করার সুবিধা"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"অ্যাপ্লিকেশান এবং সামগ্রীর অনুমতি দিন"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"সীমাবদ্ধ সহ অ্যাপ্লিকেশানগুলি"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশানের জন্য সেটিংস প্রসারিত করুন"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"শুধুমাত্র <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"স্ক্রীন চালু থাকলে অবরুদ্ধ করুন"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রীনে দেখতে পাওয়া বা উপস্থিত হওয়া থেকে আটকান"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"স্ক্রীন বন্ধ থাকলে অবরুদ্ধ করুন"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রীণ চালু করা বা বিজ্ঞপ্তি লাইটটি জ্বলা ও নেভা থেকে আটকান"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"বন্ধ আছে"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"যখন স্ক্রীন চালু থাকে"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"যখন স্ক্রীন বন্ধ থাকে"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"যখন স্ক্রীন চালু বা বন্ধ থাকে"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
     <string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"প্রশাসক পিন লিখুন"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"আপনার কব্জি দুবার ঝাঁকিয়ে ক্যামেরা অ্যাপ্লিকেশানটি খুলুন"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ক্যামেরার জন্য দুবার পাওয়ার বোতাম টিপুন"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"আপনার স্ক্রীন আনলক না করেই দ্রুত ক্যামেরা খুলুন"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"প্রদর্শনের আকার"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"স্ক্রীনের আইটেমগুলিকে ছোট বা বড় করুন"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ঘনত্ব হিসাবে প্রদর্শন, স্ক্রীন জুম করা, স্কেল, স্কেলের মাপ"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"স্ক্রীনের আইটেমগুলিকে ছোট বা বড় করুন। আপনার স্ক্রীনের কিছু অ্যাপ্লিকেশান অবস্থান পরিবর্তন করতে পারে।"</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"পূর্বরূপ দেখুন"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"আরো ছোট করুন"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"আরো বড় করুন"</string>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index ca573ce..2db29be 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -49,7 +49,7 @@
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Isključi izvoz za lte ram"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Prikaži SIM adresar"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži brojeve fiksnog biranja"</string>
-    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Prikaži brojeve biranja usluge"</string>
+    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Prikaži brojeve biranja usluga"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Preuzmi PDP spisak"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"Aktivan"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Ne radi"</string>
@@ -75,8 +75,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Deaktiviraj SD karticu"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Izbriši USB pohranu"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Izbriši SD karticu"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Smanjite ili povećajte tekst na ekranu."</string>
     <string name="small_font" msgid="2295331917424072635">"Mali"</string>
     <string name="medium_font" msgid="2068475425515133701">"Srednji"</string>
     <string name="large_font" msgid="599055175160971446">"Velika"</string>
@@ -118,7 +117,7 @@
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitovanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
-    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Time će se onemogućiti profil:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;S uređaja:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Ovim će se onemogućiti profil:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;S uređaja:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Neimenovani Bluetooth uređaj"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Pretraživanje"</string>
@@ -148,7 +147,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Dodirnite za povezivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Da li se želite povezati na \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Zahtjev za pristup imeniku"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s želi pristupiti vašim kontaktima i historiji poziva. Želite omogućiti pristup za %2$s?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s želi pristupiti vašim kontaktima i historiji poziva. Želite dozvoliti pristup za %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"Ne pitaj ponovo"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Ne pitaj ponovo"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"Zahtjev za pristup porukama"</string>
@@ -173,14 +172,14 @@
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovi zadane vrijednosti"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Završeno"</string>
-    <string name="proxy_hostname_label" msgid="8490171412999373362">"Naziv glavnog računara proksija"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proksi hostname"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pažnja"</string>
-    <string name="proxy_error_dismiss" msgid="4993171795485460060">"U redu"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"Uredu"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"Uneseni naziv host računara nije važeći."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"Unesena lista isključenja nije odgovarajuće formatirana. Unesite listu isključenih domena u obliku liste stavki odvojenih zarezom."</string>
-    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Morate popuniti polje za priključak."</string>
-    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Polje za priključak mora biti prazno ako je polje za glavni računar prazno."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Morate popuniti adresno polje"</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Adresno polje mora biti prazno ako je server polje prazno."</string>
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Uneseni port nije važeći."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik koristi HTTP proksi, ali je moguće da ga ne koriste druge aplikacije."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL za PAC: "</string>
@@ -209,7 +208,7 @@
     <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Broj telefona:"</string>
     <string name="radio_info_band_mode_label" msgid="441469694142042022">"Izaberite radijski opseg"</string>
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Vrsta mreže:"</string>
-    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Postavite željenu vrstu mrežu:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Postavite preferiranu vrstu mrežu:"</string>
     <!-- no translation found for radio_info_ping_hostname_v4 (7045103377818314709) -->
     <skip />
     <!-- no translation found for radio_info_ping_hostname_v6 (1130906124160553954) -->
@@ -280,7 +279,7 @@
     <string name="roaming" msgid="3596055926335478572">"Roming podataka"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Povezuj se na usluge prenosa podataka u romingu"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Povezuj se na usluge prenosa podataka u romingu"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"Ostali ste bez veze za prenos podataa jer ste napustili matičnu mrežu, a roming podataka je isključen."</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Ostali ste bez veze za prijenos podataka jer ste napustili matičnu mrežu dok je roming podataka isključen."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Uključi"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Može doći do značajnih troškova."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ako dozvolite prijenos podataka u romingu, može doći do značajnih troškova rominga!\n\nOva postavka utječe na sve korisnike na ovom tabletu."</string>
@@ -345,10 +344,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključaj otiskom prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Da otključate svoj telefon, odobrite kupovine ili prijavite se na aplikacije, jednostavno dodirnite senzor za otisak prsta. \n\n Pazite čije otiske prstiju dodajete – svi dodani otisci će moći koristiti telefon za navedene stvari."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Napomena: Otisak prsta može biti manje siguran nego jaki obrazac ili PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Saznajte više"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Napomena: Vaš otisak prsta može biti manje siguran nego jak uzorak ili PIN kôd. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj tablet ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj uređaj ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj telefon ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ipak preskoči"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Nazad"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Pronađite senzor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Pronađite senzor za otisak prsta na stražnjem dijelu telefona."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
@@ -384,6 +390,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Možete dodati do <xliff:g id="COUNT">%d</xliff:g> otisaka prstiju"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ukloniti sve otiske prstiju?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Otiske prstiju nećete moći koristiti za otključavanje telefona, autoriziranje kupovine i prijavljivanje u aplikacije."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Upotrijebite otisak prsta da biste nastavili."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
@@ -396,9 +404,9 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifriraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napunite bateriju i pokušajte ponovo."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Priključite punjač i pokušajte ponovo."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nema PIN-a za zaključavanje ekrana ili lozinke"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nema PIN-a ili lozinke za zaključavanje ekrana"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebate postaviti PIN za zaključavanje ekrana ili lozinku da biste mogli pokrenuti šifriranje."</string>
-    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Šifrirati?"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Šifriraj?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Postupak šifriranja je neopoziv te gubite podatke u slučaju prekida. Šifriranje traje jedan sat ili duže, pri čemu se tablet ponovo pokreće nekoliko puta."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Postupak šifriranja je nepovratan; u slučaju prekida, gubite podatke. Šifriranje traje jedan sat ili duže, pri čemu se telefon ponovno pokreće nekoliko puta."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifriranje"</string>
@@ -421,12 +429,15 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite svoj uređaj"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključajte otiskom prsta"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberi zaklj. ekrana"</string>
-    <!-- no translation found for setup_lock_settings_picker_title (1584792702475081908) -->
-    <skip />
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite svoj telefon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisak prsta može biti manje siguran nego jak uzorak ili PIN kôd. Da biste bili sigurni, postavite pomoćno zaključavanje ekrana."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izaberite rezervni metod zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promijeni zaključavanje ekrana"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Prom. ili onem. uzorak, PIN ili lozinku"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Promijeni ili onemog. uzorak, PIN ili lozinku"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Odaberite način za zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nema"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
@@ -438,11 +449,12 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka sigurnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lozinka"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka sigurnost"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ne sada"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Aktualno zaključavanje ekrana"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Otisak prsta i uzorak"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Otisak prsta i PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Otisak prsta i lozinka"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućio administrator, pravilo šifriranja ili pohrana akreditiva"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućio admin, pravilo šifr. ili pohrana akred."</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nema"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prevucite"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Uzorak"</string>
@@ -490,7 +502,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni lozinku za otključavanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Lozinka mora imati najmanje sljedeći broj znakova: %d"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mora imati najmanje sljedeći broj cifara: %d"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Po završetku, dodirnite Nastavi"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lozinka mora imati manje od <xliff:g id="NUMBER">%d</xliff:g> znakova."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora imati manje od <xliff:g id="NUMBER">%d</xliff:g> brojki."</string>
@@ -532,7 +543,7 @@
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"Administrator uređaja ne dozvoljava korištenje nedavne lozinke."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Rastući, opadajući ili ponavljajući niz cifara nije dozvoljen"</string>
-    <string name="lockpassword_ok_label" msgid="313822574062553672">"U redu"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"Uredu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Otkaži"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Otkaži"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalje"</string>
@@ -727,13 +738,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Odaberite"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(dodano je više certifikata)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Upotreba certifikata sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne navodi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne potvrđuj valjanost"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden certifikat. Veza neće biti privatna."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Morate navesti domenu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite svoju lozinku za mrežu"</string>
@@ -862,7 +871,7 @@
     <string name="dock_settings_title" msgid="9161438664257429372">"Postavke priključne stanice"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Zvuk"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Postavke za priloženu priključnu stanicu za radni sto"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Postavke za priloženu priključnu stanicu za automobil"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Postavke za prikačeni mobilni držač za auto"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet nije u priključnoj stanici"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon nije u priključnoj stanici"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Postavke za priloženu priključnu stanicu"</string>
@@ -908,13 +917,12 @@
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada sanjariti"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pokreni odmah"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
-    <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Automatsko osvjetljenje"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podignite za buđenje"</string>
     <string name="doze_title" msgid="2259176504273878294">"Ambijentalni prikaz"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Ekran se aktivira kada se podigne uređaj ili primi obavještenje"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Povećavanje ili umanjivanje teksta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Postavi zaključavanje SIM kartice"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zaključavanje SIM kartice"</string>
@@ -936,7 +944,7 @@
     <string name="sim_change_failed" msgid="3602072380172511475">"Nije moguće promijeniti PIN.\nMožda je PIN neispravan."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN za SIM uspješno promijenjen"</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"Ne možete otključati SIM.\nPIN je možda pogrešan."</string>
-    <string name="sim_enter_ok" msgid="6475946836899218919">"U redu"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"Uredu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Otkaži"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Pronađeno više SIM-ova"</string>
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Izaberite željenu SIM karticu za prijenos mobilnih podataka."</string>
@@ -959,7 +967,7 @@
     <string name="security_patch" msgid="8438384045870296634">"Nivo Android sigurnosne zakrpe"</string>
     <string name="model_number" msgid="3765737700545384794">"Broj modela"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID opreme"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"Verzija osnovnog opsega"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"Verzija nemoduliranog opsega"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
     <string name="build_number" msgid="3075795840572241758">"Broj podverzije"</string>
     <string name="selinux_status" msgid="6212165375172061672">"Status za SELinux"</string>
@@ -1003,7 +1011,7 @@
     <string name="memory_apps_usage" msgid="5128673488173839077">"Aplikacije i podaci aplikacija"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Mediji"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Preuzimanja"</string>
-    <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, video zapisi"</string>
+    <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, videozapisi"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (muzika, melodije zvona, podcasti itd.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Druge datoteke"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Keširani podaci"</string>
@@ -1037,7 +1045,7 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Deaktiviranje"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Deaktiviranje u toku"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Prostor za pohranu ponestaje"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"Neke funkcije sistema, kao što je sinhronizacija, možda neće raditi ispravno. Pokušajte osloboditi prostor brisanjem ili otkačivanjem stavki kao što su aplikacije ili medijski sadržaji."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"Neke funkcije sistema, kao što je sinhronizacija, možda neće raditi ispravno. Pokušajte osloboditi prostor brisanjem ili deaktiviranjem stavki kao što su aplikacije ili medijski sadržaji."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Preimenuj"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"Montiraj"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"Izbaci"</string>
@@ -1051,7 +1059,7 @@
     <string name="storage_title_usb" msgid="679612779321689418">"Veza s računarom preko USB-a"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Poveži kao"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Medijski uređaj (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućava vam prenošenje medijskih datoteka u Windows ili korištenje aplikacije Android File Transfer za Mac (pogledajte www.android.com/filetransfer)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućava prenošenje medijskih datoteka u Windows ili korištenje Android File Transfer aplikacije za Mac (pogledajte www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7406889433172511530">"Omogućava vam da prenesete fotografije pomoću softvera fotoaparata i da prenesete sve datoteke na kompjutere koji ne podržavaju MTP"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
@@ -1193,18 +1201,18 @@
     <string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Postavite govornu poštu, prosljeđivanje poziva, poziv na čekanju, ID pozivaoca"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosna pristupna tačka"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijenosna pristupna tačka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prenosna pristupna tačka"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prijenosna pristupna tačka"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB dijeljenje veze"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB veze"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB povezan, označite za dijeljenje veze"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Veza podijeljena"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Ne može se uparivati kada se koristi USB memorija"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nije povezan"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Da uključite, povežite se"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Greška u USB dijeljenju veze"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Greška u dijeljenju USB veze"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje Bluetooth veze"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="4328374808439440517">"Internet konekcija ovog tableta se dijeli"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="7451579908917710359">"Internet veza ovog telefona se dijeli"</string>
@@ -1258,15 +1266,15 @@
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Omogućava da aplikacije koriste Googleovu uslugu lokacije kako bi brže procijenile vašu lokaciju. Anonimni podaci o lokaciji se prikupljaju i šalju Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena putem Wi-Fi mreže"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS sateliti"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Dopustite da aplikacije koriste GPS na tabletu za određivanje vaše lokacije"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Dopustite da aplikacije koriste GPS na telefonu za određivanje vaše lokacije"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Dopustite aplikacijama da koriste GPS na tabletu za određivanje vaše lokacije"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Dopustite aplikacijama da koriste GPS na telefonu za određivanje vaše lokacije"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Koristi potpomognuti GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Koristi server za pomoć GPS-u (uklonite oznaku kako biste smanjili korištenje mreže)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Koristi server za pomoć GPS-u (uklonite oznaku kako biste poboljšali performanse GPS-a)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Lokacija i Google pretraživanje"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Dopustite da Google koristi vašu lokaciju radi poboljšavanja rezultata pretraživanja i drugih usluga"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Pristup mojoj lokaciji"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Dopustite da aplikacije koje su zatražile vašu dozvolu koriste vaše informacije o lokaciji"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Dopustite aplikacijama koje su zatražile vašu dozvolu da koriste informacije o vašoj lokaciji"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Izvori lokacije"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"O tabletu"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
@@ -1300,7 +1308,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Lozinke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-ovi se ne podudaraju"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Otključaj odabir"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Vrste otključavanja"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Lozinka je postavljena"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN je postavljen"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Uzorak je postavljen"</string>
@@ -1364,10 +1372,10 @@
     <string name="install_applications_title" msgid="4987712352256508946">"Dopusti sve izvore aplikacija"</string>
     <string name="install_unknown_applications_title" msgid="663831043139080992">"Omogućava vam da instalirate aplikacije iz drugih izvora osim usluge Google Play"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Dopusti instalaciju aplikacija iz nepoznatih izvora"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Podaci na tabletu i lični podaci su više ugroženi od napada aplikacija iz nepoznatih izvora. Saglasni ste da ste isključivo vi odgovorni za bilo kakvu štetu na tabletu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Podaci na telefonu i lični podaci su više ugroženi od napada aplikacija iz nepoznatih izvora. Saglasni ste da ste isključivo vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Vaši podaci na tabletu i lični podaci su više izloženi napadima aplikacija iz nepoznatih izvora. Saglasni ste da ste isključivo vi odgovorni za bilo kakvu štetu na tabletu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Vaši podaci na telefonu i lični podaci su više izloženi napadima aplikacija iz nepoznatih izvora. Saglasni ste da ste isključivo vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućite više opcija postavljanja"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućite više opcija postavki"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacije o aplikaciji"</string>
     <string name="storage_label" msgid="8700867073480107253">"Pohrana"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Zadano otvori"</string>
@@ -1437,13 +1445,13 @@
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacija nije pronađena u listi instaliranih aplikacija."</string>
     <string name="clear_data_failed" msgid="7214074331627422248">"Nije bilo moguće izbrisati aplikacijske podatke."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Deinstalirati ažuriranja?"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Sva ažuriranja za ovu aplikaciju za sistem Android će se deinstalirati."</string>
+    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Sva ažuriranja aplikacije za sistem Android će se deinstalirati."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Obriši podatke"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Nije bilo moguće izbrisati podatke aplikacije."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neke od tih dozvole su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neke od tih dozvole su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neke od tih dozvola su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neke od tih dozvola su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
@@ -1470,14 +1478,14 @@
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplikaciju nije bilo moguće premjestiti. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Željena lokacija za instaliranje"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"Radije promijenite lokaciju za instaliranje za nove aplikacije"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"Promijenite preferiranu lokaciju za instaliranje novih aplikacija"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Onemogućiti ugrađenu aplikaciju?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Onemogući aplikaciju"</string>
     <string name="app_disable_dlg_text" msgid="7824930380425568584">"Ukoliko onemogućite ovu aplikaciju, druge aplikacije možda neće funkcionirati ispravno."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Želite li obrisati podatke i onemogućiti aplikaciju?"</string>
     <string name="app_special_disable_dlg_text" msgid="1007112763234313018">"Ako onemogućite ovu aplikaciju, druge aplikacije možda više neće funkcionisati kako je predviđeno. Vaši podaci će takođe biti izbrisani."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Isključiti obavještenja?"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavještenja za ovu aplikaciju, možda ćete propustiti važna upozorenja i ažuriranja."</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavještenja za ovu aplikaciju, možete propustiti važna upozorenja i ažuriranja."</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Djelovanje aplikacije"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Pokrenuto"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikad korišteno)"</string>
@@ -1523,24 +1531,24 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Usluga <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Operater <xliff:g id="COMP_NAME">%1$s</xliff:g> se koristi."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zaustaviti sistemsku uslugu?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke funkcije tableta će možda prestati pravilno funkcionirati sve dok ga ne isključite i zatim ponovo uključite."</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati pravilno funkcionirati sve dok ga ne isključite i zatim ponovo uključite."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke funkcije tableta će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
     <string name="language_settings" msgid="5292716747264442359">"Jezik i unos"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Jezik i unos"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Postavke jezika"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatura i načini unosa"</string>
     <string name="phone_language" msgid="8870144109924299673">"Jezik"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
-    <string name="auto_replace" msgid="6199184757891937822">"Automatsko zamjenjivanje"</string>
-    <string name="auto_replace_summary" msgid="370288728200084466">"Ispravljanje grešaka u pisanju"</string>
+    <string name="auto_replace" msgid="6199184757891937822">"Automatska zamjena"</string>
+    <string name="auto_replace_summary" msgid="370288728200084466">"Ispravi pogrešno napisane riječi"</string>
     <string name="auto_caps" msgid="6379232078052591265">"Automatsko veliko slovo"</string>
-    <string name="auto_caps_summary" msgid="6358102538315261466">"Piši prvu riječ u rečenici velikim slovom"</string>
+    <string name="auto_caps_summary" msgid="6358102538315261466">"Piši prvu riječ u rečenici velikim početnim slovom."</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatska interpunkcija"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Postavke fizičke tastature"</string>
-    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Dva puta pritisnite razmaknicu kako biste umetnuli \".\""</string>
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pritisnite tipku za razmak dva puta kako biste umetnuli \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Učini lozinke vidljivim"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj način unosa može biti u mogućnosti da prikuplja sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Da li želite koristiti ovaj način unosa?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ovaj alat za provjeru pravopisa može biti u mogućnosti da prikuplja sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Da li želite koristiti ovaj alat za provjeru pravopisa?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj način unosa može prikupiti sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Način omogućava aplikacija <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Da li želite koristiti ovaj način unosa?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ovaj alat za provjeru pravopisa u mogućnosti je da prikuplja sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Alat je omogućila aplikacija <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Da li želite koristiti ovaj alat za provjeru pravopisa?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Postavke"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Jezik"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nije uspjelo otvaranje postavki za <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
@@ -1560,7 +1568,7 @@
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Preusmjeri vibraciju na kontroler za igre kada je povezan."</string>
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Odaberite raspored tastature"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Postavi rasporede tastature"</string>
-    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Da biste izvršili prebacivanje, pritisnite kombinaciju Control-Razmaknica"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Da biste izvršili prebacivanje, pritisnite kombinaciju tipki \"Control-Space\""</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Zadano"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rasporedi tastature"</string>
     <string name="user_dict_settings_title" msgid="3427169369758733521">"Lični rječnik"</string>
@@ -1570,7 +1578,7 @@
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Fraza"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Više opcija"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Manje opcija"</string>
-    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"U redu"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Uredu"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Riječ:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Prečica:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jezik:"</string>
@@ -1623,21 +1631,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Pristupačnost"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Postavke pristupačnosti"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Postavke za vid"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Ove osobine pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usluge"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Čitač ekrana prvenstveno za slijepe i slabovidne osobe"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Prikaži"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titlovi"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Potez za uvećavanje"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite tri puta da biste uvećali"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Da biste uvećali ili umanjili objekat, dodirnite ekran tri puta jednim prstom.\n\nDok je objekat uvećan možete:\n"<ul>\n<li>"Pomjerati: prevlačite preko ekrana sa dva ili više prstiju"</li>\n<li>"Podesiti nivo uvećanja: Sastavite ili rastavite dva ili više prstiju"</li></ul>\n\n"Da biste privremeno uvećali objekat, dodirnite ekran tri puta, ali zadržite posljednji dodir. Dok držite prst na ekranu, pomjerajte ga da biste pregledali ekran. Podignite prst da biste prekinuli uvećavanje objekta.\n\nNapomena: Potez za uvećavanje funkcionira svugdje osim na tastaturi i traci za navigaciju."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečica za pristupačnost"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Uključeno"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Isključi"</string>
@@ -1645,7 +1648,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst visokog kontrasta"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatsko ažuriranje uvećanja ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažurira uvećanje ekrana kod prelaza aplikacija"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Poziv se završava dugmetom za uključivanje/isključivanje"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Poziv se završava dugmetom za napajanje"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovaranje lozinki"</string>
     <!-- no translation found for accessibility_toggle_large_pointer_icon_title (535173100516295580) -->
     <skip />
@@ -1744,9 +1747,9 @@
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Preostalo <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do pune baterije"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Iskorišteno od preth. potpunog punjenja"</string>
-    <string name="battery_since_unplugged" msgid="338073389740738437">"Korištenje baterije od isključivanja s napajanja"</string>
-    <string name="battery_since_reset" msgid="7464546661121187045">"Korištenje baterije od ponovnog pokretanja"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> rada koristeći bateriju"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Potrošnja baterije od isključivanja s napajanja"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Potrošnja baterije od posljednjeg pokretanja"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> rada na bateriji"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> od isključivanja s napajanja"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Puni se"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran uključen"</string>
@@ -1803,25 +1806,25 @@
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Postavke aplikacije"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Postavke ekrana"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Postavke za Wi-Fi"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Postavke za Bluetooth"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth postavke"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Korištenje baterije za govorne pozive"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Korištenje baterije kada je tablet neaktivan"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Korištenje baterije kada je telefon u stanju pripravnosti"</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"Korištenje baterije za mobilni radio"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"Prebacite se na način rada u avionu kako biste štedili napajanje područjima u kojima nema pokrivenosti mobilnom mrežom"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Potrošnja baterije kada je telefon u stanju pripravnosti"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Potrošnja baterije za mobilni radio"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Prebacite se na način rada u avionu kako biste štedili napajanje na područjima u kojima nema pokrivenosti mobilnom mrežom"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Potrošnja baterije upotrebom baterijske lampe"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"Potrošnja baterije upotrebom kamere"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"Korištenje baterije za ekran i pozadinsko osvjetljenje"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Potrošnja baterije na prikaz i pozadinsko osvjetljenje"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Smanjite osvjetljenje ekrana i/ili trajanje perioda do isključivanja ekrana"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Korištenje baterije za Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"Isključite Wi-Fi kada se ne koristi ili kada nije dostupan"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Korištenje baterije za Bluetooth"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Potrošnja baterije za Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Isključite Bluetooth kada se ne koristi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Pokušajte se povezati na drugi Bluetooth uređaj"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"Korištenje baterije za aplikaciju"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Potrošnja baterije za aplikaciju"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Zaustavi ili deinstaliraj aplikaciju"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Odaberite režim uštede baterije"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacija možda ima postavke za smanjenje potrošnje baterije"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacija može sadržavati postavke da smanji potrošnju baterije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterija koju troši korisnik"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Nedefinisana potrošnja energije"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Potrošnja baterije je približna vrijednost potrošnje energije te ne uključuje svaki izvor potrošnje baterije. Nedefinisana potrošnja je razlika između izračunate približne potrošnje energije i stvarne potrošnje koja se uočava na bateriji."</string>
@@ -1928,11 +1931,11 @@
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Unesite lozinku za pohranu akreditiva."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutna lozinka:"</string>
-    <string name="credentials_reset_hint" msgid="6297256880896133631">"Ukloniti sav sadržaj?"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"Ukloni sav sadržaj?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Lozinka mora imati najmanje 8 znakova."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Netačna lozinka."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Netačna lozinka. Imate još jednu priliku za unošenje prije nego što se izbriše pohrana akreditiva."</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Netačna lozinka. Imate još sljedeći broj prilika za unošenje prije nego što se izbriše pohrana akreditiva: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Netačna lozinka. Imate još <xliff:g id="NUMBER">%1$d</xliff:g> pokušaja prije nego što se izbriše pohrana akreditiva."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana akreditiva je izbrisana."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Nije uspjelo bris. memorije vjerodaj."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohrana akreditiva je omogućena."</string>
@@ -1959,15 +1962,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatski napravi rezervnu kopiju podataka na uređaju (npr. Wi-Fi lozinki i istorije poziva) i aplikacijskih podataka (npr. postavki i datoteka spremljenih od strane aplikacija) na udaljenoj lokaciji.\n\nKada uključite automatsku izradu rezervne kopije, podaci na uređaju i u aplikacijama se periodično čuvaju na udaljenoj lokaciji. Aplikacijski podaci mogu biti bilo koji podaci koje je aplikacija sačuvala (u skladu sa postavkama programera), uključujući potencijalno osjetljive podatke kao što su kontakti, poruke i fotografije."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Postavke administracije uređaja"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator uređaja"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiviraj"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Deinstaliraj"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiviraj administratora ovog uređaja"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Deinstaliraj aplikaciju"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiviraj i deinstaliraj"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratori uređaja"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nema dostupnih administratora uređaja"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Lični"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nema dostupnih pouzdanih agenata"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivirati administratora uređaja?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiviraj"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktiviraj administratora ovog uređaja"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator uređaja"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktiviranjem ove opcije administrator će omogućiti aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da izvršava sljedeće operacije:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Ovaj administrator je aktivan i omogućava aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da izvršava sljedeće operacije:"</string>
@@ -2009,7 +2013,7 @@
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizacija omogućena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhroniziranje onemogućeno"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinhronizuje se"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"Greška u sinhronizaciji."</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Greška pri sinhroniziranju."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sinhroniziranje nije uspjelo"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinhroniziranje aktivno"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"Sinhroniziraj"</string>
@@ -2022,7 +2026,7 @@
     <string name="background_data" msgid="5779592891375473817">"Podaci u pozadini"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Aplikacije mogu sinhronizirati, slati i primati podatke u bilo koje vrijeme"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Onemogućiti podatke u pozadini?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Onemogućavanjem podataka u pozadini produžava se trajanje baterije i smanjuje korištenje podataka. Neke aplikacije mogu i dalje koristiti vezu za prenos podataka u pozadini."</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Onemogućavanjem prijenosa podataka u pozadini produžava se trajanje baterije i smanjuje korištenje podataka. Neke aplikacije mogu i dalje koristiti vezu za prijenos podataka u pozadini."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Aut. sinhronizir. podat. aplikacija"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinhroniziranje UKLJUČENO"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sinhronizir. ISKLJUČENO"</string>
@@ -2054,7 +2058,7 @@
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nije moguće ručno sinhronizovati"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhroniziranje za ovu stavku je trenutno onemogućeno. Da biste promijenili tu postavku, privremeno uključite podatke u pozadini i automatsko sinhroniziranje."</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhroniziranje za ovu stavku trenutno nije moguće. Da biste promijenili ovu postavku, privremeno uključite podatke u pozadini i automatsko sinhroniziranje."</string>
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite lozinku"</string>
@@ -2105,7 +2109,7 @@
     <string name="data_usage_disable_mobile" msgid="2613595056882494652">"Isključiti mobilne podatke?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="3934211003105066167">"Postavi ograničenje za mobilne podatke"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Postavi ograničenje za 4G podatke"</string>
-    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Post. ogran. za 2G-3G pod."</string>
+    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Ograničenje 2G-3G podataka"</string>
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ograniči Wi-Fi podatke"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
@@ -2298,7 +2302,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historija poziva i SMS-ova će se dijeliti s ovim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije za hitne slučajeve"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Dostupno kroz zaključan ekran u brojčaniku za hitne pozive"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Dostupno svakome sa liste hitnih poziva bez otključavanja telefona"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
@@ -2676,22 +2680,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Pređi na postavku Samo alarmi do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Promijeniti u uvijek prekini"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokiranje kada je ekran uključen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj iskaču na ekran"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokiranje kada je ekran isključen"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj uključuju ekran ili trepereće svjetlo za obavještenja"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Isključeno"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Kada je ekran uključen"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je ekran isključen"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je ekran isključen ili uključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke za obavještenja"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošaljite pov. inf. o ovom uređaju"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Unesite PIN administratora"</string>
@@ -2937,14 +2933,11 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Da biste otvorili aplikaciju za kameru, dva puta uvrnite zglob"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Dva pritiska na napajanje za kameru"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Brzo otvaranje fotoaparata bez otključavanja ekrana"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Veličina ekrana"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Povećavanje ili umanjivanje objekata na ekranu"</string>
     <!-- no translation found for screen_zoom_keywords (9176477565403352552) -->
     <skip />
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Smanjite ili povećajte objekte na ekranu. Neke aplikacije sa vašeg ekrana mogu promijeniti svoj položaj."</string>
     <!-- no translation found for screen_zoom_preview_title (4680671508172336572) -->
     <skip />
     <!-- no translation found for screen_zoom_make_smaller_desc (4622359904253364742) -->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6c84612..79149b4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desactiva la targeta SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Esborra l\'emmagatzematge USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Esborra la targeta SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Amplia o redueix el text de la pantalla."</string>
     <string name="small_font" msgid="2295331917424072635">"Petita"</string>
     <string name="medium_font" msgid="2068475425515133701">"Mitjana"</string>
     <string name="large_font" msgid="599055175160971446">"Gran"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueig amb empremta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. \n\nTotes les empremtes digitals que afegeixis podran dur a terme aquestes accions, així que rumia\'t bé quines persones tries."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota: és possible que fer servir una empremta digital sigui menys segur que utilitzar un patró o un PIN complets."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Més informació"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Nota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets. "<annotation id="url">"Més informació"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel·la"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir la tauleta si la perds, si te la roben o se n\'esborra el contingut."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones el facin servir si el perds, te\'l roben o se n\'esborra el contingut."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir el telèfon si el perds, te\'l roben o se n\'esborra el contingut."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin la tauleta si la perds o te la roben."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin el dispositiu si el perds o te\'l roben."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin el telèfon si el perds o te\'l roben."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omet de totes maneres"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Enrere"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Cerca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cerca el sensor d\'empremtes digitals a la part posterior del telèfon."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Il·lustració amb la ubicació del sensor d\'empremtes digitals i de dispositiu"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Pots afegir un màxim de <xliff:g id="COUNT">%d</xliff:g> empremtes digitals"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Suprimir les empremtes digitals?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"No podràs fer servir les empremtes digitals per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió en aplicacions."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sí, suprimeix"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Fes servir l\'empremta digital per continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptació"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protegeix el teu dispositiu"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloqueja el dispositiu amb l\'empremta digital"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria un bloqueig de pantalla"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Tria un bloqueig de pantalla"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protegeix el telèfon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fer servir l\'empremta digital pot ser menys segur que utilitzar un patró, un PIN o una contrasenya segurs. Configura una pantalla de bloqueig per estar protegit."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquesta tauleta sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa les funcions de protecció del dispositiu per impedir que altres persones el facin servir sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquest telèfon sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Tria un mètode de bloqueig de pantalla alternatiu"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueig de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Canvi pantalla bloq."</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivell de seguretat mitjà o alt"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivell de seguretat alt"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ara no"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueig de pantalla actual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Empremta digital + patró"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Empremta digital + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contrasenya ha de tenir almenys %d caràcters"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN ha de tenir almenys %d dígits"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Toca Continua quan acabis"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contrasenya ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> caràcters."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"El PIN ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> dígits."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sense canvis)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(S\'han afegit diversos certificats)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Utilitza certificats del sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"No proporcionis un certificat d\'usuari"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"No validis el servidor d\'EAP"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No s\'ha especificat cap certificat. La connexió no serà privada."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Has d\'especificar un domini."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introdueix la contrasenya de la xarxa."</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Pantalla Ambient"</string>
     <string name="doze_summary" msgid="7128970177894383698">"La pantalla es reactiva en agafar el dispositiu o en rebre notificacions."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida de la lletra"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Amplia o redueix el text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Config. de bloqueig de SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configura el bloqueig de la targeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilitat"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuració de la visualització"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Pots personalitzar el dispositiu perquè s\'adapti a les teves necessitats. Aquestes funcions d\'accessibilitat es poden canviar més endavant des de Configuració."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serveis"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Lector de pantalla destinat principalment a persones invidents i amb problemes de visió"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Pantalla"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítols"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gest d\'ampliació"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca tres cops per ampliar la imatge"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Per ampliar o allunyar la imatge, toca-la tres cops amb un dit.\n\nAmb la imatge ampliada, pots fer aquestes accions:\n"<ul>\n<li>"Desplaçar-te: arrossega almenys dos dits per la pantalla."</li>\n<li>"Ajustar el nivell de zoom: pessiga amb dos o més dits o bé separa\'ls."</li></ul>\n\n"Per ampliar el contingut de manera temporal, toca la pantalla tres cops i mantén-la premuda en l\'últim toc. A continuació, arrossega el dit per moure\'t per la pantalla. Aixeca el dit per desfer el zoom.\n\nNota: pots utilitzar el gest d\'ampliació a tot arreu, tret de la barra de navegació i del teclat."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Drecera d\'accessibilitat"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactiva"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Crea còpies de seguretat automàtiques de les dades del dispositiu (com ara les contrasenyes de la Wi-Fi o l\'historial de trucades) i de les aplicacions (com ara les configuracions i els fitxers que desin) de manera remota.\n\nQuan activis les còpies de seguretat automàtiques, les dades dels dispositius i de les aplicacions s\'emmagatzemaran periòdicament de manera remota. Les dades de les aplicacions poden ser qualsevol tipus de dades que hagi desat una aplicació (en funció de la configuració del desenvolupador), incloses les dades potencialment confidencials, com ara contactes, missatges i fotos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuració d\'administració de dispositius"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador del dispositiu"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desactiva"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstal·la"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desactiva l\'administrador d\'aquest dispositiu"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstal·la l\'aplicació"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desactiva i desinstal·la"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradors del dispositiu"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No hi ha cap administrador del dispositiu disponible"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Professional"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"No hi ha agents de confiança disponibles."</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activar l\'administrador del dispositiu?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activa"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activa l\'administrador d\'aquest dispositiu"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador del dispositiu"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"En activar aquest administrador, l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> podrà dur a terme les operacions següents:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Aquest administrador està actiu i permet que l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> faci les operacions següents:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vols activar les trucades i els SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historial de trucades i de SMS es compartirà amb aquest usuari."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informació d\'emergència"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"S\'hi pot accedir mitjançant la pantalla de bloqueig al marcador d\'emergència"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Tothom pot accedir-hi des del marcador d\'emergència sense desbloquejar el telèfon"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Desplega configuració aplicació"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Canvia al mode Només alarmes fins a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Canvia al mode Interromp sempre"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloqueja quan la pantalla està activada"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Evita que les notificacions silenciades pel mode No molesteu apareguin a la pantalla"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloqueja quan la pantalla està desactivada"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Evita que les notificacions silenciades pel mode No molesteu activin la pantalla o el llum de notificació"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desactivades"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Quan la pantalla està activada"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quan la pantalla està desactivada"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quan la pantalla està activada o desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envia suggeriments sobre el dispositiu"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introdueix el PIN d\'administrador"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira el canell dues vegades per obrir l\'aplicació Càmera"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botó d\'engegada dos cops per obrir càmera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Obre ràpidament la càmera sense haver de desbloquejar la pantalla"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Mida de visualització"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Amplia o redueix els elements de la pantalla"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densitat de pantalla, zoom de pantalla, escala, mida"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Amplia o redueix els elements de la pantalla. És possible que algunes aplicacions de la pantalla canviïn de posició."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Previsualització"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Redueix"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Amplia"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4c4133e..04bc859 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -76,8 +76,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Odpojit kartu SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Smazat úložiště USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Smazat kartu SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Umožňuje zvětšit nebo zmenšit text na obrazovce."</string>
     <string name="small_font" msgid="2295331917424072635">"Malá"</string>
     <string name="medium_font" msgid="2068475425515133701">"Střední"</string>
     <string name="large_font" msgid="599055175160971446">"Velká"</string>
@@ -336,10 +335,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odemknutí otiskem prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor otisků prstů. \n\n Dobře zvažte, čí otisky do zařízení přidáte. Tyto akce bude možné provádět pomocí všech přidaných otisků."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Poznámka: Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Další informace"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Poznámka: Otisk prstu není tak bezpečný než silné gesto nebo kód PIN. "<annotation id="url">"Další informace"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Zrušit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovat"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty, odcizení nebo vymazání tabletu nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty, odcizení nebo vymazání zařízení nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty, odcizení nebo vymazání telefonu nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty nebo odcizení tabletu nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty nebo odcizení zařízení nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty nebo odcizení telefonu nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Přeskočit"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Zpět"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Najděte senzor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Najděte senzor otisků prstů na zadní straně telefonu."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrace se zařízením a polohou senzoru otisků prstů"</string>
@@ -373,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Maximální počet otisků prstů, které lze přidat: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstranit všechny otisky prstů?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Otisky prstů již nebude možné používat k odemykání telefonu, autorizaci nákupů ani přihlašování do aplikací."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ano, odstranit"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Pokračujte přiložením prstu."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrování"</string>
@@ -410,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Ochraňte své zařízení"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Odemykání pomocí otisku prstu"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zámek obrazovky"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Zvolte zámek obrazovky"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Chraňte svůj telefon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisk prstu není tak bezpečný než silné gesto, kód PIN nebo heslo. Chcete-li být lépe zabezpečeni, nastavte záložní zámek obrazovky."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání tabletu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v jeho používání bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání telefonu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Zvolte záložní metodu zámku obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámek obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Změna zámku obrazovky"</string>
@@ -426,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Střední až vysoké zabezpečení"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečení"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Teď ne"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Aktuální zámek obrazovky"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Otisk prstu a gesto"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Otisk prstu a PIN"</string>
@@ -478,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí mít nejméně %d znaky"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Kód PIN musí obsahovat nejméně %d znaky"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Po dokončení klepněte na Pokračovat"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovat"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> znaků."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> číslic."</string>
@@ -720,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nezměněno)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Vyberte"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Bylo přidáno několik certifikátů)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Použít certifikáty systému"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Neposkytovat"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Neověřovat"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Není určen žádný certifikát. Připojení nebude soukromé."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Je třeba zadat doménu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadejte heslo sítě"</string>
@@ -904,8 +914,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ambientní displej"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Odemknout obrazovku, když zvednete zařízení nebo vám přijde upozornění"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Umožňuje zvětšit nebo zmenšit text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku SIM karty"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavit zámek SIM karty"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámek SIM karty"</string>
@@ -1610,21 +1619,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Přístupnost"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavení přístupnosti"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavení pro slabozraké"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Čtečka obrazovky určená primárně pro nevidomé a slabozraké"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Obrazovka"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titulky"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gesto pro přiblížení obrazovky"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trojitým klepnutím aktivujete přiblížení"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Trojitým klepnutím jedním prstem na obrazovku můžete přiblížit nebo oddálit zobrazení. \n\nPři přiblížení lze provádět následující akce:\n"<ul>\n<li>"Posunout zobrazení: Přejeďte po obrazovce dvěma prsty."</li>\n<li>"Nastavit úroveň přiblížení: Stáhněte dva prsty k sobě nebo je roztáhněte od sebe."</li></ul>\n\n"Chcete-li přiblížení aktivovat dočasně, klepněte na obrazovku třikrát a podržte ji. Ponechte prst na obrazovce a přetažením posouvejte zobrazení. Zvednutím prstu přiblížení vrátíte do původního stavu.\n\nPoznámka: Gesto pro přiblížení funguje všude s výjimkou klávesnice a navigačního panelu."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Zkratka přístupnosti"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Zapnuto"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vypnuto"</string>
@@ -1970,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automaticky vzdáleně zálohujte data zařízení (jako jsou hesla sítí Wi-Fi a historie volání) a data aplikací (jako jsou nastavení a soubory uložené aplikacemi).\n\nKdyž zapnete automatické zálohování, data zařízení a aplikací se budou pravidelně ukládat do vzdáleného úložiště. Data aplikací mohou zahrnovat data, která uložila aplikace (v závislosti na nastavení vývojáře), včetně potenciálně citlivých dat, jako jsou kontakty, zprávy a fotky."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavení správce zařízení"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Správce zařízení"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivovat"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Odinstalovat"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Odstranit administrátora zařízení"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Odinstalovat aplikaci"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktivovat a odinstalovat"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Správci zařízení"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Není k dispozici žádný správce zařízení"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobní"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Pracovní"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nejsou k dispozici žádní zástupci důvěryhodnosti."</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivovat správce zařízení?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivovat"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Určit administrátora tohoto zařízení"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Správce zařízení"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktivací tohoto správce umožníte aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g> provádět následující operace:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Správce je aktivní a umožňuje aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g> provádět následující operace:"</string>
@@ -2299,7 +2304,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnout telefonní hovory a SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S tímto uživatelem bude sdílena historie hovorů a SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Nouzové informace"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Dostupné na obrazovce uzamčení v sekci tísňového volání"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Přístupné všem v sekci tísňového volání bez nutnosti odemykání obrazovky"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povolit aplikace a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikace s omezením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbalit nastavení aplikace"</string>
@@ -2621,22 +2626,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Přepnout do režimu Pouze budíky až do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Přejít do režimu Vždy vyrušit"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokovat při zapnuté obrazovce"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zabránit, aby se v režimu Nerušit zobrazovala oznámení v rychlém náhledu nebo vyskakovala na obrazovce"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokovat při vypnuté obrazovce"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zabránit, aby se v režimu Nerušit zapínala obrazovka nebo blikala kontrolka"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Vypnuto"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Při zapnuté obrazovce"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Při vypnuté obrazovce"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Při zapnuté i vypnuté obrazovce"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Zadejte PIN administrátora"</string>
@@ -2883,13 +2880,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Umožňuje otevřít aplikaci Fotoaparát dvojitým otočením zápěstí."</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Fotoaparát dvojitým stisknutím vypínače"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Rychle otevře fotoaparát bez odemknutí obrazovky"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Zobrazovaná velikost"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Umožňuje zvětšit nebo zmenšit položky na obrazovce"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"displej, hustota, přiblížení obrazovky, měřítko, zvětšení"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Umožňuje zvětšit nebo zmenšit položky na obrazovce. Ikony některých aplikací na ploše se mohou přemístit."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Náhled"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Zmenšit"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Zvětšit"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5941b2a..775951c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Demonter SD-kort"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Slet USB-lager"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Formatér SD-kort"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Gør teksten på skærmen mindre eller større."</string>
     <string name="small_font" msgid="2295331917424072635">"Lille"</string>
     <string name="medium_font" msgid="2068475425515133701">"Normal"</string>
     <string name="large_font" msgid="599055175160971446">"Stor"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås op med fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Du trykker blot på fingeraftrykssensoren for at låse telefonen op, godkende køb eller logge ind i apps. \n\n Vær forsigtig med, hvem du tilføjer, for alle, hvis fingeraftryk du føjer til din telefon, kan gøre disse ting."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Bemærk! Adgang via fingeraftryk kan være mindre sikkert end adgang via et stærkt mønster eller en stærk adgangskode."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Få flere oplysninger"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Bemærk! Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode. "<annotation id="url">"Få flere oplysninger"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuller"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsæt"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den eller den bliver stjålet eller ryddet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller den bliver stjålet eller ryddet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon,hvis du mister den, eller den bliver stjålet eller ryddet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den, eller hvis den bliver stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller hvis den bliver stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon, hvis du mister den, eller hvis den bliver stjålet."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Spring over alligevel"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Gå tilbage"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find sensoren"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Find fingeraftrykssensoren på bagsiden af ​​telefonen."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration med enhed og placering af sensor til registrering af fingeraftryk"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Du kan tilføje op til <xliff:g id="COUNT">%d</xliff:g> fingeraftryk"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vil du fjerne alle fingeraftryk?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Du kan ikke bruge dine fingeraftryk til at låse din telefon op, godkende køb eller logge ind på apps."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, fjern det"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Brug dit fingeraftryk for at få adgang."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Beskyt din enhed"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Lås op med dit fingeraftryk"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vælg skærmlås"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Vælg skærmlås"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Beskyt din telefon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode eller adgangskode. Konfigurer en ekstra låseskærm for at være sikker."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kan forhindre andre i at bruge denne tablet uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kan forhindre andre i at bruge denne enhed uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelser. Vælg den skærmlås, du vil bruge."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kan forhindre andre i at bruge denne telefon uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Vælg din alternative metode til skærmlåsning"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skærmlås"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Skifte låseskærm"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium til høj sikkerhed"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Adgangskode"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høj sikkerhed"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ikke nu"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Aktuel skærmlås"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingeraftryk og mønster"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingeraftryk og pinkode"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til oplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Adgangskoden skal være på mindst %d tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Pinkoden skal være på mindst %d tegn"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tryk på Fortsæt, når du er færdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsæt"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Adgangskoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Pinkoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> cifre."</string>
@@ -886,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Aktiv låseskærm"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Væk skærmen, når du tager enheden op eller modtager meddelelser"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Gør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for låst SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låst SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Låst SIM-kort"</string>
@@ -1588,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Hjælpefunktioner"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Indstillinger for hjælpefunktioner"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsindstillinger"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enhed, så den passer til dine behov. Disse hjælpefunktioner kan ændres senere under Indstillinger."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Skærmlæseren er primært til blinde og svagtseende brugere"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Skærm"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Undertekster"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Forstørrelsesbevægelse"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tryk tre gange for at zoome ind"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Du kan zoome ind og ud ved at trykke tre gange på skærmen med én finger.\n\nNår der er zoomet ind, kan du gøre følgende:\n"<ul>\n<li>"Rulle: Træk to eller flere fingre henover skærmen"</li>\n<li>"Justere zoomniveauet: Knib to eller flere fingre sammen, eller spred dem fra hinanden"</li></ul>\n\n"Du kan også midlertidigt zoome ind ved at trykke tre gange og holde fingeren nede på det tredje tryk. Mens du holderen fingeren nede, kan du trække den for at udforske forskellige dele af skærmen. Løft fingeren for at zoome ud igen.\n\nBemærk! Forstørrelsesbevægelser fungerer overalt, undtagen på tastaturet og navigationslinjen."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Genvej til hjælpefunktioner"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Til"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Fra"</string>
@@ -1936,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Foretag automatisk ekstern sikkerhedskopiering af enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, der er gemt i apps).\n\n Når du slår automatisk sikkerhedskopiering til, gemmes enheds- og appdata med jævne mellemrum eksternt. Appdata kan være alle former for data, som en app har gemt (afhængigt af udviklerens indstillinger), f.eks. potentielt følsomme data, såsom kontaktpersoner, beskeder og billeder."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Enhedsadministrationsindstillinger"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhedsadministrator"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Afinstaller"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiver denne enhedsadministrator"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Afinstaller appen"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiver og afinstaller"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Enhedsadministratorer"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Ingen tilgængelige enhedsadministratorer"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personlig"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Arbejde"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Der er ingen tilgængelige trust agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivér enhedsadministrator?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivér"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktivér denne enhedsadministrator"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Enhedsadministrator"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Hvis denne administrator aktiveres, får appen <xliff:g id="APP_NAME">%1$s</xliff:g> tilladelse til at foretage følgende handlinger:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Denne administrator er aktiv og tillader, at appen <xliff:g id="APP_NAME">%1$s</xliff:g> kan foretage disse handlinger:"</string>
@@ -2265,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du aktivere telefonopkald og sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Opkalds- og sms-historikken deles med denne bruger."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Oplysninger om nødopkald"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Tilgængelig via låseskærmen på det numeriske tastatur til nødopkald"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Tilgængelig for alle fra nødopkaldsfunktionen uden oplåsning af telefonen"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Udvid indstillingerne for applikationen"</string>
@@ -2581,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Skift til Kun alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Skift til Afbryd altid"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloker, når skærmen er tændt"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Undgå, at underretninger, der er lydløse, når Forstyr ikke er slået til, vises på skærmen"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloker, når skærmen er slukket"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Undgå, at underretninger, der er lydløse, når Forstyr ikke er slået til, tænder skærmen eller får underretningslyset til at blinke"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Fra"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Når skærmen er tændt"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skærmen er slukket"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skærmen er tændt eller slukket"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Indtast administratorpinkoden"</string>
@@ -2831,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Åbn kameraappen ved at dreje håndleddet to gange"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tryk to gange på afbryderknappen for at åbne kameraet"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Åbn hurtigt kameraet uden at låse skærmen op"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Visningsstørrelse"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Gør elementerne på skærmen større eller mindre"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"visningstæthed, zoom på skærmen, skala, skalering"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Gør elementerne på skærmen mindre eller større. Visse apps på din skærm ændrer muligvis placering."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Eksempelvisning"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Formindsk"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Forstør"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e887fbd..e2d357d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Mit Fingerabdruck entsperren"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. \n\n Überlege genau, welche Fingerabdrücke du hinzufügen möchtest, da diese Aktionen mit allen Fingerabdrücken ausgeführt werden können, die du auf dem Smartphone hinzufügst."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Hinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Weitere Informationen"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Hinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN. "<annotation id="url">"Weitere Informationen"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Weiter"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls du es verlierst, es gestohlen wird oder die darauf befindlichen Daten gelöscht werden."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls du es verlierst, es gestohlen wird oder die darauf befindlichen Daten gelöscht werden."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls du es verlierst, es gestohlen wird oder die darauf befindlichen Daten gelöscht werden."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls du es verlierst oder es gestohlen wird."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls du es verlierst oder es gestohlen wird."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls du es verlierst oder es gestohlen wird."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Trotzdem überspringen"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Zurück"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensor suchen"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finde den Fingerabdrucksensor auf der Rückseite deines Smartphones."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Abbildung mit Gerät und Position des Fingerabdrucksensors"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Du kannst bis zu <xliff:g id="COUNT">%d</xliff:g> Fingerabdrücke hinzufügen."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alle Fingerabdrücke entfernen?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Du kannst dann deine Fingerabdrücke nicht verwenden, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, entfernen"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Mithilfe deines Fingerabdrucks fortfahren"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Verschlüsselung"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Gerät schützen"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Mit dem Fingerabdruck entsperren"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Displaysperre wählen"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Displaysperre wählen"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Smartphone schützen"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Ein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster, eine PIN oder ein Passwort. Richte einen Sicherungssperrbildschirm ein, um die Sicherheit zu erhöhen."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Alternative Methode für die Displaysperre auswählen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Displaysperre"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Displaysperre ändern"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mittlere bis hohe Sicherheit"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hohe Sicherheit"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Jetzt nicht"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Aktuelle Displaysperre"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingerabdruck + Muster"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingerabdruck + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Das Passwort muss aus mindestens %d Zeichen bestehen."</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Die PIN muss mindestens %d Ziffern enthalten."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tippe auf \"Weiter\", wenn du fertig bist"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Weiter"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Das Passwort muss weniger als <xliff:g id="NUMBER">%d</xliff:g> Zeichen haben."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Die PIN muss weniger als <xliff:g id="NUMBER">%d</xliff:g> Stellen haben."</string>
@@ -704,13 +717,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nicht geändert)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Auswählen"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Mehrere Zertifikate hinzugefügt)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Systemzertifikate verwenden"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nicht bereitstellen"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nicht validieren"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Kein Zertifikat angegeben. Es wird keine private Verbindung hergestellt."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Angabe einer Domain erforderlich."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Gib dein Netzwerkpasswort ein."</string>
@@ -1932,15 +1943,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatische Remote-Sicherung von Gerätedaten wie WLAN-Passwörtern und Anrufverlauf und App-Daten, z. B. Einstellungen und von Apps gespeicherte Dateien\n\nWenn du die automatische Sicherung aktivierst, werden Geräte- und App-Daten regelmäßig an einem Remote-Speicherort gespeichert. Bei App-Daten kann es sich um alle Daten handeln, die von einer App entsprechend den Entwicklereinstellungen gespeichert wurden, einschließlich potenziell sensibler Daten wie Kontakten, Nachrichten und Fotos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Einstellungen für die Geräteverwaltung"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Geräteadministrator"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivieren"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Deinstallieren"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Diesen Geräteadministrator deaktivieren"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"App deinstallieren"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktivieren und deinstallieren"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Geräteadministratoren"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Keine Geräteadministratoren verfügbar"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Nutzer"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Arbeit"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Keine verfügbaren Trust Agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Geräteadministrator aktivieren?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivieren"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Diesen Geräteadministrator aktivieren"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Geräteadministrator"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Die Aktivierung dieses Administrators ermöglicht der App \"<xliff:g id="APP_NAME">%1$s</xliff:g>\", folgende Vorgänge auszuführen:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Dieser Administrator ist aktiv und ermöglicht der App \"<xliff:g id="APP_NAME">%1$s</xliff:g>\", folgende Vorgänge auszuführen:"</string>
@@ -2261,7 +2273,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Anrufe &amp; SMS aktivieren?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrufliste und SMS-Verlauf werden für diesen Nutzer freigegeben."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Notfallinformationen"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Über den Notruf auf dem Sperrbildschirm abrufbar"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Für jeden über den Notruf erreichbar, ohne dein Smartphone zu entsperren"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps und Inhalte zulassen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps mit Einschränkungen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"App-Einstellungen erweitern"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c843861..94a6e0f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"Απλώς αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων για να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές. \n\n Να είστε προσεκτικοί με τα δακτυλικά αποτυπώματα που προσθέτετε. Αυτές οι ενέργειες θα μπορούν να γίνουν με οποιαδήποτε δακτυλικά αποτυπώματα προσθέτετε στο τηλέφωνό σας."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Σημείωση: Το ξεκλείδωμα με δακτυλικά αποτυπώματα ενδέχεται να είναι λιγότερο ασφαλές από ό, τι ένα ισχυρό μοτίβο ή κωδικός PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Μάθετε περισσότερα"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Σημείωση: Το δακτυλικό σας αποτύπωμα ενδέχεται να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή κάποιο PIN. "<annotation id="url">"Μάθετε περισσότερα"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ακύρωση"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Συνέχεια"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του tablet εάν χαθεί, κλαπεί ή υποστεί ολική επαναφορά."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτής της συσκευής εάν χαθεί, κλαπεί ή υποστεί ολική επαναφορά."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του τηλεφώνου εάν χαθεί, κλαπεί ή υποστεί ολική επαναφορά."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του tablet, αν χαθεί ή κλαπεί."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτής της συσκευής, αν χαθεί ή κλαπεί."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του τηλεφώνου, αν χαθεί ή κλαπεί."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Παράλειψη"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Επιστροφή"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Βρείτε τον αισθητήρα"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Εντοπίστε τον αισθητήρα μοναδικού χαρακτηριστικού στο πίσω μέρος του τηλεφώνου σας."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Εικόνα συσκευής και της τοποθεσίας του αισθητήρα μοναδικού χαρακτηριστικού"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Μπορείτε να προσθέσετε έως <xliff:g id="COUNT">%d</xliff:g> μοναδικά χαρακτηριστικά"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Κατάργηση όλων των δακτυλικών αποτυπωμάτων;"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Δεν θα μπορείτε να χρησιμοποιήσετε τα δακτυλικά σας αποτυπώματα για να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτείτε αγορές ή να συνδέεστε μαζί τους σε εφαρμογές."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Προστατέψτε τη συσκευή σας"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Ξεκλείδωμα με το δακτυλικό σας αποτύπωμα"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Επιλογή κλειδ. οθ."</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Επιλογή κλειδιού οθόνης"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Προστασία τηλεφώνου"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Το δακτυλικό αποτύπωμα ενδέχεται να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο, κάποιο PIN ή έναν κωδικό πρόσβασης. Ρυθμίστε ένα εφεδρικό κλείδωμα οθόνης για να είστε ασφαλείς."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Αποτρέψτε άλλους από τη χρήση αυτού του tablet χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Αποτρέψτε άλλους από τη χρήση αυτής της συσκευής χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Αποτρέψτε άλλους από τη χρήση αυτού του τηλεφώνου χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Επιλέξτε εφεδρική μέθοδο κλειδώματος οθόνης"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδωμα οθόνης"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Αλλαγή κλειδώματος οθ."</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Μεσαίο έως υψηλό επίπεδο ασφάλειας"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Κωδικός πρόσβασης"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Υψηλό επίπεδο ασφάλειας"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Όχι τώρα"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Τρέχουσα οθόνη κλειδώματος"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Δακτυλικό αποτύπωμα + Μοτίβο"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Δακτυλικό αποτύπωμα + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Ο κωδικός PIN θα πρέπει να αποτελείται από τουλάχιστον %d ψηφία"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Όταν τελειώσετε, πατήστε \"Συνέχεια\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Συνέχεια"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Ο κωδικός πρόσβασης πρέπει να περιέχει λιγότερους από <xliff:g id="NUMBER">%d</xliff:g> χαρακτήρες."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Το PIN πρέπει να περιέχει λιγότερα από <xliff:g id="NUMBER">%d</xliff:g> ψηφία."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(δεν έγινε αλλαγή)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Επιλέξτε"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Προστέθηκαν πολλά πιστοποιητικά)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Χρήση πιστοποιητικών συστήματος"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Να μην παρέχεται"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Να μην επικυρώνεται"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Δεν έχει καθοριστεί πιστοποιητικό. Η σύνδεσή σας δεν θα είναι ιδιωτική."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Πρέπει να καθορίσετε έναν τομέα διαδικτύου."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Διαθέσιμο WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Εισαγάγετε κωδικό πρόσβασης δικτύου"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Δημιουργήστε αντίγραφα ασφαλείας για τα δεδομένα της συσκευής σας (όπως τους κωδικούς Wi-Fi και το ιστορικό κλήσεων) και τα δεδομένα εφαρμογών (όπως ρυθμίσεις και αρχεία που έχουν αποθηκευτεί από τις εφαρμογές) απομακρυσμένα και αυτόματα.\n\nΜε την ενεργοποίηση της αυτόματης δημιουργίας αντιγράφων ασφαλείας, τα δεδομένα της συσκευής και των εφαρμογών αποθηκεύονται απομακρυσμένα περιοδικά. Τα δεδομένα εφαρμογών μπορεί να είναι διαφόρων ειδών δεδομένα τα οποία έχουν αποθηκευτεί από κάποια εφαρμογή (ανάλογα με τις ρυθμίσεις του προγραμματιστή), συμπεριλαμβανομένων δυνητικά ευαίσθητων δεδομένων, όπως επαφών, μηνυμάτων και φωτογραφιών."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ρυθμίσεις διαχείρισης συσκευής"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Διαχειριστής συσκευής"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Απενεργοποίηση"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Απεγκατάσταση"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Απενεργοποίηση αυτού του διαχειριστή συσκευής"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Κατάργηση εγκατάστασης εφαρμογής"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Απενεργοποίηση και απεγκατάσταση"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Διαχειριστές συσκευών"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Δεν υπάρχουν διαθέσιμοι διαχειριστές συσκευών"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Προσωπική"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Εργασία"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Δεν υπάρχουν διαθέσιμοι trust agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Να εν/θεί ο διαχ/στής συσκ.;"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Ενεργοποίηση"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Ενεργοποίηση αυτού του διαχειριστή συσκευής"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Διαχειριστής συσκευής"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Η ενεργοποίηση αυτού του διαχειριστή θα επιτρέψει στην εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> να εκτελέσει τις ακόλουθες λειτουργίες:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Αυτός ο διαχειριστής είναι ενεργός και επιτρέπει στην εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> να εκτελέσει τις ακόλουθες λειτουργίες:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ενεργοποίηση τηλεφωνικών κλήσεων και SMS;"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Θα γίνει κοινή χρήση του ιστορικού κλήσεων και SMS με αυτόν το χρήστη."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Πληροφορίες έκτακτης ανάγκης"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Προσβάσιμες μέσω του κλειδώματος οθόνης στο πρόγραμμα κλήσης έκτακτης ανάγκης"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Προσβάσιμες από οποιονδήποτε από το πρόγραμμα κλήσης έκτακτης ανάγκης χωρίς ξεκλείδωμα του τηλεφώνου σας"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Επέκταση ρυθμίσεων για εφαρμ."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index b3fef73..0186ee4 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Unmount SD card"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Erase USB storage"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Erase SD card"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Make the text on screen smaller or larger."</string>
     <string name="small_font" msgid="2295331917424072635">"Small"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medium"</string>
     <string name="large_font" msgid="599055175160971446">"Large"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. \n\n Be careful whose fingerprints you add – any fingerprints added will be able to do these things."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Note: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Find out more"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Note: Your fingerprint may be less secure than a strong pattern or PIN. "<annotation id="url">"Find out more"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Device protection features will not be activated. You won\'t be able to prevent others from using this device if it\'s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Device protection features will not be activated. You won\'t be able to prevent others from using this phone if it\'s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Device protection features will not be activated. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Device protection features will not be activated. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Skip anyway"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Go back"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration with device and fingerprint sensor location"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remove all fingerprints?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"You won\'t be able to use your fingerprints to unlock your phone, authorise purchases or sign in to apps with them."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yes, remove"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use your fingerprint to continue."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Choose screen lock"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protect your phone"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingerprint may be less secure than a strong pattern, PIN or password. Set up a backup lock screen to be secure."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choose your backup screen lock method"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Change lock screen"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Not now"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Current screen lock"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingerprint + Pattern"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingerprint + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN must be at least %d characters"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tap Continue when done"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN must be fewer than <xliff:g id="NUMBER">%d</xliff:g> digits."</string>
@@ -886,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Wake screen when you pick up device or receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Set up SIM card lock"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM card lock"</string>
@@ -1588,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibility"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Accessibility settings"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Screen reader primarily for people with blindness and low vision"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Display"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Captions"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Magnification gesture"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"To zoom in and out tap the screen 3 times with one finger.\n\nWhile zoomed in, you can:\n"<ul>\n<li>"Scroll: Drag 2 or more fingers across the screen"</li>\n<li>"Adjust zoom level: Pinch 2 or more fingers together or spread them apart"</li></ul>\n\n"To zoom temporarily, tap 3 times and hold on the last tap. While holding your finger down, drag to move around the screen. Lift your finger to zoom back out.\n\nNote: Magnification gesture works everywhere except the keyboard and navigation bar."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"On"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Off"</string>
@@ -1936,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages and photos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Device administration settings"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Device administrator"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deactivate"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Uninstall"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deactivate this device administrator"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Uninstall app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deactivate and Uninstall"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Device administrators"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No available device administrators"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activate device administrator?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activate"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activate this device administrator"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Device administrator"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Activating this administrator will allow the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"This administrator is active and allows the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
@@ -2265,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accessible through lock screen in the emergency dialler"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accessible by anyone from the emergency keypad without unlocking your phone"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -2581,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Block when screen is on"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do Not Disturb from peeking or popping on screen"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Block when screen is off"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Off"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"When screen is on"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Enter administrator PIN"</string>
@@ -2831,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quickly open camera without unlocking your screen"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Display size"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Make items on screen larger or smaller"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"display, density, screen zoom, scale, scaling"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Make the items on your screen smaller or larger. Some apps on your screen may change position."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Preview"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Make smaller"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Make larger"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b3fef73..0186ee4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Unmount SD card"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Erase USB storage"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Erase SD card"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Make the text on screen smaller or larger."</string>
     <string name="small_font" msgid="2295331917424072635">"Small"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medium"</string>
     <string name="large_font" msgid="599055175160971446">"Large"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. \n\n Be careful whose fingerprints you add – any fingerprints added will be able to do these things."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Note: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Find out more"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Note: Your fingerprint may be less secure than a strong pattern or PIN. "<annotation id="url">"Find out more"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Device protection features will not be activated. You won\'t be able to prevent others from using this device if it\'s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Device protection features will not be activated. You won\'t be able to prevent others from using this phone if it\'s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Device protection features will not be activated. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Device protection features will not be activated. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Skip anyway"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Go back"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration with device and fingerprint sensor location"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remove all fingerprints?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"You won\'t be able to use your fingerprints to unlock your phone, authorise purchases or sign in to apps with them."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yes, remove"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use your fingerprint to continue."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Choose screen lock"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protect your phone"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingerprint may be less secure than a strong pattern, PIN or password. Set up a backup lock screen to be secure."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choose your backup screen lock method"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Change lock screen"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Not now"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Current screen lock"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingerprint + Pattern"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingerprint + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN must be at least %d characters"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tap Continue when done"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN must be fewer than <xliff:g id="NUMBER">%d</xliff:g> digits."</string>
@@ -886,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Wake screen when you pick up device or receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Set up SIM card lock"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM card lock"</string>
@@ -1588,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibility"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Accessibility settings"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Screen reader primarily for people with blindness and low vision"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Display"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Captions"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Magnification gesture"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"To zoom in and out tap the screen 3 times with one finger.\n\nWhile zoomed in, you can:\n"<ul>\n<li>"Scroll: Drag 2 or more fingers across the screen"</li>\n<li>"Adjust zoom level: Pinch 2 or more fingers together or spread them apart"</li></ul>\n\n"To zoom temporarily, tap 3 times and hold on the last tap. While holding your finger down, drag to move around the screen. Lift your finger to zoom back out.\n\nNote: Magnification gesture works everywhere except the keyboard and navigation bar."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"On"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Off"</string>
@@ -1936,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages and photos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Device administration settings"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Device administrator"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deactivate"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Uninstall"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deactivate this device administrator"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Uninstall app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deactivate and Uninstall"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Device administrators"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No available device administrators"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activate device administrator?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activate"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activate this device administrator"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Device administrator"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Activating this administrator will allow the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"This administrator is active and allows the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
@@ -2265,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accessible through lock screen in the emergency dialler"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accessible by anyone from the emergency keypad without unlocking your phone"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -2581,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Block when screen is on"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do Not Disturb from peeking or popping on screen"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Block when screen is off"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Off"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"When screen is on"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Enter administrator PIN"</string>
@@ -2831,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quickly open camera without unlocking your screen"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Display size"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Make items on screen larger or smaller"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"display, density, screen zoom, scale, scaling"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Make the items on your screen smaller or larger. Some apps on your screen may change position."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Preview"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Make smaller"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Make larger"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index b3fef73..0186ee4 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Unmount SD card"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Erase USB storage"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Erase SD card"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Make the text on screen smaller or larger."</string>
     <string name="small_font" msgid="2295331917424072635">"Small"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medium"</string>
     <string name="large_font" msgid="599055175160971446">"Large"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. \n\n Be careful whose fingerprints you add – any fingerprints added will be able to do these things."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Note: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Find out more"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Note: Your fingerprint may be less secure than a strong pattern or PIN. "<annotation id="url">"Find out more"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Device protection features will not be activated. You won\'t be able to prevent others from using this device if it\'s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Device protection features will not be activated. You won\'t be able to prevent others from using this phone if it\'s lost, stolen or wiped."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Device protection features will not be activated. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Device protection features will not be activated. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Skip anyway"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Go back"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration with device and fingerprint sensor location"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remove all fingerprints?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"You won\'t be able to use your fingerprints to unlock your phone, authorise purchases or sign in to apps with them."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yes, remove"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use your fingerprint to continue."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Unlock with your fingerprint"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Choose screen lock"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protect your phone"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingerprint may be less secure than a strong pattern, PIN or password. Set up a backup lock screen to be secure."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choose your backup screen lock method"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Change lock screen"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medium to high security"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"High security"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Not now"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Current screen lock"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingerprint + Pattern"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingerprint + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN must be at least %d characters"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tap Continue when done"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN must be fewer than <xliff:g id="NUMBER">%d</xliff:g> digits."</string>
@@ -886,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Wake screen when you pick up device or receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Set up SIM card lock"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM card lock"</string>
@@ -1588,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibility"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Accessibility settings"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Screen reader primarily for people with blindness and low vision"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Display"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Captions"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Magnification gesture"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"To zoom in and out tap the screen 3 times with one finger.\n\nWhile zoomed in, you can:\n"<ul>\n<li>"Scroll: Drag 2 or more fingers across the screen"</li>\n<li>"Adjust zoom level: Pinch 2 or more fingers together or spread them apart"</li></ul>\n\n"To zoom temporarily, tap 3 times and hold on the last tap. While holding your finger down, drag to move around the screen. Lift your finger to zoom back out.\n\nNote: Magnification gesture works everywhere except the keyboard and navigation bar."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"On"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Off"</string>
@@ -1936,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages and photos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Device administration settings"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Device administrator"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deactivate"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Uninstall"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deactivate this device administrator"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Uninstall app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deactivate and Uninstall"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Device administrators"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No available device administrators"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activate device administrator?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activate"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activate this device administrator"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Device administrator"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Activating this administrator will allow the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"This administrator is active and allows the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
@@ -2265,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Emergency information"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accessible through lock screen in the emergency dialler"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accessible by anyone from the emergency keypad without unlocking your phone"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
@@ -2581,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Block when screen is on"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do Not Disturb from peeking or popping on screen"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Block when screen is off"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Off"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"When screen is on"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"When screen is on or off"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Enter administrator PIN"</string>
@@ -2831,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quickly open camera without unlocking your screen"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Display size"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Make items on screen larger or smaller"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"display, density, screen zoom, scale, scaling"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Make the items on your screen smaller or larger. Some apps on your screen may change position."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Preview"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Make smaller"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Make larger"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4a5f2f9..b805f5c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmontar la tarjeta SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Eliminar almacenamiento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Borrar tarjeta SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Aumenta o reduce el tamaño del texto en pantalla."</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeño"</string>
     <string name="medium_font" msgid="2068475425515133701">"Mediano"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Usar huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Toca el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o acceder a las apps. \n\n Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues al teléfono podrán realizar estas acciones."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota: la huella digital es menos segura que un PIN o patrón eficaz."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Más información"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Nota: Tu huella digital es menos segura que un patrón o un PIN eficaz. "<annotation id="url">"Más información"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen esta tablet si la pierdes, te la roban o se borran todos los datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este dispositivo si se pierde, te lo roban o se borran todos los datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este teléfono si se pierde, te lo roban o se borran todos los datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"No se activarán las funciones de protección del dispositivo. Si la pierdes o te la roban, no podrás evitar que otras personas usen esta tablet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"No se activarán las funciones de protección del dispositivo. Si lo pierdes o te lo roban, no podrás evitar que otras personas lo usen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"No se activarán las funciones de protección del dispositivo. Si lo pierdes o te lo roban, no podrás evitar que otras personas usen este teléfono."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omitir"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Atrás"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Buscar el sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Busca el sensor de huellas digitales en la parte posterior del teléfono."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustración del dispositivo y la ubicación del sensor de huellas digitales"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"¿Quitar las huellas digitales?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"No podrás utilizar las huellas digitales para desbloquear el teléfono, autorizar compras ni acceder a las aplicaciones con ellas."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sí, deseo quitarlas"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utiliza tu huella digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protege tu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear con tu huella digital"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Bloqueo de pantalla"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Elegir el bloqueo de pantalla"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protege el teléfono"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"La huella digital es menos segura que un patrón, un PIN o una contraseña. Configura una pantalla bloqueada para mayor seguridad."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para impedir que terceros usen esta tablet sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Elegir el método secundario de bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. bloqueada"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de seguridad medio a alto"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivel de seguridad alto"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ahora no"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueo de pantalla actual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Huella digital y patrón"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Huella digital y PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe tener al menos %d caracteres."</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe tener al menos %d dígitos."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Presiona Continuar cuando termines"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"El PIN debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sin cambios)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Se agregaron varios certificados)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Usar certificados de sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"No validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No especificaste ningún certificado. Tu conexión no será privada."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Se debe especificar un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Permite activar la pantalla cuando recoges el dispositivo o recibes notificaciones."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o reduce el tamaño del texto en pantalla"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueo de la tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Definir bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de la tarjeta SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidad"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de la visión"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Puedes personalizar este dispositivo para que se adapte a tus necesidades. Estas funciones de accesibilidad puede cambiarse más tarde en Configuración."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Lector de pantalla, principalmente, para personas con ceguera o visión reducida"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Pantalla"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítulos"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gesto de ampliación"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Presiona tres veces para aplicar el zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Para acercar y alejar elementos, presiona la pantalla tres veces con un dedo.\n\nCuando hayas acercado un elemento, podrás realizar lo siguiente:\n"<ul>\n<li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"Para acercar temporalmente, presiona tres veces y mantén presionada la última vez. Mientras mantienes presionado el dedo, arrástralo para moverte por la pantalla y levántalo para alejarte.\n\nNota: El gesto de ampliación funciona en cualquier parte, excepto en el teclado y la barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a la accesibilidad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Encendido"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Crear una copia de seguridad automática y remota de los datos del dispositivo (por ejemplo, contraseñas de Wi-Fi e historial de llamadas) y de los datos de las aplicaciones (por ejemplo, archivos y opciones de configuración que guardan las aplicaciones)\n\nCuando activas la copia de seguridad automática, los datos del dispositivo y las aplicaciones se guardan periódicamente de forma remota. Los datos de las aplicaciones pueden ser cualquier dato que guardó una aplicación (según la configuración del programador), incluso datos potencialmente confidenciales, como los contactos, los mensajes y las fotos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuración de la administración del dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador del dispositivo"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalar"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desactivar este administrador de dispositivos"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desactivar y desinstalar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores del dispositivo"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No existen administradores de dispositivos disponibles."</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Trabajo"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"No hay agentes de confianza disponibles."</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"¿Deseas activar el administrador del dispositivo?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activar"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activar este administrador de dispositivos"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Si activas este administrador, la aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> podrá realizar las siguientes operaciones:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está activo y permite que la aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> realice las siguientes operaciones:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas telefónicas y SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Se compartirá el historial de llamadas y SMS con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emergencia"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Se puede acceder mediante la pantalla bloqueada en el marcador de emergencia"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Cualquier persona puede acceder mediante el marcador de emergencia sin desbloquear el teléfono"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
@@ -2581,22 +2586,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar a solo alarmas hasta la(s) <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear con la pantalla encendida"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Impide que las notificaciones silenciadas por \"No molestar\" se visualicen o aparezcan en la pantalla"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear cuando la pantalla está apagada"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Impide que las notificaciones silenciadas por \"No molestar\" se activen en la pantalla o enciendan la luz de notificación"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desactivada"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Cuando la pantalla está encendida"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Cuando la pantalla está apagada"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Cuando la pantalla está encendida o apagada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ingresar PIN de administrador"</string>
@@ -2831,13 +2828,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación de la cámara"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botón de encendido dos veces para cámara"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abre la cámara de forma rápida sin desbloquear la pantalla"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Mostrar tamaño"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Aumenta o reduce el tamaño de los elementos en pantalla"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densidad de la pantalla, zoom de la pantalla, escala"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Aumenta o reduce el tamaño de los elementos en pantalla. Algunas apps de tu pantalla pueden cambiar su posición."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Vista previa"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Reducir el tamaño"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Aumentar el tamaño"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6a5bc3d..3ee6fd7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desactivar tarjeta SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Borrar almacenamiento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Borrar tarjeta SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Aumenta o disminuye el tamaño del texto de la pantalla."</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeño"</string>
     <string name="medium_font" msgid="2068475425515133701">"Mediano"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueo con huella"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Toca el sensor de huellas digitales para desbloquear el teléfono y autorizar compras o iniciar sesión en aplicaciones. \n\n Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota: Tu huella digital puede ser menos segura que un buen patrón o PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Más información"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Nota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN "<annotation id="url">"Más información"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este tablet en caso de pérdida, robo o borrado de datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este dispositivo en caso de pérdida, robo o borrado de datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este teléfono en caso de pérdida, robo o borrado de datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este tablet en caso de pérdida o robo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este dispositivo en caso de pérdida o robo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este teléfono en caso de pérdida o robo."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Sí, saltar"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Volver"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiza el sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza el sensor de huellas digitales situado en la parte trasera del teléfono."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustración con la ubicación del sensor de huellas digitales y dispositivo"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Puedes añadir hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"¿Eliminar todas las huellas?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"No podrás utilizar tus huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en las aplicaciones."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sí, eliminar"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utiliza tu huella digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Cifrado"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protege tu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear con tu huella digital"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elige un bloqueo"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Elige un bloqueo de pantalla"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protege tu teléfono"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Es posible que la huella digital sea menos segura que un buen patrón, PIN o contraseña. Configura una pantalla de bloqueo de la copia de seguridad para mayor protección."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el tablet sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para evitar que otros lo utilicen sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el teléfono sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Selecciona el método de bloqueo de pantalla alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pantalla de bloqueo"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridad media-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Seguridad alta"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ahora no"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueo de pantalla actual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Huella digital + patrón"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Huella digital + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe contener al menos %d caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe contener al menos %d dígitos"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Toca Continuar cuando hayas terminado"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"El PIN debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(no modificada)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona una aplicación"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Se han añadido varios certificados)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Utilizar certificados del sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"No validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No se ha especificado ningún certificado. La conexión no será privada."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Se debe especificar un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce la contraseña de tu red"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Activar pantalla al coger el dispositivo o recibir notificaciones"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de la fuente"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o disminuye el tamaño del texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de tarjeta SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidad"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ajustes de accesibilidad"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ajustes de visión"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad posteriormente en Ajustes."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <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="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Pantalla"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítulos"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gesto de ampliación"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca tres veces para hacer zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Para acercar y alejar la imagen, toca la pantalla tres veces con un dedo.\n\nCon el contenido ampliado, puedes realizar las acciones que se indican a continuación:\n"<ul>\n<li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla"</li>\n<li>"Modificar el nivel de zoom: pellizca la pantalla uniendo dos o más dedos o sepáralos"</li></ul>\n\n"Para hacer zoom temporalmente, toca 3 veces la pantalla, mantenla pulsada y arrastra el dedo. Levántalo para volver al estado anterior.\n\nNota: El gesto de ampliación funciona en cualquier parte de la pantalla, excepto el teclado y la barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a accesibilidad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Sí"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"No"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Realiza una copia de seguridad automática de los datos del dispositivo (como las contraseñas de redes Wi-Fi y el historial de llamadas) y de los datos de las aplicaciones (como sus ajustes y archivos guardados) de forma remota.\n\nAl activar la copia de seguridad automática, los datos del dispositivo y de las aplicaciones se guardan periódicamente de forma remota. Los datos de las aplicaciones pueden ser cualquier tipo de información que guarden (en función de la configuración de los desarrolladores), incluidos los datos que pueden ser confidenciales (como contactos, mensajes y fotos)."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ajustes de administración de dispositivos"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador de dispositivos"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalar"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desactivar este administrador de dispositivos"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar aplicación"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desactivar y desinstalar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores de dispositivos"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No hay ningún administrador de dispositivos disponible."</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Trabajo"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"No hay agentes de confianza disponibles"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"¿Activar administrador de dispositivos?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activar"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activar este administrador de dispositivos"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador de dispositivos"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Al activar este administrador, la aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> podrá llevar a cabo las siguientes operaciones:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está activo y permite que la aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> realice las siguientes operaciones:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"¿Activar llamadas y SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"El historial de SMS y de llamadas se compartirán con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emergencia"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Disponible al realizar una llamada de emergencia en la pantalla de bloqueo"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Cualquiera puede acceder desde el marcador de emergencia sin desbloquear el teléfono"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar ajustes de aplicación"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar a Solo alarmas hasta las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear con la pantalla activada"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Impide que las notificaciones silenciadas por el modo No molestar aparezcan en la pantalla"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear con la pantalla desactivada"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Impide que las notificaciones silenciadas por el modo No molestar activen la pantalla o la luz de notificación"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"No"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Con la pantalla activada"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Con la pantalla desactivada"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Con la pantalla activada o desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduce el PIN del administrador"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación Cámara"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botón de encendido dos veces para cámara"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abre la cámara rápidamente sin desbloquear la pantalla"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Tamaño de la pantalla"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Aumenta o disminuye el tamaño de los elementos de la pantalla"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densidad de pantalla, zoom, escala"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Aumenta o disminuye el tamaño de los elementos de la pantalla. Es posible que cambie la posición de algunas aplicaciones."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Vista previa"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Disminuir el tamaño"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Aumentar el tamaño"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 9def6d6..89bd4a9 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sõrmejäljega avamine"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Puudutage sõrmejäljeandurit telefoni avamiseks, ostude volitamiseks või rakendustesse sisselogimiseks. \n\n Olge sõrmejälgede lisamisel ettevaatlik, kuna neid toiminguid saab teha iga lisatud sõrmejäljega."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Märkus. Sõrmejälg võib olla vähem turvaline kui keerukas muster või PIN-kood."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Lisateave"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Märkus. Sõrmejälg võib olla vähem turvaline kui tugev muster või PIN-kood. "<annotation id="url">"Lisateave"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Tühista"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jätka"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi tahvelarvutit kasutamast, kui selle kaotate, see varastatakse või selle andmed kustutatakse."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi seadet kasutamast, kui selle kaotate, see varastatakse või selle andmed kustutatakse."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi telefoni kasutamast, kui selle kaotate, see varastatakse või selle andmed kustutatakse."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi tahvelarvutit kasutamast, kui selle kaotate või see varastatakse."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi seadet kasutamast, kui selle kaotate või see varastatakse."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi telefoni kasutamast, kui selle kaotate või see varastatakse."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Jäta ikka vahele"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Mine tagasi"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Leidke andur"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Leidke telefoni tagaküljel olev sõrmejäljeandur."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Seadme joonis ja sõrmejäljeanduri asukoht"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Saate lisada kuni <xliff:g id="COUNT">%d</xliff:g> sõrmejälge"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Kas eemaldada kõik sõrmejäljed?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Te ei saa oma sõrmejälgi kasutades telefoni avada, oste volitada ega rakendustesse sisse logida."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Jah, eemalda"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Jätkamiseks kasutage sõrmejälge."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Krüpteerimine"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Seadme kaitsmine"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Sõrmejäljega avamine"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekraaniluku valimine"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Ekraaniluku valimine"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefoni kaitsmine"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Sõrmejälg võib olla vähem turvaline kui tugev muster, PIN-kood või parool. Turvalisuse tagamiseks seadistage varulukustuskuva."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata tahvelarvutit kasutada. Valige kasutatav ekraanilukk."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata seadet kasutada. Valige kasutatav ekraanilukk."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata telefoni kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Valige oma ekraaniluku varumeetod"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekraanilukk"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekraaniluku muutmine"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskmine kuni kõrge turvalisus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parool"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Kõrge turvalisus"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Mitte praegu"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Praegune ekraanilukk"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Sõrmejälg + muster"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Sõrmejälg + PIN-kood"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parool peab olema vähemalt %d tähemärgi pikkune"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koodi pikkus peab olema vähemalt %d numbrit"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Kui olete valmis, puudutage käsku Jätka"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jätka"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parool peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> märki."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-kood peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> numbrit."</string>
@@ -1929,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Varundage seadme andmed (nt WiFi-paroolid ja kõneajalugu) ning rakenduse andmed (nt seaded ja rakenduste salvestatud failid) kaugjuhtimisega automaatselt.\n\nKui lülitate automaatse varundamise sisse, salvestatakse seadme ja rakenduse andmed regulaarselt kaugjuhtimisega. Rakenduse andmed võivad olla mis tahes andmed, mille rakendus on salvestanud (arendaja seadete põhjal), sh potentsiaalselt tundlikud andmed, nagu kontaktid, sõnumid ja fotod."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Seadme haldusseaded"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Seadme ülem"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Inaktiveeri"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalli"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Inaktiveeri see seadme administraator"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalli rakendus"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Inaktiveeri ja desinstalli"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Seadme ülemad"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Pole ühtegi seadme ülemat"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Isiklik"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Töö"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Saadaval pole ühtegi usaldusväärset agenti"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktiveerin seadme ülema?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiveeri"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktiveeri selle seadme administraator"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Seadme ülem"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Selle administraatori aktiveerimisel lubatakse rakendusel <xliff:g id="APP_NAME">%1$s</xliff:g> teha järgmisi toiminguid:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"See administraator on aktiivne ja lubab rakendusel <xliff:g id="APP_NAME">%1$s</xliff:g> teha järgmisi toiminguid:"</string>
@@ -2258,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kas lülitada sisse telefonikõned ja SMS-id?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Selle kasutajaga jagatakse kõne- ja SMS-ajalugu."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Hädaabiteave"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Hädaabikõne helistamisprogrammis juurdepääsetav lukustuskuva kaudu"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Hädaabikõne helistamisprogrammis juurdepääsetav kõigile ilma telefoni avamata"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Rakenduste ja sisu lubamine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Piirangutega rakendused"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laienda rakenduste seadeid"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index a7afe7f..13db00c 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmuntatu SD txartela"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ezabatu USB memoria"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Ezabatu SD txartela"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Handitu edo txikitu pantailako testua."</string>
     <string name="small_font" msgid="2295331917424072635">"Txikia"</string>
     <string name="medium_font" msgid="2068475425515133701">"Ertaina"</string>
     <string name="large_font" msgid="599055175160971446">"Handia"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desblokeatu hatz-marka bidez"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Ukitu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. \n\n Aukera itzazu zentzuz eginbidea erabiltzeko aukera eman nahi diezun hatz-markak, gehitutako hatz-marka guztiekin egin ahal baitaiteke aipatutakoa."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Oharra: hatz-marka ez da eredu edo PIN zail bat bezain segurua."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Informazio gehiago"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Oharra: hatz-marka ez da eredu edo PIN zail bat bezain segurua. "<annotation id="url">"Lortu informazio gehiago"</annotation></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="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu galarazi inori tableta erabiltzea hura galtzen bazaizu, lapurtzen badizute edo bertako datu guztiak ezabatzen badituzte."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi gailua erabiltzea hura galtzen baduzu, lapurtzen badizute edo datuak guztiz ezabatzen badizkiote."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi telefonoa erabiltzea hura galtzen baduzu, lapurtzen badizute edo datuak guztiz ezabatzen badizkiote."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi tableta erabiltzea hura galtzen baduzu edo lapurtzen badizute."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi gailua erabiltzea hura galtzen baduzu edo lapurtzen badizute."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi telefonoa erabiltzea hura galtzen baduzu edo lapurtzen badizute."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Saltatu halere"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Atzera"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Bilatu sentsorea"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Bilatu hatz-marken sentsorea; telefonoaren atzealdean dago."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Hatz-marken sentsorea gailuan non dagoen erakusten duen ilustrazioa"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> hartz-marka gehi ditzakezu gehienez"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Hatz-marka digitalak kendu nahi dituzu?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Ezin izango dituzu hatz-marka digitalak erabili telefonoa desblokeatzeko, erosketak baimentzeko edo haiekin aplikazioetan saioa hasteko."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Bai, kendu"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Jarraitzeko, erabili hatz-marka."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkriptatzea"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Babestu gailua"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desblokeatu hatz-markarekin"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Aukeratu pantailaren blokeoa"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Aukeratu pantailaren blokeoa"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Babestu telefonoa"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Hatz-marka ez da eredu, PIN edo pasahitz zail bat bezain segurua. Seguruago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Galarazi inork tableta baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Galarazi inork gailua baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Galarazi inork telefonoa baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Aukeratu pantailaren blokeoaren ordezko metodoa"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Pantailaren blokeoa"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Aldatu pant. blokeatua"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurtasun ertaina-handia"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pasahitza"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurtasun handia"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Orain ez"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Uneko pantailaren blokeoa"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Hatz-marka digitala + eredua"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Hatz-marka digitala + PIN kodea"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Aldatu desblokeatzeko pasahitza"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Pasahitzak gutxienez %d karaktere izan behar ditu."</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodeak %d digitu izan behar ditu gutxienez."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Amaitutakoan, sakatu Jarraitu"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jarraitu"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Pasahitzak <xliff:g id="NUMBER">%d</xliff:g> karaktere baino gutxiago eduki behar ditu."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN kodeak <xliff:g id="NUMBER">%d</xliff:g> digitu baino gutxiago izan behar ditu."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aldatu gabea)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Hautatu"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Ziurtagiri batzuk gehitu dira)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Erabili sistemaren ziurtagiriak"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ez zehaztu"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ez balidatu"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ez da zehaztu ziurtagiririk. Konexioa ez da izango pribatua."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domeinua zehaztu behar da."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Idatzi sarearen pasahitza"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Giroaren araberako pantaila"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Argitu pantaila gailua mugitzen baduzu edo jakinarazpenak jasotzen badituzu"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM txartelaren blokeo-ezarpenak"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfiguratu SIM txartelaren blokeoa"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM txartelaren blokeoa"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Erabilerraztasuna"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Erabilerraztasun-ezarpenak"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision ezarpenak"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Zerbitzuak"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Pantaila-irakurgailua, ikusmen-arazoak dituztenentzat"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Bistaratzea"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Bideo-oinak"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Handitzeko keinua"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Sakatu hirutan zooma aplikatzeko"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Pantailan dagoena handitzeko edo txikitzeko, sakatu pantaila hiru aldiz hatz bakarrarekin.\n\nIrudia handituta dagoen bitartean, hauek egin ditzakezu:\n"<ul>\n<li>"Pantailan zehar mugitu: pantailan bi hatz edo gehiago arrastatuta."</li>\n<li>"Zoom-maila doitu: bi hatz edo gehiago elkartuta edo urrunduta."</li></ul>\n\n"Aldi baterako handitzeko, sakatu pantaila hiru aldiz eta, hirugarrenean, mantendu hatza pantailan. Hatza pantailatik altxatu gabe, arrasta ezazu noranahi. Aurreko ikuspegira itzultzeko, altxatu hatza.\n\nOharra: handitzeko keinuak edonon funtzionatzen du, teklatuan eta nabigazio-barran izan ezik."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erabilerraztasunaren lasterbidea"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aktibatuta"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desaktibatuta"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzailearen ezarpenen arabera), eta isilpekoa izan litekeen informazioa ere sar daiteke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Gailuaren administrazio-ezarpenak"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Gailu-administratzailea"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desaktibatu"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalatu"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desaktibatu gailu honen administratzailea"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalatu aplikazioa"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desaktibatu eta desinstalatu"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Gailu-administratzaileak"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Ez dago gailu-administratzaile erabilgarririk"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pertsonala"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Lantokia"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Ez dago agente fidagarririk erabilgarri"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Gailu-administratzailea aktibatu?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktibatu"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktibatu gailu honen administratzailea"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Gailu-administratzailea"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Administratzaile hau aktibatzen baduzu, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak eragiketa hauek egiteko baimena izango du:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Administratzailea aktibo dago eta eragiketa hauek egitea baimentzen dio <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioari:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefono-deiak eta SMSak aktibatu nahi dituzu?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Deien eta SMS mezuen historia erabiltzaile honekin partekatuko da."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Larrialdietarako informazioa"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Pantaila blokeatuko larrialdietarako markagailuaren bidez atzi daiteke"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Edonork erabil dezake larrialdietarako telefonotik, gailua desblokeatu behar izan gabe ere"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Baimendu aplikazioak eta edukia"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Murrizketak dituzten aplikazioak"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Zabaldu aplikazio-ezarpenak"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Aldatu \"Alarmak soilik\" modura <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Aldatu \"Eten beti\" modura"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokeatu pantaila piztuta dagoenean"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Ekidin \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenak pantailan agertzea"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokeatu pantaila itzalita dagoenean"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Ekidin \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenek pantaila edo jakinarazpen-argia piztea"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desaktibatuta"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Pantaila piztuta dagoenean"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Pantaila itzalita dagoenean"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Pantaila piztuta nahiz itzalita dagoenean"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Idatzi administratzailearen PINa"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ireki kameraren aplikazioa eskumuturra birritan biratuta"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Ireki kamera etengailua birritan sakatuta"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ireki kamera bizkor, pantaila desblokeatu beharrik gabe"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Bistaratzeko tamaina"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Handitu edo txikitu pantailako elementuak"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"pantaila, dentsitate, zoom, eskala, tamaina, egokitu, doitu"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Handitu edo txikitu pantailako elementuak. Ezarpena aldatuz gero, baliteke aplikazio batzuen posizioa aldatzea."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Aurrebista"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Txikitu"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Handitu"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b9e0d3f..71d3249 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"‏جدا کردن کارت SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"‏پاک کردن حافظهٔ USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"‏پاک کردن کارت SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"نوشتار روی صفحه‌نمایش را کوچک‌تر یا بزرگ‌تر کنید."</string>
     <string name="small_font" msgid="2295331917424072635">"کوچک"</string>
     <string name="medium_font" msgid="2068475425515133701">"متوسط"</string>
     <string name="large_font" msgid="599055175160971446">"بزرگ"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"برای باز کردن قفل تلفن، مجاز کردن خریدها یا ثبت ورود در برنامه‌ها، کافیست حسگر اثر انگشت را لمس کنید. \n\n مراقب باشید که اثر انگشت چه کسانی را اضافه می‌کنید - هر اثر انگشتی که اضافه‌شده می‌تواند این کارها را انجام دهد."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"توجه: ممکن است امنیت اثر انگشت شما از یک الگو یا پین قوی کمتر باشد."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"بیشتر بدانید"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"توجه: اثر انگشت شما ممکن است نسبت به الگو یا پینی قوی ایمنی کمتری داشته باشد. "<annotation id="url">"بیشتر بدانید"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"لغو"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ادامه"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. در صورت گم شدن، سرقت یا پاک شدن اطلاعات این رایانه لوحی، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن، سرقت یا پاک شدن اطلاعات دستگاه، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن، سرقت یا پاک شدن اطلاعات این تلفن، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن یا به‌سرقت رفتن این رایانه لوحی، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن یا به‌سرقت رفتن این دستگاه، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن یا به‌سرقت رفتن این تلفن، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"در هر حال رد شود"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"برگشت"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"پیدا کردن حسگر"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"محل حسگر اثر انگشت را در پشت تلفنتان پیدا کنید."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"تصویر دستگاه و مکان حسگر اثر انگشت"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"می‌توانید حداکثر <xliff:g id="COUNT">%d</xliff:g> اثرانگشت اضافه کنید"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"همه اثر انگشت‌ها پاک شوند؟"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"دیگر نمی‌توانید از اثر انگشتتان برای باز کردن قفل تلفن، مجاز کردن خریدها، یا ورود به سیستم برنامه‌ها استفاده کنید."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,13 +414,17 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"از دستگاهتان محافظت کنید"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"بازکردن قفل با اثر انگشت"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"انتخاب قفل صفحه‌نمایش"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"انتخاب قفل صفحه‌نمایش"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"از تلفنتان محافظت کنید"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"اثر انگشت ممکن است نسبت به الگو، پین یا گذرواژه‌ای قوی ایمنی کمتری داشته باشد. برای اینکه ایمنی را حفظ کنید قفل صفحه پشتیبانی تنظیم کنید."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این رایانه لوحی استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این دستگاه استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این تلفن استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"روش پشتیبان قفل صفحه را انتخاب کنید"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_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>
-    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"هیچکدام"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"هیچ‌کدام"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"تند کشیدن"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"عدم وجود امنیت"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"امنیت متوسط به بالا"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"گذرواژه"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"امنیت بالا"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"اکنون نه"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"قفل صفحه فعلی"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"اثر انگشت + الگو"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"اثر انگشت + پین"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر گذرواژه قفل‌گشا"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"‏گذرواژه باید حداقل %d نویسه باشد"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"‏پین باید حداقل %d رقم باشد"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"وقتی تمام شد روی ادامه ضربه بزنید"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ادامه"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"گذرواژه باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> نویسه باشد."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"پین باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> رقم باشد."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(بدون تغییر)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"لطفاً انتخاب کنید"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(چندین گواهینامه اضافه شد)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"استفاده از گواهی‌های سیستم"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ارائه نشود"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"تأیید اعتبار نشود"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"مجوزی مشخص نشده است. اتصال شما خصوصی نخواهد بود."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"باید دامنه‌ای مشخص کنید."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS در دسترس است"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"گذرواژه شبکه‌تان را وارد کنید"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"نمایشگر محیط"</string>
     <string name="doze_summary" msgid="7128970177894383698">"روشن شدن صفحه هنگامی که دستگاه را برمی‌دارید یا اعلانی دریافت می‌کنید"</string>
     <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"بزرگ‌تر یا کوچک‌تر کردن نوشتار"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"تنظیم قفل سیم کارت"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"قفل سیم کارت"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"دسترس‌پذیری"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"تنظیمات دسترس‌پذیری"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"تنظیمات بینایی"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"می‌توانید این دستگاه را متناسب با نیازهایتان سفارشی کنید. می‌توانید بعداً در «تنظیمات»، این قابلیت‌های دسترس‌پذیری را تغییر دهید."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"سرویس‌ها"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"صفحه‌خوان در وهله اول برای افراد نابینا و کم‌بینا در نظر گرفته شده است"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"سیستم"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"نمایشگر"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"زیرنویس‌ها"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"حرکت بزرگ‌نمایی"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"برای بزرگ‌نمایی، ۳ بار ضربه بزنید"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"برای بزرگ‌نمایی و کوچک کردن، با یک انگشت ۳ بار روی صفحه‌نمایش ضربه بزنید.\n\nدر حین بزرگ‌نمایی می‌توانید این کارها را انجام دهید:\n"<ul>\n<li>"پیمایش: ۲ یا چند انگشت را روی صفحه‌نمایش بکشید"</li>\n<li>"تنظیم میزان بزرگ‌نمایی: ۲ یا چند انگشت را به هم نزدیک یا از هم دور کنید"</li></ul>\n\n"برای بزرگ‌نمایی موقت، ۳ بار ضربه بزنید و در آخرین ضربه انگشتتان را پایین نگه‌دارید. درحالی‌که انگشتتان را پایین نگه‌داشته‌اید، برای حرکت در اطراف صفحه‌نمایش انگشتتان را روی صفحه بکشید. برای خروج از بزرگ‌نمایی، انگشتتان را بلند کنید.\n\nتوجه: حرکت بزرگ‌نمایی، در همه جا به‌جز صفحه‌کلید و نوار پیمایش کار می‌کند."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"میان‌برهای دسترسی‌پذیری"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"روشن"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"خاموش"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"‏انجام پشتیبان‌گیری خودکار از داده‌های دستگاه (مانند گذرواژه‌های Wi-Fi و سابقه تماس) و داده‌های برنامه (مثل تنظیمات و فایل‌های ذخیره شده توسط برنامه‌ها) از راه دور.\n\nوقتی پشتیبان‌گیری خودکار را روشن می‌کنید، داده‌های دستگاه و برنامه به‌صورت دوره‌ای از راه دور ذخیره می‌شوند. داده‌های برنامه می‌تواند هر داده‌ای باشد که برنامه (براساس تنظیمات برنامه‌نویس) ذخیره کرده است، از جمله داده‌های بالقوه حساس مانند مخاطبین، پیام‌ها و عکس‌ها."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"تنظیمات سرپرستی دستگاه"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"سرپرست دستگاه"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"غیرفعال کردن"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"حذف نصب"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"غیرفعال کردن سرپرست این دستگاه"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"حذف نصب برنامه"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"غیرفعال کردن و حذف نصب کردن"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"سرپرستان دستگاه"</string>
     <string name="no_device_admins" msgid="702695100241728775">"هیچ سرپرست دستگاهی موجود نیست"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"شخصی"</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="6246742476064507965">"سرپرست دستگاه فعال شود؟"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"فعال کردن"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"فعال کردن سرپرست این دستگاه"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"سرپرست دستگاه"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"فعال‌سازی این سرپرست به برنامه <xliff:g id="APP_NAME">%1$s</xliff:g> امکان می‌دهد تا عملکردهای زیر را انجام دهد:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"این سرپرست فعال است و به برنامه <xliff:g id="APP_NAME">%1$s</xliff:g> اجازه می‌دهد تا عملکردهای زیر را انجام دهد:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"تماس‌های تلفنی و پیامک روشن شوند؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"سابقه پیامک و تماس، با این کاربر به اشتراک گذاشته می‌شود."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"اطلاعات اضطراری"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"قابل دسترس ازطریق صفحه درحالت قفل در بخش تلفن اضطراری"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"ازطریق شماره‌گیر اضطراری، بدون نیاز به بازکردن قفل تلفن، برای همه قابل دسترسی است"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"برنامه‌ها و محتوا مجازاند"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"برنامه‌های دارای محدودیت"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسعه تنظیمات برای برنامه"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"تغییر به «فقط هشدارها» تا <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغییر در «همیشه وقفه»"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"وقتی صفحه‌نمایش روشن است مسدود شود"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"مانع از آن می‌شود که اعلان‌های بی‌صداشده با «مزاحم نشوید» در صفحه‌نمایش فعلی نشان داده یا ظاهر شوند"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"وقتی صفحه‌نمایش خاموش است مسدود شود"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"مانع از آن می‌شود که اعلان‌های بی‌صداشده با «مزاحم نشوید» باعث چشمک زدن چراغ اعلان یا روشن شدن صفحه‌نمایش شوند"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"خاموش"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"وقتی صفحه‌نمایش روشن است"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"وقتی صفحه‌نمایش روشن است"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"وقتی صفحه‌نمایش روشن یا خاموش است"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"پین سرپرست را وارد کنید"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"با دو بار چرخاندن مچتان، برنامه دوربین را باز کنید"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"دو ضربه روی دکمه روشن/خاموش برای دوربین"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"دوربین را سریع و بدون باز کردن قفل صفحه باز کنید"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"اندازه نمایش"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"بزرگ‌تر یا کوچک‌تر کردن موارد روی صفحه‌نمایش"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"تراکم نمایشگر، بزرگ‌نمایی صفحه، مقیاس، مقیاس‌بندی"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"موارد روی صفحه‌نمایش را بزرگ‌تر یا کوچک‌تر کنید. ممکن است موقعیت برخی از برنامه‌های روی صفحه‌نمایش تغییر کند."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"پیش‌نمایش"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"کوچک‌تر ببینید"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"بزرگ‌تر ببینید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 028d596..9c7d75c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Poista SD-kortti käytöstä"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Tyhjennä USB-tila"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Tyhjennä SD-kortti"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Suurenna tai pienennä tekstiä näytöllä."</string>
     <string name="small_font" msgid="2295331917424072635">"Pieni"</string>
     <string name="medium_font" msgid="2068475425515133701">"Keskikokoinen"</string>
     <string name="large_font" msgid="599055175160971446">"Suuri"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Avaa sormenjäljellä"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Avaa puhelimen lukitus, valtuuta ostoksia ja kirjaudu sovelluksiin helposti koskettamalla sormenjälkitunnistinta. \n\n Ole varovainen lisätessäsi sormenjälkiä – edellä mainitut toiminnot onnistuvat kaikilla laitteeseen lisätyillä sormenjäljillä."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Huom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Lisätietoja"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Huom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi. "<annotation id="url">"Lisätietoja"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Peruuta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jatka"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tablettisi käyttöä, jos se varastetaan, katoaa tai sen tiedot tyhjennetään."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteesi käyttöä, jos se varastetaan, katoaa tai sen tiedot tyhjennetään."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimesi käyttöä, jos se varastetaan, katoaa tai sen tiedot tyhjennetään."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tablettisi käyttöä, jos se varastetaan tai katoaa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteesi käyttöä, jos se varastetaan tai katoaa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimesi käyttöä, jos se varastetaan tai katoaa."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ohita silti"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Takaisin"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Etsi anturi"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Etsi sormenjälkianturi puhelimen takapuolelta."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Laitteen ja sormenjälkianturin sijainnin kuva."</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Voit lisätä korkeintaan <xliff:g id="COUNT">%d</xliff:g> sormenjälkeä"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Poistetaanko kaikki sormenjäljet?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Et voi käyttää sormenjälkeäsi puhelimen avaamiseen, ostosten valtuuttamiseen tai sovelluksiin kirjautumiseen."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Kyllä, poista"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Jatka sormenjäljen avulla."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Salaus"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Suojaa laitettasi"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Lukituksen avaaminen sormenjäljellä"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse näytön lukitus"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Valitse näytön lukitus"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Suojaa puhelintasi"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio, PIN-koodi tai salasana. Määritä varalukitusmenetelmä suojauksen takaamiseksi."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Estä tablettisi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Estä laitteesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Estä puhelimesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Valitse toissijainen näytönlukitusmenetelmä"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Näytön lukitus"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Vaihda näytön lukitus"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keskitason tai korkea suojaus"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Salasana"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Korkea suojaus"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ei nyt"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Nykyinen näytön lukitus"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Sormenjälki ja kuvio"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Sormenjälki ja PIN-koodi"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Salasanan täytyy olla vähintään %d merkkiä"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koodin täytyy olla vähintään %d merkin pituinen"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Kun olet valmis, valitse Jatka."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Salasanan on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> merkkiä."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-koodin on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> numeroa."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ei muutettu)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Valitse"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Useita varmenteita lisätty)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Käytä järjestelmän varmenteita"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Älä anna"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Älä vahvista"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ei määritettyä varmennetta. Yhteytesi ei ole yksityinen."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Määritä verkkotunnus."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Anna verkkosalasana"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ambient-näyttö"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Aktivoi näyttö, kun laite otetaan käteen tai ilmoituksia saapuu"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Suurenna tai pienennä tekstiä."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ota SIM-kortin lukitus käyttöön"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortin lukitus"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Esteettömyys"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Esteettömyysasetukset"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Näköasetukset"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Voit muokata laitteen ominaisuuksia tarpeidesi mukaan. Käytettävyysvalintoja voi muuttaa myöhemmin asetuksissa."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Palvelut"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Näytönlukuohjelma ensisijaisesti näkövammaisille ja heikkonäköisille"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Järjestelmä"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Näyttö"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Tekstitykset"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Suurennusele"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Lähennä napauttamalla kolme kertaa."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Lähennä ja loitonna napauttamalla näyttöä kolme kertaa yhdellä sormella.\n\nLähennetyssä tilassa voit tehdä seuraavaa:\n"<ul>\n<li>"Vieritä vetämällä vähintään kahta sormea näytön poikki."</li>\n<li>"Säädä lähennystä nipistämällä vähintään kaksi sormea yhteen tai levittämällä ne erilleen."</li></ul>\n\n"Lähennä väliaikaisesti kolmoisnapauttamalla ja pitämällä. Voit liikkua näytöllä vetämällä sormella eri suuntiin ja loitontaa nostamalla sormesi.\n\nHuom. Suurennusele toimii kaikkialla paitsi näppäimistössä ja siirtymispalkissa."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Esteettömyystilan pikakuvake"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Käytössä"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Pois käytöstä"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Varmuuskopioi laitteen tiedot (kuten Wi-Fi-salasanat ja soittohistoria) sekä sovellusten tiedot (kuten asetukset ja sovellusten tallentamat tiedostot) automaattisesti etäyhteyden kautta.\n\nKun otat automaattisen varmuuskopioinnin käyttöön, laitteen ja sovellusten tiedot varmuuskopioidaan säännöllisesti etäyhteyden kautta. Sovellusten tietoihin voi sisältyä mitä tahansa tietoja, joita sovellukset ovat tallentaneet (kehittäjien asetuksien perusteella). Ne saattavat sisältää myös arkaluontoisia tietoja, kuten yhteystietoja, viestejä ja valokuvia."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Laitteen järjestelmänvalvoja-asetukset"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Laitteen järjestelmänvalvoja"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Poista käytöstä"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Poista asennus"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Poista laitteen järjestelmänvalvojan aktivointi"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Poista sovellus"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Poista aktivointi ja asennus"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Laitteen järjestelmänvalvojat"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Laitteen järjestelmänvalvojia ei saatavilla"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Henkilökohtainen"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Työ"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Ei luotettavia tahoja"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Otetaanko laitteen järjestelmänvalvoja käyttöön?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Ota käyttöön"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktivoi laitteen järjestelmänvalvoja"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Laitteen järjestelmänvalvoja"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Jos tämä järjestelmänvalvoja otetaan käyttöön, sovellus <xliff:g id="APP_NAME">%1$s</xliff:g> voi suorittaa seuraavat toiminnot:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Tämä järjestelmänvalvoja on aktiivinen. <xliff:g id="APP_NAME">%1$s</xliff:g> saa:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Otetaanko puhelut ja tekstiviestit käyttöön?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Soitto- ja tekstiviestihistoria jaetaan tämän käyttäjän kanssa."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Hätätilannetiedot"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Käytettävissä hätäpuhelunäytöllä lukitusnäytön kautta"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Kuka tahansa voi käyttää tietoja hätäpuhelunäytön kautta ilman puhelimen lukituksen avaamista."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Sovellusten ja sisällön salliminen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Rajoitetut sovellukset"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Laajenna sovelluksen asetuksia"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ota vain herätykset käyttöön kello <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> asti."</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Salli keskeytykset aina."</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Estä, kun näyttö on päällä."</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia kurkistamasta tai näkymästä näytöllä."</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Estä, kun näyttö on pois päältä."</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia käynnistämästä näyttöä tai vilkuttamasta ilmoitusvaloa."</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Pois käytöstä"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Kun näyttö on päällä"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kun näyttö on pois päältä"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kun näyttö on päällä tai pois päältä"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Anna järjestelmänvalvojan PIN-koodi"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Avaa kamerasovellus kääntämällä rannettasi kahdesti"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera: paina virtapainiketta kahdesti"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Avaa kamera nopeasti avaamatta näytön lukitusta"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Näyttökoko"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Suurenna tai pienennä kohteita näytöllä."</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"näytön tiheys, näytön zoomaus, skaala, skaalaus"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Suurenna tai pienennä kohteita näytöllä. Jotkin sovellukset voivat siirtyä näytöllä."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Esikatselu"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Pienennä"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Suurenna"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index d833b3b..3f77a2d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Désinstaller la carte SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Effacer la mémoire de stockage USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Effacer la carte SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Agrandissez ou réduisez le texte affiché."</string>
     <string name="small_font" msgid="2295331917424072635">"Petit"</string>
     <string name="medium_font" msgid="2068475425515133701">"Moyen"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications.\n\nToutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Remarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un motif ou un NIP fiables."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"En savoir plus"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Remarque : Vos empreintes digitales peuvent être moins sécuritaires qu\'un schéma ou un NIP fiable. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cette tablette si celle-ci est perdue ou volée, ou si son contenu est effacé."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cet appareil si celui-ci est perdu ou volé, ou si son contenu est effacé."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser ce téléphone si celui-ci est perdu ou volé, ou si son contenu est effacé."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cette tablette si celle-ci est perdue ou volée."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cet appareil si celui-ci est perdu ou volé."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser ce téléphone si celui-ci est perdu ou volé."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorer qandd même"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Retour"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Trouvez le capteur"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le capteur d\'empreintes digitales sur le dos de votre téléphone."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration présentant l\'appareil et la position du capteur d\'empreinte digitale"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Supprimer toutes les empreintes digitales?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Vous ne pourrez pas utiliser vos empreintes digitales pour déverrouiller votre téléphone, autoriser vos achats ni vous connecter à des applications."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Oui, supprimer"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utilisez votre empreinte digitale pour continuer."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement (ou cryptage)"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protégez votre appareil"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Déverrouiller avec votre empreinte digitale"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Sélectionner le verrouillage de l\'écran"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protégez votre téléphone"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Vos empreintes digitales peuvent être moins sécuritaires qu\'un schéma ou un NIP fiable. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez votre méthode secondaire de verrouillage d\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Modifier écran verr."</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Pas maintenant"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Verrouillage actuel de l\'écran"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Empreinte digitale + motif"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Empreinte digitale + NIP"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Le mot de passe doit comporter au moins %d caractères."</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Le NIP doit comporter au moins %d chiffres."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Touchez « Continuer » une fois l\'opération terminée"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Le mot de passe doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> caractères."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Le NIP doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> chiffres."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Veuillez choisir"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Certificats multiples ajoutés)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Utiliser les certificats système"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne pas valider"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Vous devez spécifier un domaine."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Entrez votre mot de passe réseau"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Activer l\'écran lorsque vous prenez l\'appareil ou recevez des notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de police"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandissez ou réduisez le texte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage de la carte SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurer le blocage de la carte SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Verrouillage de la carte SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilité"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Paramètres de vision"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Vous pouvez personnaliser cet appareil en fonction de vos besoins. Il est possible de modifier ces fonctionnalités d\'accessibilité plus tard dans les paramètres."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Le lecteur d\'écran est destiné principalement aux personnes atteintes de cécité et de troubles de la vue"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Système"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Affichage"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Sous-titres"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Geste de zoom"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Touchez trois fois pour zoomer vers l\'avant"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Pour effectuer un zoom avant ou arrière, touchez trois fois l\'écran avec un seul doigt.\n\nLorsque vous avez fait un zoom avant, vous pouvez réaliser les opérations ci-dessous :\n"<ul>\n<li>"Faire défiler l\'écran : faites glisser deux doigts ou plus sur l\'écran."</li>\n<li>"Régler le niveau de zoom : pincez deux doigts ou plus, ou écartez-les."</li></ul>\n\n"Pour effectuer un zoom temporaire, touchez trois fois l\'écran et maintenez le doigt sur l’écran. Tout en maintenant le doigt sur l’écran, faites-le glisser pour vous déplacer. Relevez le doigt pour effectuer un zoom arrière.\n\nRemarque : Le geste d\'agrandissement fonctionne partout, sauf sur le clavier et la barre de navigation."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activé"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Désactivé"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Sauvegardez automatiquement les données de l\'appareil (comme les mots de passe Wi-Fi et l\'historique des appels) et celles des applications (telles que les paramètres et les fichiers enregistrés par ces applications) à distance.\n\nLorsque vous activez la sauvegarde automatique, les données de l\'appareil et des applications sont enregistrées régulièrement à distance. Les données d\'applications correspondent à toutes les données enregistrées par une application (en fonction des paramètres que le développeur définit), y compris les données potentiellement confidentielles comme les contacts, les messages et les photos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres d\'administration du périphérique"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrateur du périphérique"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Désactiver"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Désinstaller"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Désactiver cet administrateur de l\'appareil"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Désinstaller l\'application"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Désactiver et désinstaller"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrateurs de l\'appareil"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Aucun administrateur de périphérique disponible"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personnel"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Travail"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Aucun agent de confiance disponible"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activer l\'administrateur du périphérique?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activer"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activer cet administrateur de l\'appareil"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrateur du périphérique"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"L\'activation de cet administrateur permettra à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Cet administrateur est activé et permet à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les textos?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des textos sera partagé avec cet utilisateur."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Coordonnées d\'urgence"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accessible à l\'écran de verrouillage dans le composeur de numéro d\'urgence"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accessible par tous à l\'aide du clavier d\'urgence sans devoir déverrouiller votre téléphone"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Activer le mode Toujours interrompre"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquer lorsque l\'écran est allumé"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Empêcher les notifications désactivées par le mode Ne pas déranger de s\'afficher à l\'écran"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquer lorsque l\'écran est éteint"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Empêcher les notifications désactivées par le mode Ne pas déranger d\'activer l\'écran ou de faire clignoter le voyant de notification"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Désactivé"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Lorsque l\'écran est allumé"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Lorsque l\'écran est éteint"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quand l\'écran est allumé ou éteint"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Entrez le NIP d\'administrateur"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application de l\'appareil photo en pivotant votre poignet deux fois"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"App. 2x sur interr. pr activ. app. photo"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Lancez rapidement l\'appareil photo sans déverrouiller l\'écran"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Dimensions de l\'écran"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Rendez les objets à l\'écran plus grands ou plus petits"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densité d\'affichage, zoom de l\'écran, échelle, mise à l\'échelle"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Agrandissez ou réduisez les éléments affichés. Si vous modifiez ce paramètre, certaines applications risquent de changer de position à l\'écran."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Aperçu"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Rapetisser"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Agrandir"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cd3ebb6..378de4a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Il vous suffit d\'appuyer sur le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. \n\n Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Remarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code d\'accès fiables."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"En savoir plus"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Remarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code d\'accès fiables. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte ou de vol, ou si les données en sont effacées."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte ou de vol, ou si les données en sont effacées."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte ou de vol, ou si les données en sont effacées."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte ou de vol."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte ou de vol."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte ou de vol."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorer quand même"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Retour"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiser le capteur"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le lecteur d\'empreinte à l\'arrière du téléphone."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration présentant l\'appareil et la position du lecteur d\'empreintes digitales"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Supprimer les empreintes digitales ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Vous ne pourrez pas utiliser vos empreintes digitales pour déverrouiller votre téléphone, autoriser vos achats ni vous connecter à des applications."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Oui, supprimer"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utilisez votre empreinte digitale pour continuer."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protégez votre appareil"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Déverrouiller un appareil avec votre empreinte digitale"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Verrouillage de l\'écran"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Sélectionner le verrouillage de l\'écran"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protégez votre téléphone"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma, un code d\'accès ou un mot de passe fiables. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez une méthode alternative pour verrouiller l\'écran."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Modifier écran verr."</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Sécurité moyenne à élevée"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Sécurité élevée"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Pas maintenant"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Verrouillage de l\'écran actuel"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Empreinte digitale + schéma"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Empreinte digitale + code"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Le mot de passe doit comporter au moins %d caractères."</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Le code PIN doit comporter au moins %d chiffres."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Appuyer sur \"Continuer\" une fois l\'opération terminée"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Le mot de passe doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> caractères."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Le code PIN doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> chiffres."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Veuillez sélectionner un élément."</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Plusieurs certificats ajoutés)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Utiliser les certificats du système"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne pas valider"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Vous devez spécifier un domaine."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Saisissez votre mot de passe réseau."</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Sauvegardez automatiquement les données de l\'appareil (telles que les mots de passe Wi-Fi et l\'historique des appels) et celles des applications (telles que les paramètres et les fichiers enregistrés par ces applications) à distance.\n\nLorsque vous activez la sauvegarde automatique, les données de l\'appareil et des applications sont enregistrées régulièrement à distance. Les données d\'applications correspondent à toutes les données enregistrées par une application (en fonction des paramètres que le développeur définit), y compris les données potentiellement confidentielles comme les contacts, les messages et les photos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres de gestion de l\'appareil"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrateur de l\'appareil"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Désactiver"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Désinstaller"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Désactiver cet administrateur de l\'appareil"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Désinstaller l\'application"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Désactiver et désinstaller"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrateurs de l\'appareil"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Aucun administrateur disponible."</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personnel"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Professionnel"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Aucun agent de confiance disponible"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activer l\'administrateur de l\'appareil ?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activer"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activer cet administrateur de l\'appareil"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrateur de l\'appareil"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"L\'activation de cet administrateur permettra à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Cet administrateur est activé et permet à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activer les appels téléphoniques et les SMS ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historique des appels et des SMS sera partagé avec cet utilisateur."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informations d\'urgence"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accessibles via le clavier d\'urgence sur l\'écran de verrouillage"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accessible par tous depuis le clavier d\'urgence sans déverrouiller votre téléphone"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 21b8c58..f7a4af4 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desactivar a tarxeta SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Borrar almacenamento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Borrar tarxeta SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Reduce ou amplía o texto da pantalla."</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeno"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medio"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear coa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Simplemente toca o sensor de impresión dixital para desbloquear o teléfono, autorizar compras ou iniciar sesión nas aplicacións. \n\n Ten coidado coas impresións dixitais que engades, xa que con elas poderanse realizar estas accións."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota: É posible que a túa impresión dixital sexa menos segura que un padrón ou PIN fiables."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Máis información"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Nota: É posible que a túa impresión dixital sexa menos segura que un padrón ou PIN fiables. "<annotation id="url">"Máis información"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este tablet en caso de perda, roubo ou borrado dos datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este dispositivo en caso de perda, roubo ou borrado dos datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este teléfono en caso de perda, roubo ou borrado dos datos."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este tablet en caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este dispositivo en caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este teléfono en caso de perda ou roubo."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omitir igualmente"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Volver"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Buscar o sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza o sensor de impresións dixitais na parte posterior do teléfono."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustración coa localización do sensor de impresión dixital e do dispositivo"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Podes engadir ata <xliff:g id="COUNT">%d</xliff:g> impresións dixitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Eliminar as impresións dixitais?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Non poderás utilizar as túas impresións dixitais para desbloquear o teléfono, autorizar compras ou iniciar sesión en aplicacións con elas."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Si, eliminar"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utiliza a túa impresión dixital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protexe o teu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloqueo coa túa impresión dixital"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Bloqueo pantalla"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Seleccionar bloqueo da pantalla"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protexe o teu teléfono"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"É posible que a túa impresión dixital sexa menos segura que un padrón ou PIN fiables. Configura unha pantalla de bloqueo en segundo plano para que sexa segura."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa as funcións de protección do tablet para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolle o método de bloqueo da pantalla alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo da pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. bloqueo"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridade de media a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasinal"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta seguridade"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Agora non"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueo de pantalla actual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Impresión dixital + padrón"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Impresión dixital + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar contrasinal desbloq."</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"O contrasinal debe conter polo menos %d caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN debe conter polo menos %d díxitos"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Toca Continuar cando remates"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"O contrasinal debe conter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"O PIN debe conter menos de <xliff:g id="NUMBER">%d</xliff:g> díxitos."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(non cambiado)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Engadíronse varios certificados)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Utilizar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Non fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Non validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Non se especificou ningún certificado. A túa conexión non será privada."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Debe especificarse un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dispoñible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Activar pantalla ao coller o dispositivo ou recibir notificacións"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño do tipo de letra"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Reduce ou amplía o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da tarxeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueo da tarxeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo da tarxeta SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidade"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidade"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visualización"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servizos"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"O lector de pantalla está destinado principalmente a persoas cegas e con pouca visión"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Pantalla"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítulos"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Xestos de ampliación"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca 3 veces para achegar o zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Toca a pantalla 3 veces cun dedo para achegar ou afastar o zoom.\n\nCo zoom achegado, podes:\n"<ul>\n<li>"Desprazarte: arrastra 2 ou máis dedos pola pantalla."</li>\n<li>"Axustar o nivel do zoom: belisca con 2 ou máis dedos ou afástaos entre si."</li></ul>\n\n"Para achegar o zoom de forma temporal, toca 3 veces e mantén premido no último toque; así poderás arrastrar o dedo para moverte pola pantalla. Levanta o dedo para volver afastar o zoom.\n\nNota: O xesto de ampliación funciona en calquera parte excepto no teclado e na barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atallo de accesibilidade"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activado"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivado"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Crea automaticamente copias de seguranza dos datos do dispositivo de forma remota, como os contrasinais wifi e o historial de chamadas, e dos datos das aplicacións, como a configuración e os ficheiros almacenados polas aplicacións.\n\nAo activar a copia de seguranza automática, os datos do dispositivo e das aplicacións gárdanse periodicamente de forma remota. Os datos das aplicacións poden ser os datos que gardou unha aplicación segundo a configuración do programador, incluídos os datos potencialmente sensibles, como os contactos, as mensaxes e as fotos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuración da administración de dispositivos"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador de dispositivos"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalar"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desactivar administrador deste dispositivo"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar aplicación"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desactivar e desinstalar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores de dispositivos"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Non hai administradores de dispositivos dispoñibles"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Persoal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Traballo"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Non hai ningún axente de confianza dispoñible"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Queres activar o administrador de dispositivos?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activar"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activar administrador deste dispositivo"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador de dispositivos"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"A activación deste administrador permitirá á aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> levar a cabo as seguintes operacións:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"O administrador está activo e permite á aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> levar a cabo as seguintes operacións:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O historial de chamadas e SMS compartirase con este usuario."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Información de emerxencia"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accesible a través da pantalla de bloqueo no marcador de emerxencia"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accesible para calquera persoa desde o marcador de emerxencia sen desbloquear o teu teléfono"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicacións e contido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacións con restricións"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ampliar axustes aplicación"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar ao modo Só alarmas ata as <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia a interromper sempre"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear coa pantalla activada"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Evita que as notificacións silenciadas pola función Non molestar se mostren ou aparezan na pantalla"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear coa pantalla desactivada"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Evita que as notificacións silenciadas pola función Non molestar activen ou fagan que se acenda a luz de notificación"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desactivado"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Coa pantalla activada"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Coa pantalla desactivada"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Coa pantalla activada ou desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduce o PIN de administrador"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Xira o pulso dúas veces para abrir a aplicación da cámara"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Premer botón de acendido dúas veces para abrir a cámara"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abre a cámara rapidamente sen desbloquear a pantalla"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Tamaño de visualización"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Reduce ou amplía os elementos da pantalla"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densidade de visualización, zoom da pantalla, escala, escalado"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Reduce ou amplía os elementos da pantalla. É posible que algunhas aplicacións da pantalla cambien de posición."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Vista previa"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Facer máis pequeno"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Facer máis grande"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 9be1d6f..ae33227 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD કાર્ડને અનમાઉન્ટ કરો"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB સંગ્રહ કાઢી નાંખો"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD કાર્ડ કાઢી નાંખો"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"સ્ક્રીન પરની ટેક્સ્ટને નાની અથવા મોટી કરો."</string>
     <string name="small_font" msgid="2295331917424072635">"નાનું"</string>
     <string name="medium_font" msgid="2068475425515133701">"મધ્યમ"</string>
     <string name="large_font" msgid="599055175160971446">"મોટું"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપ્લિકેશનોમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. \n\n તમે કોની ફિંગરપ્રિન્ટ્સ ઉમેરી છે તે બાબતે સાવચેત રહો - ઉમેરવામાં આવેલ કોઈપણ ફિંગરપ્રિન્ટ્સ આ વસ્તુઓ કરવામાં સમર્થ હશે."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"નોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN થી ઓછી સુરક્ષિત હોઇ શકે છે."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"વધુ જાણો"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"નોંધ: તમારી ફિંગરપ્રિંટ એક સશક્ત પાસવર્ડ અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે. "<annotation id="url">"વધુ જાણો"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"રદ કરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ચાલુ રાખો"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય, ચોરાઈ ગયું હોય અથવા વાઇપ થઈ ગયું હોય."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય, ચોરાઈ ગયું હોય અથવા વાઇપ થઈ ગયું હોય."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયો હોય, ચોરાઈ ગયો હોય અથવા વાઇપ થઈ ગયો હોય."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય અથવા ચોરાઈ ગયું હોય."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય અથવા ચોરાઈ ગયું હોય."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયો હોય અથવા ચોરાઈ ગયો હોય."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"કોઈપણ રીતે છોડો"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"પાછા જાઓ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"સેન્સર શોધો"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર સ્થિત કરો."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ઉપકરણ અને ફિંગરપ્રિન્ટ સેન્સર સ્થાન સાથેનું ચિત્ર"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"તમે <xliff:g id="COUNT">%d</xliff:g> જેટલી ફિંગરપ્રિન્ટ્સ ઉમેરી શકો છો"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"તમામ ફિંગરપ્રિન્ટ્સ દૂર કરીએ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"તમારી ફિંગરપ્રિન્ટ્સનો ઉપયોગ કરીને તમે તમારો ફોન અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમના વડે એપ્લિકેશન્સ પર સાઇન ઇન કરવામાં સમર્થ હશો નહીં."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"તમારા ઉપકરણને સુરક્ષિત કરો"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"તમારી ફિંગરપ્રિંટ વડે અનલૉક કરો"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"સ્ક્રીન લૉક પસંદ કરો"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"સ્ક્રીન લૉક પસંદ કરો"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ફોનની સુરક્ષા કરો"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે. સુરક્ષિત થવા માટે એક બેકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"તમારી બેકઅપ સ્ક્રીન લૉક પદ્ધતિ પસંદ કરો"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"સ્ક્રીન લૉક કરો"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"લૉક સ્ક્રીન બદલો"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"મધ્યમથી ઉચ્ચ સુરક્ષા"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"પાસવર્ડ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ઉચ્ચ સુરક્ષા"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"હમણાં નહીં"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"વર્તમાન સ્ક્રીન લૉક"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ફિંગરપ્રિન્ટ + પેટર્ન"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ફિંગરપ્રિન્ટ + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"અનલૉક પાસવર્ડ બદલો"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"પાસવર્ડ ઓછામાં ઓછો %d અક્ષરનો હોવો આવશ્યક છે"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN ઓછામાં ઓછો %d અંકનો હોવો આવશ્યક છે"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"પૂર્ણ થાય ત્યારે ચાલુ રાખો ટૅપ કરો"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ચાલુ રાખો"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"પાસવર્ડ <xliff:g id="NUMBER">%d</xliff:g> કરતાં ઓછા વર્ણોનો હોવો આવશ્યક છે."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN, <xliff:g id="NUMBER">%d</xliff:g> કરતાં ઓછા અંકનો હોવો આવશ્યક છે."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(અપરિવર્તિત)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"કૃપા કરીને પસંદ કરો"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(બહુવિધ પ્રમાણપત્રો ઉમેર્યા)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"સિસ્ટમ પ્રમાણપત્રોનો ઉપયોગ કરો"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"પ્રદાન કરશો નહીં"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"માન્ય કરશો નહીં"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"કોઇ પ્રમાણપત્ર સ્પષ્ટ કરેલ નથી. તમારું કનેક્શન ખાનગી રહેશે નહીં."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ડોમેનનો ઉલ્લેખ કરવો આવશ્યક છે."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ઉપલબ્ધ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ઉપલબ્ધ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"તમારો નેટવર્ક પાસવર્ડ દાખલ કરો"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"વ્યાપક ડિસ્પ્લે"</string>
     <string name="doze_summary" msgid="7128970177894383698">"તમે ઉપકરણને ઉઠાવો અથવા સૂચનાઓ પ્રાપ્ત કરો ત્યારે સ્ક્રીન જાગૃત કરો"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ફોન્ટનું કદ"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"ટેક્સ્ટને નાની અથવા મોટી કરો"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM કાર્ડ લૉક સેટિંગ્સ"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM કાર્ડ લૉક સેટ કરો"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM કાર્ડ લૉક"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"ઍક્સેસિબિલિટી"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ઍક્સેસિબિલિટી સેટિંગ્સ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"વિઝન સેટિંગ્સ"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"તમે તમારી જરૂરિયાતો મુજબ આ ઉપકરણને કસ્ટમાઇઝ કરી શકો છો. સેટિંગ્સમાં આ ઍક્સેસિબિલિટી સુવિધાઓ પછીથી બદલી શકાય છે."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"સેવાઓ"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"સ્ક્રીન રીડર મુખ્યત્વે અંધત્વ અને ઓછી દૃષ્ટિવાળા લોકો માટે છે"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"સિસ્ટમ"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"ડિસ્પ્લે"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"કૅપ્શન્સ"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"વિસ્તૃતીકરણ હાવભાવ"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ઝૂમ કરવા માટે 3 વખત ટૅપ કરો"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"ઝૂમ વધારવા અને ઘટાડવા માટે એક આંગળી વડે સ્ક્રીનને 3 વાર ટૅપ કરો.\n\nઝૂમ વધારેલ હોય ત્યારે તમે આ કરી શકો છો:\n"<ul>\n<li>"સ્ક્રોલ: 2 કે વધુ આંગળીઓને સમગ્ર સ્ક્રીન પર ખસેડવી"</li>\n<li>"ઝૂમ સ્તર સમાયોજન: 2 કે વધુ આંગળીઓને એકસાથે પિંચ કરવી અથવા તેમને એકબીજાથી દૂર ફેલાવવી"</li></ul>\n\n"અસ્થાયીરૂપે ઝૂમ માટે: 3 વાર ટૅપ કરી અને છેલ્લા ટૅપ કરીને રાખો. તમારી આંગળીને પકડી રાખતી વખતે, સમગ્ર સ્ક્રીન પર આવવા-જવા માટે ખેંચો. ઝૂમને પાછું ઘટાડવા માટે તમારી આંગળીને ઉઠાવી લો.\n\nનોધ: વિસ્તૃતીકરણ હાવભાવ કીબોર્ડ અને નેવિગેશન બાર સિવાય સર્વત્ર કાર્ય કરે છે."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ઍક્સેસિબિલિટી શોર્ટકટ"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"ચાલુ"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"બંધ"</string>
@@ -1940,15 +1944,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"ઉપકરણ ડેટા (જેમ કે Wi-Fi પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને એપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને એપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને એપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. એપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ એપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટા જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"ઉપકરણ વ્યવસ્થાપન સેટિંગ્સ"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"ઉપકરણ વ્યવસ્થાપક"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"નિષ્ક્રિય કરો"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"અનઇન્સ્ટોલ કરો"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"આ ઉપકરણ વ્યવસ્થાપકને નિષ્ક્રિય કરો"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ઍપ્લિકેશન અનઇન્સ્ટૉલ કરો"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"નિષ્ક્રિય કરો અને અનઇન્સ્ટૉલ કરો"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"ઉપકરણ વ્યવસ્થાપકો"</string>
     <string name="no_device_admins" msgid="702695100241728775">"કોઈ ઉપલબ્ધ ઉપકરણ વ્યવસ્થાપકો નથી"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"વ્યક્તિગત"</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="6246742476064507965">"ઉપકરણ વ્યવસ્થાપકને સક્રિય કરીએ?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"સક્રિય કરો"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"આ ઉપકરણ વ્યવસ્થાપકને સક્રિય કરો"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"ઉપકરણ વ્યવસ્થાપક"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"આ વ્યવસ્થાપકને સક્રિય કરવું એપ્લિકેશન <xliff:g id="APP_NAME">%1$s</xliff:g> ને નીચેની કામગીરીઓ કરવાની મંજૂરી આપશે:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"આ વ્યવસ્થાપક સક્રિય છે અને એપ્લિકેશન <xliff:g id="APP_NAME">%1$s</xliff:g> ને નીચેના કાર્યો કરવાની મંજૂરી આપે છે:"</string>
@@ -2269,7 +2274,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ફોન કૉલ્સ અને SMS ચાલુ કરીએ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"કૉલ અને SMS ઇતિહાસ આ વપરાશકર્તા સાથે શેર કરવામાં આવશે."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"કટોકટી માહિતી"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"કટોકટી ડાયલરમાં લૉક સ્ક્રીન મારફતે ઍક્સેસિબલ"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"તમારા ફોનને અનલૉક કર્યા વિના કટોકટીના ડાયલરથી કોઈના પણ દ્વારા ઍક્સેસિબલ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"એપ્લિકેશનો અને સામગ્રીને મંજૂરી આપો"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"પ્રતિબંધો ધરાવતી એપ્લિકેશનો"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"એપ્લિકેશન માટે સેટિંગ્સ વિસ્તૃત કરો"</string>
@@ -2585,22 +2590,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"એલાર્મ્સ પર ફક્ત <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> સુધી બદલો"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"હંમેશાં ખલેલ પાડો પર બદલો"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"જ્યારે સ્ક્રીન ચાલુ હોય ત્યારે અવરોધિત કરો"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"ખલેલ પાડશો નહીં દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને સ્ક્રીન પર ઝબકતી અથવા દેખાતી અટકાવો"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"જ્યારે સ્ક્રીન બંધ હોય ત્યારે અવરોધિત કરો"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"ખલેલ પાડશો નહીં દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને સ્ક્રીનને ચાલુ કરવા અથવા સૂચના લાઇટને ધબકતી અટકાવો"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"બંધ"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"જ્યારે સ્ક્રીન ચાલુ હોય"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"જ્યારે સ્ક્રીન બંધ હોય"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"જ્યારે સ્ક્રીન ચાલુ કે બંધ હોય"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"સૂચનાઓની સેટિંગ્સ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"આ ઉપકરણ વિશે પ્રતિસાદ મોકલો"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"વ્યવસ્થાપક PIN દાખલ કરો"</string>
@@ -2835,13 +2832,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"તમારા કાંડાને બે વાર મરડીને કૅમેરા એપ્લિકેશન ખોલો"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"કૅમેરા માટે બે વખત પાવર બટન દબાવો"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"તમારી સ્ક્રીન અનલૉક કર્યાં વગર ઝડપથી કૅમેરો ખોલો"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"પ્રદર્શન કદ"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"સ્ક્રીન પરની આઇટમ્સને મોટી અથવા નાની કરો"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"પ્રદર્શન ઘનતા, સ્ક્રીન ઝૂમ, સ્કેલ, સ્કેલિંગ"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"તમારી સ્ક્રીન પરની આઇટમ્સને નાની અથવા મોટી કરો. તમારી સ્ક્રીન પરની કેટલીક ઍપ્લિકેશનો સ્થિતિ બદલી શકે છે."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"પૂર્વાવલોકન કરો"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"વધુ નાનું બનાવો"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"વધુ મોટું બનાવો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 19bdf00..d021511 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"अपना फ़ोन अनलॉक करने, खरीदारी अधिकृत करने या ऐप्स में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें. \n\n सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड़ रहे हैं - और जोड़ा गया कोई भी फ़िंगरप्रिंट ये कार्य कर सकता है."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ध्यान दें: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन की तुलना में कम सुरक्षित हो सकता है."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"और जानें"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ध्यान दें: आपका फ़िंगरप्रिंट, किसी सशक्त पैटर्न या पिन की तुलना में कम सुरक्षित हो सकता है. "<annotation id="url">"अधिक जानें"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी रखें"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह टैबलेट खो जाता है, चोरी चला जाता है या मिटा दिया जाता है तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह डिवाइस खो जाता है, चोरी चला जाता है या मिटा दिया जाता है तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह फ़ोन खो जाता है, चोरी चला जाता है या मिटा दिया जाता है तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह टैबलेट खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह डिवाइस खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह फ़ोन खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"फिर भी अभी नहीं"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"वापस जाएं"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"संवेदक ढूंढें"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"अपने फ़ोन के पीछे फ़िंगरप्रिंट संवेदक का पता लगाएं."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और फ़िंगरप्रिंट संवेदक स्‍थान वाला चित्रण"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"आप <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट तक जोड़ सकते हैं"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सभी फ़िंगरप्रिंट निकालें?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"आप अपने फ़ोन को अनलॉक करने, खरीदी को अधिकृत करने या ऐप्स में प्रवेश करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकेंगे."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"अपने डिवाइस की सुरक्षा करें"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"अपने फ़िंगरप्रिंट से अनलॉक करें"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्‍क्रीन लॉक चुनें"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"स्‍क्रीन लॉक चुनें"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"फ़ोन को सुरक्षित रखें"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"फ़िंगरप्रिंट किसी सशक्त पैटर्न, पिन या पासवर्ड की तुलना में कम सुरक्षित हो सकता है. सुरक्षित रहने के लिए बैकअप लॉक स्क्रीन सेट करें."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस टैबलेट का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस डिवाइस का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस फ़ोन का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"अपनी बैकअप स्‍क्रीन लॉक विधि चुनें"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लॉक स्‍क्रीन बदलें"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्‍यम से उच्‍च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"अभी नहीं"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रीन लॉक"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"फ़िंगरप्रिंट + पैटर्न"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"फ़िंगरप्रिंट + पिन"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"पासवर्ड में कम से कम %d वर्ण होने चाहिए"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN में कम से कम %d वर्ण होने चाहिए"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"पूर्ण हो जाने पर जारी रखें टैप करें"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी रखें"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"पासवर्ड <xliff:g id="NUMBER">%d</xliff:g> से कम वर्णों का होना चाहिए."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"पिन <xliff:g id="NUMBER">%d</xliff:g> से कम अंकों का होना चाहिए."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"कृपया चुनें"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(एकाधिक प्रमाणपत्र जोड़े गए)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टम प्रमाणपत्रों का उपयोग करें"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान न करें"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"मान्‍य न करें"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोई प्रमाणपत्र निर्दिष्‍ट नहीं है. आपका कनेक्‍शन निजी नहीं होगा."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"डोमेन निर्दिष्ट करना आवश्यक है."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्‍ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"दूरस्थ रूप से अपने आप डिवाइस डेटा (जैसे वाई-फ़ाई पासवर्ड और कॉल इतिहास) और ऐप डेटा (जैसे ऐप्स द्वारा संग्रहीत सेटिंग और फ़ाइलों) का बैक अप लें.\n\nजब आप स्वचालित बैकअप चालू करते हैं, तो डिवाइस और ऐप डेटा को दूरस्थ रूप से समय-समय पर सहेजा जाता है. ऐप डेटा कोई भी ऐसा डेटा हो सकता है जिसे किसी ऐप द्वारा सहेजा गया है (डेवलपर सेटिंग के आधार पर), जिसमें संभावित रूप से संवेदनशील डेटा जैसे संपर्क, संदेश और फ़ोटो शामिल हैं."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"डिवाइस की व्‍यवस्‍थापन सेटिंग"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"डिवाइस नियंत्रक"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"निष्‍क्रिय करें"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"अनइंस्टॉल करें"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"इस डिवाइस व्यवस्थापक को निष्क्रिय करें"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ऐप अनइंस्टॉल करें"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"निष्क्रिय करें और अनइंस्टॉल करें"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"डिवाइस नियंत्रक"</string>
     <string name="no_device_admins" msgid="702695100241728775">"कोई भी उपलब्‍ध डिवाइस नियंत्रक नहीं है"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"व्यक्तिगत"</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="6246742476064507965">"डिवाइस नियंत्रक सक्रिय करें?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"सक्रिय करें"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"इस डिवाइस व्यवस्थापक को सक्रिय करें"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"डिवाइस नियंत्रक"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"इस व्‍यवस्‍थापक को सक्रिय करने से <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्स निम्न कार्य कर सकेगा:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"यह व्‍यवस्‍थापक सक्रिय है और ऐप्स <xliff:g id="APP_NAME">%1$s</xliff:g> को निम्‍न कार्य करने देता है:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फ़ोन कॉल और SMS चालू करें?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कॉल और SMS इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपातकालीन जानकारी"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"आपातकालीन डायलर में लॉक स्‍क्रीन के माध्‍यम से एक्‍सेस करने योग्‍य है"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"आपके फ़ोन को अनलॉक किए बिना आपातकालीन डायलर से किसी के भी द्वारा एक्सेस-योग्य है"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ऐप्स  और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले ऐप्स"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप्स  सेटिंग विस्तृत करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 4f08228..63c5a96 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -333,10 +333,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključavanje otiskom"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili na aplikacije. \n\n Pazite čije otiske dodajete jer će svi dodani otisci moći sve to raditi."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Napomena: otisak prsta može biti manje siguran od snažnog uzorka ili PIN-a."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Saznajte više"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Napomena: otisak prsta nije toliko siguran kao snažna zaporka ili PIN. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu tableta u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu uređaja u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu telefona u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu tableta u slučaju gubitka ili krađe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu uređaja u slučaju gubitka ili krađe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu telefona u slučaju gubitka ili krađe."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Svejedno preskoči"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Natrag"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Traženje senzora"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Pronađite senzor otiska prsta na stražnjoj strani telefona."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija uređaja i lokacije senzora otiska prsta"</string>
@@ -370,6 +377,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Maksimalni broj otisaka prstiju koji se može dodati iznosi <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Želite ukloniti sve otiske prstiju?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Nećete moći upotrebljavati otiske prstiju za otključavanje telefona, autorizaciju kupnji ili prijavljivanje na aplikacije."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Nastavite pomoću otiska prsta."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripcija"</string>
@@ -407,7 +416,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite svoj uređaj"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključavanje otiskom prsta"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje zaslona"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Odaberite zaključavanje zaslona"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaštitite telefon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Otisak prsta može biti manje siguran od snažnog uzorka, PIN-a ili zaporke. Postavite pričuvno zaključavanje zaslona za svaki slučaj."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj tablet bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj uređaj bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj telefon bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Odaberite pričuvni način zaključavanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promjena zaklj. zasl."</string>
@@ -423,6 +436,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka sigurnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Zaporka"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka sigurnost"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ne sada"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Trenutačno zaključavanje zaslona"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Otisak prsta i uzorak"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Otisak prsta i PIN"</string>
@@ -475,7 +489,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Zaporka mora imati najmanje ovoliko znakova: %d"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mora imati najmanje %d broja"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Kad završite, dodirnite Nastavi"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Zaporka mora imati manje od ovoliko znakova: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora imati manje od ovoliko znamenki: <xliff:g id="NUMBER">%d</xliff:g>"</string>
@@ -711,13 +724,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Odaberite"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(dodano je više certifikata)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Upotrijebi certifikate sustava"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nemoj pružiti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nemoj potvrditi"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden nijedan certifikat. Veza neće biti privatna."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Mora navoditi domenu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
@@ -1947,15 +1958,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Daljinski pokrenite automatsku izradu sigurnosne kopije podataka uređaja (kao što su zaporke Wi-Fi-ja i povijest poziva) i podataka aplikacija (kao što su postavke i datoteke koje aplikacije pohranjuju).\n\nKada uključite automatsku izradu sigurnosnih kopija, podaci uređaja i aplikacija periodično se daljinski spremaju. Podaci aplikacije mogu biti bilo koji podaci koje je aplikacija spremila (na temelju postavki razvojnog programera), uključujući potencijalno osjetljive podatke kao što su kontakti, poruke i fotografije."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Postavke administracije uređaja"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator uređaja"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiviraj"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Deinstaliraj"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiviraj administratora uređaja"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Deinstaliraj aplikaciju"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiviraj i deinstaliraj"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratori uređaja"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nema dostupnih administratora računa"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobno"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Posao"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Pouzdani predstavnici nisu dostupni"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivirati administratora uređaja?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiviraj"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktiviraj administratora uređaja"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator uređaja"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktiviranjem ovog administratora dopustit ćete aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> sljedeće:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Taj je administrator aktivan i aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> dopušta sljedeće:"</string>
@@ -2276,7 +2288,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Želite li uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Povijest poziva i SMS-ova dijelit će se s tim korisnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije u hitnom slučaju"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Dostupno putem zaključanog zaslona na brojčaniku za hitne pozive"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Dostupno svima s brojčanika za hitne pozive bez otključavanja telefona"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dopuštanje aplikacija i sadržaja"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije s ograničenjima"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Proširi postavke za aplikaciju"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1722644..4079787 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Feloldás: ujjlenyomat"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt a telefon zárolásának feloldásához, vásárlások jóváhagyásához, illetve alkalmazásokba történő bejelentkezéshez. \n\n A telefonhoz hozzáadott összes ujjlenyomat feljogosít ezekre, ezért fontolja meg, kinek az ujjlenyomatát adja hozzá."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Megjegyzés: Az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"További információ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Megjegyzés: Az ujjlenyomat kevésbé biztonságos lehet, mint egy jó minta vagy PIN-kód. "<annotation id="url">"További információ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Mégse"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tovább"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszíti, ellopják, illetve törlik."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszíti, ellopják, illetve törlik."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a telefont, ha elveszíti, ellopják, illetve törlik."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszíti, illetve ellopják."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszíti, illetve ellopják."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a telefont, ha elveszíti, illetve ellopják."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Kihagyás"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Vissza"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Keresse az érzékelőt"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefonja hátoldalán keresse meg az ujjlenyomat-érzékelőt."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Az eszközt és az ujjlenyomat-érzékelő helyét ábrázoló illusztráció"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Legfeljebb <xliff:g id="COUNT">%d</xliff:g> ujjlenyomatot adhat hozzá"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Eltávolítja az összes ujjlenyomatot?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Nem tudja majd ujjlenyomatával feloldani telefonját, engedélyezni a vásárlásokat, illetve az alkalmazásokba sem tud majd belépni."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Igen, eltávolítom"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"A folytatáshoz használja ujjlenyomatát."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Titkosítás"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Óvja meg eszközét"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Feloldás ujjlenyomattal"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Képernyőzár választása"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Képernyőzár választása"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Óvja meg telefonját"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Az ujjlenyomat kevésbé biztonságos lehet, mint egy jó minta, PIN-kód vagy jelszó. A biztonság kedvéért állítsa be a tartalék lezárási képernyőt."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a táblagépet. Válassza ki a használni kívánt képernyőlezárási módot."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják az eszközt. Válassza ki a használni kívánt képernyőlezárási módot."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a telefont. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Válassza ki a biztonsági képernyő-zárolási módszert"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Képernyőzár mód."</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Közepes/magas védelem"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Magas védelem"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Most nem"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Jelenlegi képernyőzár"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Ujjlenyomat + minta"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Ujjlenyomat + PIN-kód"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A jelszónak legalább %d karakter hosszúnak kell lennie"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"A PIN kódnak legalább %d számjegyűnek kell lennie."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Amikor végzett, koppintson a Folytatás lehetőségre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A jelszónak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> karakternél."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"A PIN kódnak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> számjegynél."</string>
@@ -1929,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Eszközadatok (például Wi-Fi-jelszavak és híváslista) és alkalmazásadatok (például az alkalmazások által tárolt beállítások és fájlok) automatikus biztonsági mentése távolról.\n\nHa bekapcsolja az automatikus biztonsági mentést, akkor a rendszer szabályos időközönként elvégzi eszköz- és alkalmazásadatainak távoli mentését. Alkalmazásadat bármilyen adat lehet, amelyet egy alkalmazás mentett (a fejlesztői beállításoktól függően), beleértve a potenciálisan bizalmas adatokat is (például névjegyek, üzenetek és fotók)."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Eszközkezelői beállítások"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Eszközkezelő"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Kikapcsolás"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Eltávolítás"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Eszközadminisztrátor deaktiválása"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Alkalmazás eltávolítása"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Kikapcsolás és eltávolítás"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Eszközkezelők"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nincs elérhető eszközkezelő"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Személyes"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Munkahely"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nincs elérhető trust agent komponens"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktiválja az eszközkezelőt?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiválás"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Eszközadminisztrátor aktiválása"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Eszközkezelő"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"A kezelő aktiválásával lehetővé teszi a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazásnak a következő műveletek végrehajtását:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Ez a kezelő aktív, és lehetővé teszi a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> számára a következő műveletek végrehajtását:"</string>
@@ -2258,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Engedélyezi a hívásokat és SMS-eket?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"A rendszer megosztja az SMS- és híváslistát ezzel a felhasználóval."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Segélyhívási információk"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Hozzáférhető a lezárási képernyőn, a segélyhívó tárcsázóján keresztül"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Bárki hozzáférhet a segélyhívó tárcsázóból a telefon lezárásának feloldása nélkül"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Alkalmazások és tartalmak engedélyezése"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Alkalmazások korlátozásokkal"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Alkalmazásbeállítás megnyitása"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 23c99c0..42526c7 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Անջատել SD քարտը"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ջնջել USB կրիչը"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Ջնջել SD քարտը"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Խոշորացնել կամ մանրացնել էկրանի տեքստը:"</string>
     <string name="small_font" msgid="2295331917424072635">"Փոքր"</string>
     <string name="medium_font" msgid="2068475425515133701">"Միջին"</string>
     <string name="large_font" msgid="599055175160971446">"Մեծ"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"Հեռախոսն ապակողպելու, գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես հպեք մատնահետքի սենսորին: \n\n Այդ գործողությունները հնարավոր է անել հեռախոսում ավելացված ցանկացած մատնահետքի միջոցով, այնպես որ մտածված ավելացրեք նոր մարդկանց մատնահետքերը:"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Նշում. Ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել:"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Իմանալ ավելին"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Նշում. Ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել: "<annotation id="url">"Իմանալ ավելին"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Չեղարկել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Շարունակել"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու, գողանալու կամ բոլոր տվյալները ջնջվելու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու, գողանալու կամ բոլոր տվյալները ջնջվելու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու, գողանալու կամ բոլոր տվյալները ջնջվելու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Բաց թողնել"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Վերադառնալ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Գտեք սենսորը"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Գտեք հեռախոսի հետևում գտնվող մատնահետքի սենսորը:"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Սարքի և մատնահետքի սենսորի տեղադրության պատկեր"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Կարող եք ավելացնել առավելագույնը <xliff:g id="COUNT">%d</xliff:g> մատնահետք"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Հեռացնե՞լ բոլոր մատնահետքերը:"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Դուք այլևս չեք կարողանա ապակողպել հեռախոսը, հաստատել գնումները կամ մուտք գործել հավելվածներ ձեր մատնահետքերի միջոցով:"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Պաշտպանեք ձեր սարքը"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Ապակողպել մատնահետքով"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ընտրել կողպէկրանը"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Ընտրեք էկրանի կողպման եղանակը"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Պաշտպանեք ձեր հեռախոսը"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Ապակողպման հուսալի նախշը, PIN կոդը կամ գաղտնաբառը կարող է մատնահետքից ավելի ապահով լինել: Անվտանգության համար սահմանեք էկրանի կողպման պահուստային եղանակ:"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Կանխեք այս պլանշետի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Կանխեք այս սարքի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Կանխեք այս հեռախոսի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Ընտրեք էկրանի կողպման պահուստային եղանակը"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Էկրանի կողպում"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Փոխել էկրանի կողպումը"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Միջինից մինչև բարձր անվտանգություն"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Գաղտնաբառ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Բարձր անվտանգություն"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ոչ հիմա"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Կողպման ընթացիկ եղանակը"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Մատնահետք + նախշ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Մատնահետք + PIN կոդ"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Փոխել ապակողպման գաղտնաբառը"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Գաղտնաբառը պետք է առնվազն %d նիշից բաղկացած լինի"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-ը պետք է լինի առնվազն %d թվանշան"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Ավարտելուց հետո հպեք Շարունակել"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Շարունակել"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Գաղտնաբառը պետք է լինի <xliff:g id="NUMBER">%d</xliff:g> գրանշանից քիչ:"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-ը պետք է լինի <xliff:g id="NUMBER">%d</xliff:g> թվանշանից քիչ:"</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(անփոփոխ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Ընտրեք"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Ավելացվել են մի քանի վկայագրեր)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Օգտագործել համակարգի վկայագրերը"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Չտրամադրել"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Չվավերացնել"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Վկայականը նշված չէ: Միացումը գաղտնի չի լինի:"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Անհրաժեշտ է նշել տիրույթը:"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS-ը հասանելի է"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Մուտքագրեք ձեր ցանցի գաղտնաբառը"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Քնելու ռեժիմի արգելք"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Ակտիվացնում է էկրանը, երբ վերցնում եք սարքը կամ ծանուցումներ ստանում"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Տառաչափ"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Խոշորացնել կամ մանրացնել տեքստը"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Կարգավորել SIM քարտի կողպումը"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM քարտի կողպում"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Մատչելիություն"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Մատչելիության կարգավորումներ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Տեսողության կարգավորումներ"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Կարող եք այս սարքը հարմարեցնել ձեր կարիքներին: Հասանելիության այս գործառույթները կարող եք հետագայում փոխել սարքի Կարգավորումներից:"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Ծառայություններ"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Էկրանի ընթերցիչը նախատեսված է առաջին հերթին կույր կամ վատ տեսողություն ունեցող մարդկանց համար"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Համակարգ"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Ցուցադրիչ"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Խորագրեր"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Խոշորացման ժեստ"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Հպեք 3 անգամ՝ մեծացնելու համար"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Փոխեք մասշտաբը՝ էկրանը մեկ մատով երեք անգամ հպելու միջոցով:\n\nՊատկերը մեծացնելուց հետո կարող եք՝\n"<ul>\n<li>"Ոլորել. Երկու կամ ավելի մատերը քաշեք էկրանի վրայով"</li>\n<li>"Կարգավորել մասշտաբավորումը. Երկու կամ ավելի մատերը մոտեցրեք կամ հեռացրեք միմյանցից"</li></ul>\n\n"Ժամանակավոր մեծացնելու համար 3 անգամ հպեք և պահեք վերջին հպումից հետո: Մատը սեղմած պահեք և քաշեք՝ պատկերն էկրանով մեկ շարժելու համար: Բարձրացրեք մատը՝ պատկերը կրկին փոքրացնելու համար:\n\nՆշում. Խոշորացման ժեստը գործում է ամենուրեք՝ ստեղնաշարից և նավարկման գոտուց բացի:"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Մատչելիության դյուրանցում"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Միացնել"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Անջատել"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Սարքի տվյալների (Wi-Fi-ի գաղտնաբառեր և զանգերի պատմություն), ինչպես նաև հավելվածների տվյալների (հավելվածների պահած կարգավորումներ, ֆայլեր և այլն) ինքնաշխատ հեռակա պահուստավորում:\n\nԻնքնաշխատ պահուստավորումը միացնելիս՝ սարքի և հավելվածների տվյալները պարբերաբար պահվում են հեռակա կարգով: Հավելվածների տվյալները դա նրանց պահած տվյալներն են (կախված մշակողի կարգավորումներից): Դրանց թվում կարող են լինել նաև կոնտակտներ, հաղորդագրություններ, լուսանկարներ և այլ կոնֆիդենցիալ տվյալներ:"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Սարքի կառավարման կարգավորումներ"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Սարքի վարիչը"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Ապաակտիվացնել"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Հեռացնել"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Ապաակտիվացնել այս սարքի ադմինիստրատորին"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Հեռացնել հավելվածը"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Ապաակտիվացնել և հեռացնել"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Սարքի վարիչները"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Հասանելի սարքի վարիչներ չկան"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Անձնական"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Աշխատանքային"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Չկան Trust Agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ակտիվացնե՞լ սարքի ադմինիստրատորին:"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Ակտիվացնել"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Ակտիվացնել այս սարքի ադմինիստրատորին"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Սարքի վարիչ"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Այս ադմինիստրատորին ակտիվացնելը հնարավություն կընձեռի <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածին իրականացնելու հետևյալ գործողությունները`"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Այս վարիչը ակտիվ է և թույլ է տալիս <xliff:g id="APP_NAME">%1$s</xliff:g> ծրագրին կատարել հետևյալ գործողությունները`"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Միացնե՞լ հեռախոսազանգերն ու SMS-ները:"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Զանգերի և SMS-ների պատմությունը հասանելի կլինի այս օգտվողին:"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Արտակարգ իրավիճակների տեղեկություններ"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Հասանելի է արտակարգ իրավիճակների համարհավաքիչում՝ էկրանի կողպման միջոցով"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Յուրաքանչյուրի համար հասանելի է արտակարգ իրավիճակների համարհավաքիչից՝ առանց հեռախոսն ապակողպելու անհրաժեշտության"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Թույլատրել ծրագրերը և բովանդակությունը"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Սահմանափակումներով ծրագրեր"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ընդլայնել ծրագրի կարգավորումները"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը մինչև <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-ը"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ակտիվացնել «Միշտ ընդհատել» ռեժիմը"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Արգելափակել երբ էկրանը միացված է"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել հայտնվել էկրանի վրա՝ նույնիսկ թռուցիկ"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Արգելափակել երբ էկրանն անջատված է"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել միացնել էկրանը կամ գործարկել ծանուցման լույսի թարթումը"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Անջատված է"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Երբ էկրանը միացված է"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Երբ էկրանն անջատված է"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Երբ էկրանը միացված կամ անջատված է"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Մուտքագրեք կառավարչի PIN-ը"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Տեսախցիկի բացում դաստակի կրկնակի պտտման միջոցով"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Խցիկ - սնուցման կոճակի կրկնակի սեղմամբ"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Խցիկի արագ բացում առանց էկրանը ապակողպելու"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Ցուցադրման չափը"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Խոշորացնել կամ մանրացնել էկրանի տարրերը"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ցուցադրման խտություն, էկրանի մասշտաբ, մասշտաբ, մասշտաբավորում"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Խոշորացնել կամ մանրացնել էկրանի տարրերը: Այս կարգավորումը փոխելուց հետո էկրանի որոշ հավելվածներ կարող են փոխել դիրքը:"</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Նախադիտում"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Փոքրացնել"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Մեծացնել"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0272cae..fac84f4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Membuka kunci dengan sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Cukup sentuh sensor sidik jari untuk membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi. \n\n Harap perhatikan sidik jari siapa yang Anda tambahkan - sidik jari yang ditambahkan dapat melakukan hal-hal tersebut."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Catatan: Sidik jari mungkin kurang aman dibandingkan dengan pola atau PIN yang rumit."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Pelajari lebih lanjut"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Catatan: Sidik jari Anda mungkin kurang aman dibanding pola atau PIN yang rumit. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Lanjutkan"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang, dicuri, atau dihapus."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang, dicuri, atau dihapus."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan ponsel ini jika hilang, dicuri, atau dihapus."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak dapat mencegah orang lain menggunakan tablet ini jika hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak dapat mencegah orang lain menggunakan perangkat ini jika hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak dapat mencegah orang lain menggunakan ponsel ini jika hilang atau dicuri."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Tetap lewati"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Kembali"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Temukan sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cari sensor sidik jari di bagian belakang ponsel."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrasi dengan perangkat dan lokasi sensor sidik jari"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Anda dapat menambahkan maksimal <xliff:g id="COUNT">%d</xliff:g> sidik jari"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Hapus semua sidik jari?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Anda tidak dapat menggunakan sidik jari untuk membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ya, hapus"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Gunakan sidik jari untuk melanjutkan."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsi"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Lindungi perangkat"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Membuka kunci dengan sidik jari"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Pilih kunci layar"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Lindungi ponsel"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Sidik jari mungkin kurang aman dibanding pola, PIN, atau sandi yang rumit. Siapkan layar kunci cadangan agar aman."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cegah orang lain menggunakan tablet ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Pilih metode kunci layar cadangan"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Gembok layar"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar gembok"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keamanan sedang hingga tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Sandi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keamanan tinggi"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Jangan sekarang"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Kunci layar saat ini"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Sidik Jari + Pola"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Sidik Jari + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Sandi minimal %d karakter"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN minimal %d digit"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Ketuk Lanjutkan setelah selesai"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Lanjutkan"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Sandi harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> karakter."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> digit."</string>
@@ -1929,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Otomatis cadangkan data perangkat (seperti sandi Wi-Fi dan riwayat panggilan) dan data aplikasi (seperti setelan dan file yang disimpan oleh aplikasi) dari jarak jauh.\n\nJika Anda mengaktifkan cadangan otomatis, data perangkat dan aplikasi secara berkala disimpan dari jarak jauh. Data aplikasi dapat berupa data apa saja yang telah disimpan oleh aplikasi (menurut setelan pengembang), termasuk data yang berpotensi sensitif seperti kontak, pesan, dan foto."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setelan administrasi perangkat"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator perangkat"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Nonaktifkan"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Copot pemasangan"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Nonaktifkan administrator perangkat ini"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Copot pemasangan aplikasi"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Nonaktifkan dan Copot Pemasangan"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrator perangkat"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Administrator perangkat tidak tersedia"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pribadi"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Kantor"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Agen tepercaya tidak tersedia"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktifkan administrator perangkat?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktifkan"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktifkan administrator perangkat ini"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator perangkat"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Mengaktifkan administrator ini akan memungkinkan apl <xliff:g id="APP_NAME">%1$s</xliff:g> melakukan operasi berikut:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Administrator ini aktif dan mengizinkan apl <xliff:g id="APP_NAME">%1$s</xliff:g> melakukan operasi berikut:"</string>
@@ -2258,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Aktifkan panggilan telepon &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Riwayat panggilan dan SMS akan dibagikan dengan pengguna ini."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informasi darurat"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Dapat diakses melalui layar kunci di telepon darurat"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Dapat diakses oleh siapa saja dari telepon darurat tanpa membuka kunci ponsel"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan batasan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Luaskan setelan untuk aplikasi"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 3debce0..4375364 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Aftengja SD-kort"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Hreinsa út af USB geymslu"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Hreinsa út af SD-korti"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Stækkaðu eða minnkaðu texta á skjá."</string>
     <string name="small_font" msgid="2295331917424072635">"Lítið"</string>
     <string name="medium_font" msgid="2068475425515133701">"Meðalstórt"</string>
     <string name="large_font" msgid="599055175160971446">"Stórt"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Opna með fingrafari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Þú þarft einungis að ýta á fingrafaraskynjarann til að taka símann úr lás, heimila greiðslur eða skrá þig inn á forrit. \n\n Gættu vel að því hverjum þú bætir við – öll fingraför sem bætt er við símann virka til að gera allt þetta."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Athugaðu: Fingrafar kann að vera ótraustari aðferð en sterkt mynstur eða PIN-númer."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Frekari upplýsingar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Athugist: Hugsanlegt er að notkun fingrafara þinna sé ekki eins örugg og sterkt mynstur eða PIN-númer. "<annotation id="url">"Frekari upplýsingar"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Hætta við"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Halda áfram"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist, henni er stolið eða gögnin eru þurrkuð út af henni."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist, er stolið eða gögnin þurrkuð af því."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist, er stolið eða gögnin þurrkuð af honum."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist eða henni er stolið."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist eða því er stolið."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist eða honum er stolið."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Sleppa samt"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Til baka"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Finndu skynjarann"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finndu fingrafaraskynjarann aftan á símanum."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Teikning af tæki og staðsetningu fingrafaraskynjara"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Þú getur bætt við allt að <xliff:g id="COUNT">%d</xliff:g> fingraförum"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Fjarlægja öll fingraför?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Þú getur ekki notað fingraför til að taka símann úr lás, heimila kaup eða skrá þig inn í forrit."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Já, fjarlægja"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Notaðu fingrafarið þitt til að halda áfram."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Dulkóðun"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Auktu öryggi tækisins"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Opna með fingrafari"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Veldu skjálás"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Veldu skjálás"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Auktu öryggi símans"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Hugsanlegt er að notkun fingrafara sé ekki jafnörugg og mynstur, PIN-númer eða aðgangsorð. Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Komdu í veg fyrir að aðrir noti þessa spjaldtölvu í heimildarleysi með því að virkja varnareiginleika spjaldtölvunnar. Veldu þann skjálás sem þú vilt nota."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Komdu í veg fyrir að aðrir noti þetta tæki í heimildarleysi með því að virkja varnareiginleika tækisins. Veldu þann skjálás sem þú vilt nota."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Komdu í veg fyrir að aðrir noti þennan síma í heimildarleysi með því að virkja varnareiginleika símans. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Veldu varaleið fyrir skjálás"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjálás"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Breyta lásskjá"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Miðlungs til mikið öryggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Aðgangsorð"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mikið öryggi"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ekki núna"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Gildandi skjálás"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingrafar + mynstur"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingrafar + PIN-númer"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Breyta aðgangsorði opnunar"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Aðgangsorðið verður að vera minnst %d stafir"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-númerið verður að vera minnst %d tölustafir"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Ýttu á „Halda áfram“ þegar þessu er lokið"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Halda áfram"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Aðgangsorðið verður að vera undir <xliff:g id="NUMBER">%d</xliff:g> stöfum."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-númerið verður að vera undir <xliff:g id="NUMBER">%d</xliff:g> tölustöfum."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(óbreytt)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Veldu"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Mörgum vottorðum bætt við)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Nota kerfisvottorð"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ekki bjóða upp á"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ekki staðfesta"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ekkert vottorð tilgreint. Tengingin verður ekki lokuð."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Tilgreina þarf lén."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tiltækt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tiltækt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Sláðu inn aðgangsorð netsins"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Umhverfisskjár"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Vekja skjáinn þegar þú tekur tækið upp eða þegar tilkynningar berast"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Gera texta stærri eða minni"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Stillingar SIM-kortaláss"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Setja upp SIM-kortalás"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortalás"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Aðgengi"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Aðgengisstillingar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Útlitsstillingar"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Þú getur sérsniðið þetta tæki eftir þínum þörfum. Þessum aðgengiseiginleikum má breyta síðar í stillingunum."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Þjónusta"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Skjálesari sem er fyrst og fremst hugsaður fyrir þá sem eru blindir eða sjóndaprir"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Kerfi"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Skjár"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Skjátextar"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Bending fyrir skjástækkun"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Ýttu þrisvar til að auka aðdrátt"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Til að auka og minnka aðdrátt skaltu ýta þrisvar á skjáinn með einum fingri.\n\nÞegar aðdráttur hefur verið aukinn er hægt að:\n"<ul>\n<li>"Fletta: Dragðu tvo eða fleiri fingur yfir skjáinn"</li>\n<li>"Stilla aðdrátt: Færðu tvo eða fleiri fingur sundur eða saman"</li></ul>\n\n"Til að auka aðdráttinn tímabundið skaltu ýta þrisvar og halda inni á síðasta pikki. Dragðu svo fingurinn um skjáinn. Lyftu fingrinum til að minnka aðdráttinn aftur.\n\nAthugaðu: Skjástækkunarbendingin virkar alltaf nema á lyklaborðinu og yfirlitsstikunni."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Flýtileið aðgengisstillingar"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Kveikt"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Slökkt"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Taktu sjálfkrafa afrit af gögnum tækisins (s.s. Wi-Fi aðgangsorðum og símtalaferli) og forritsgögnum (s.s. stillingum og skrám sem forrit vista) og vistaðu á Google Drive.\n\nÞegar þú kveikir á sjálfvirkri afritun eru gögn tækisins og forrita reglulega vistuð fjartengt. Forritsgögn geta verið öll gögn sem forrit hefur vistað (fer eftir stillingum þróunaraðilans), þ.m.t. hugsanlega viðkvæm gögn á borð við tengiliði þína, skilaboð og myndir."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Stillingar tækisumsjónar"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Stjórnandi tækis"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Gera óvirkt"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Fjarlægja"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Gera þennan stjórnanda tækis óvirkan"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Fjarlægja forrit"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Gera óvirkt og fjarlægja"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Stjórnendur tækis"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Engir tiltækir stjórnendur tækis"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Persónulegt"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Vinna"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Engir tiltækir traustfulltrúar"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Virkja stjórnanda tækis?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Virkja"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Virkja þennan stjórnanda tækis"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Stjórnandi tækis"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Ef forritið <xliff:g id="APP_NAME">%1$s</xliff:g> er gert að stjórnanda tækisins fær það leyfi til að framkvæma eftirfarandi aðgerðir:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Þessi stjórnandi er virkur og leyfir forritinu <xliff:g id="APP_NAME">%1$s</xliff:g> að framkvæma eftirfarandi aðgerðir:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Kveikja á símtölum og SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Símtala- og SMS-ferli verður deilt með þessum notanda."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Neyðarupplýsingar"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Aðgengilegt í gegnum lásskjá í neyðarnúmeravali"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Aðgengilegt öllum í neyðarnúmeravali, án þess að taka þurfi símann úr lás"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leyfa forrit og innihald þeirra"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Forrit með takmörkunum"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Stækka stillingar forrits"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Breyta í vekjara eingöngu til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Breyta í truflanir alltaf"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Útiloka þegar kveikt er á skjánum"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Koma í veg fyrir að tilkynningar birtist á skjánum þegar þær eru þaggaðar með „Ónáðið ekki“"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Útiloka þegar slökkt er á skjánum"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Koma í veg fyrir að kvikni á skjánum eða tilkynningaljós blikki þegar tilkynningar eru þaggaðar með „Ónáðið ekki“"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Slökkt"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Þegar kveikt er á skjánum"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Þegar slökkt er á skjánum"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Þegar kveikt eða slökkt er á skjánum"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Sláðu inn PIN-númer stjórnanda"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Opnaðu myndavélarforritið með því að snúa úlnliðnum tvisvar"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Ýttu tvisvar á aflrofann til að opna myndavélina"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Opnaðu myndavélina hratt án þess að taka skjáinn úr lás"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Skjástærð"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Stækkaðu eða minnkaðu atriði á skjánum"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"skjár þéttleiki, aðdráttur, stærð"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Minnkaðu eða stækkaðu atriði á skjánum. Hugsanlegt er að sum forrit á skjánum færist til."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Forskoðun"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Minnka"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Stækka"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 060d00b..723e283 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sblocca con l\'impronta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app desiderate. \n\n Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Ulteriori informazioni"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Nota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN efficaci. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il tablet se lo perdi, ti viene rubato o vengono cancellati i dati."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il dispositivo se lo perdi, ti viene rubato o se vengono cancellati i dati."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il telefono se lo perdi, ti viene rubato o se vengono cancellati i dati."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il tablet in caso di furto o smarrimento."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il dispositivo in caso di furto o smarrimento."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il telefono in caso di furto o smarrimento."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignora comunque"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Torna indietro"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Trova il sensore"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Individua il sensore di impronte digitali sul retro del telefono."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustrazione con il dispositivo e la posizione del sensore di impronte digitali"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Puoi aggiungere fino a <xliff:g id="COUNT">%d</xliff:g> impronte digitali"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Rimuovere tutte le impronte digitali?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Non potrai più utilizzare le impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sì, rimuovi"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utilizza la tua impronta digitale per continuare."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteggi il tuo dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Sblocco del dispositivo con l\'impronta digitale"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Blocco schermo"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Scegli blocco schermo"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteggi il telefono"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"L\'impronta digitale potrebbe essere meno sicura di una sequenza, una password o un PIN efficaci. Per sicurezza, configura una schermata di blocco di backup."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impedisci ad altri di utilizzare il tablet senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Scegli il metodo di backup per il blocco dello schermo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambia blocco schermo"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Protezione medio-alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Protezione alta"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Non ora"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Blocco schermo attuale"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Impronta digitale + sequenza"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Impronta digitale + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La password deve contenere almeno %d caratteri"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Il PIN deve includere almeno %d cifre"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Al termine, tocca Continua"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La password deve contenere meno di <xliff:g id="NUMBER">%d</xliff:g> caratteri."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Il codice PIN deve contenere meno di <xliff:g id="NUMBER">%d</xliff:g> cifre."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(invariato)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Seleziona un\'opzione"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Più certificati aggiunti)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Utilizza certificati di sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Non fornire"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Non convalidare"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nessun certificato specificato. La connessione non sarà privata."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Specifica un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Inserisci la password di rete"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Effettua il backup automatico dei dati del dispositivo (come password Wi-Fi e cronologia chiamate) e delle app (come impostazioni e file archiviati dalle app) da remoto.\n\nQuando attivi il backup automatico, i dati del dispositivo e delle app vengono salvati periodicamente da remoto. I dati delle app possono essere tutti i dati salvati da un\'app (in base alle impostazioni dello sviluppatore), inclusi i dati potenzialmente sensibili come contatti, messaggi e foto."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Impostazioni di amministrazione dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Amministratore dispositivo"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Disattiva"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Disinstalla"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Disattiva questo amministratore del dispositivo"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Disinstalla app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Disattiva e disinstalla"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Amministratori dispositivo"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nessun amministratore dispositivo disponibile"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personale"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Lavoro"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Non sono disponibili agenti di attendibilità"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Attivare amministratore dispositivo?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Attiva"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Attiva questo amministratore del dispositivo"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Amministratore dispositivo"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"L\'attivazione di questo amministratore consentirà all\'applicazione <xliff:g id="APP_NAME">%1$s</xliff:g> di eseguire le seguenti operazioni:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Questo amministratore è attivo e consente all\'applicazione <xliff:g id="APP_NAME">%1$s</xliff:g> di eseguire le seguenti operazioni:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Desideri attivare chiamate e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"La cronologia chiamate e SMS verrà condivisa con questo utente."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informazioni relative all\'emergenza"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accessibile dalla schermata di blocco durante la chiamata di emergenza"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accessibile da chiunque durante la chiamata di emergenza, senza sbloccare il telefono"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Consenti app e contenuti"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applicazioni con limitazioni"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Espandi impostazioni per app"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2d8e901..87d783a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -76,8 +76,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"‏בטל טעינה של כרטיס SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"‏מחק אחסון USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"‏מחק כרטיס SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"הגדל או הקטן את גודל הטקסט שמופיע במסך."</string>
     <string name="small_font" msgid="2295331917424072635">"קטן"</string>
     <string name="medium_font" msgid="2068475425515133701">"בינוני"</string>
     <string name="large_font" msgid="599055175160971446">"גדול"</string>
@@ -336,10 +335,17 @@
     <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_message" msgid="4747510337049957778">"גע בחיישן טביעות האצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות. \n\n בחר בקפידה את טביעות האצבע שתוסיף - טביעות אצבע שיצורפו לטלפון יאפשרו לבצע את הפעולות האלה."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"‏שים לב: ייתכן ששימוש בטביעת אצבע יעניק פחות אבטחה מקו ביטול נעילה או PIN חזקים."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"למידע נוסף"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"הערה: טביעת האצבע עשויה להיות בטוחה פחות מאשר קו ביטול נעילה או קוד גישה חזק. "<annotation id="url">"למידע נוסף"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"בטל"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"המשך"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן, גנבה או מחיקה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטאבלט."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן, גנבה או מחיקה, לא תהיה לך אפשרות למנוע מאחרים להשתמש במכשיר."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן, גנבה או מחיקה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטלפון."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטאבלט."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש במכשיר."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטלפון."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"דלג בכל זאת"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"חזור"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"אתר את החיישן"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"אתר את חיישן טביעת האצבע בגב הטלפון."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"איור המציג את המיקום של חיישן טביעת האצבע במכשיר"</string>
@@ -373,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"תוכל להוסיף עד <xliff:g id="COUNT">%d</xliff:g> טביעות אצבע"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"האם להסיר את כל טביעות האצבע?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"לא תוכל להשתמש בטביעות האצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -410,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"הגן על המכשיר שלך"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ביטול נעילה באמצעות טביעת אצבע"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"נעילת מסך"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"בחר שיטת נעילת מסך"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"הגן על הטלפון שלך"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"הערה: טביעת האצבע עשויה להיות בטוחה פחות מאשר קו ביטול נעילה, קוד גישה או סיסמה חזקים. הגדר נעילת מסך כגיבוי ליתר ביטחון."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטאבלט הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש במכשיר הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטלפון הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"בחר את שיטת הגיבוי לנעילת המסך"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"נעילת מסך"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"שינוי נעילת מסך"</string>
@@ -426,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"אבטחה בינונית עד גבוהה"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"סיסמה"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"אבטחה גבוהה"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"לא עכשיו"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"נעילת המסך הנוכחית"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"טביעת אצבע + קו ביטול נעילה"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"טביעת אצבע + קוד גישה"</string>
@@ -478,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"‏אורך הסיסמה חייב להיות %d תווים לפחות"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"‏מספר ה-PIN חייב להיות בן %d ספרות לפחות"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"הקש על \'המשך\' כשתסיים"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"המשך"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"הסיסמה אינה יכולה להכיל יותר מ-<xliff:g id="NUMBER">%d</xliff:g> תווים."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"‏קוד ה-PIN אינו יכול להכיל יותר מ-<xliff:g id="NUMBER">%d</xliff:g> ספרות."</string>
@@ -720,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ללא שינוי)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"בחר"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(נוספו מספר אישורים)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"השתמש באישורי מערכת"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ללא אישור"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ללא אימות"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"לא הוגדר אישור. החיבור שלך לא יהיה פרטי."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"חובה לציין דומיין."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS זמין"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"הזן את סיסמת הרשת שלך"</string>
@@ -904,8 +914,7 @@
     <string name="doze_title" msgid="2259176504273878294">"תצוגת אווירה"</string>
     <string name="doze_summary" msgid="7128970177894383698">"הוצא את המסך ממצב כשאתה מרים את המכשיר או מקבל הודעות"</string>
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"הגדלה או הקטנה של גודל הטקסט"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏הגדרות נעילת כרטיס SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"‏הגדר נעילה של כרטיס SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"‏נעילת כרטיס SIM"</string>
@@ -1610,21 +1619,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"נגישות"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"הגדרות נגישות"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"הגדרות ראייה"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"ניתן להתאים אישית את המכשיר הזה כדי שיתאים לצרכיך. ניתן לשנות את תכונות הנגישות מאוחר יותר ב\'הגדרות\'."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"שירותים"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"קורא מסך המיועד בעיקר לעיוורים או לבעלי ראייה לקויה"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"מערכת"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"תצוגה"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"כתוביות"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"תנועת הגדלה"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"הקש שלוש פעמים כדי לשנות את המרחק מהתצוגה"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"כדי לשנות את המרחק מהתצוגה עליך להקיש על המסך שלוש פעמים באצבע אחת.\n\nבמצב התקרבות ניתן:\n"<ul>\n<li>"לגלול: גרור שתי אצבעות או יותר על פני המסך"</li>\n<li>"להתאים את רמת ההגדלה: בצע תנועת צביטה בשתי אצבעות או יותר או הרחק אותן זו מזו"</li></ul>\n\n"כדי להגדיל באופן זמני, הקש שלוש פעמים והחזק בהקשה האחרונה. בזמן שאתה מחזיק את האצבע על המסך, גרור אותה כדי לנוע על פני המסך. הרם את האצבע כדי להגדיל בחזרה את המרחק מהתצוגה.\n\nהערה: תנועת הגדלה פועלת בכל מקום מלבד במקלדת ובסרגל הניווט."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"קיצור נגישות"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"פועל"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"כבוי"</string>
@@ -1970,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"‏גבה מרחוק באופן אוטומטי נתונים מהמכשיר (כמו סיסמאות לרשתות Wi-Fi והיסטוריית שיחות) ונתוני אפליקציות (כמו הגדרות וקבצים שאוחסנו על ידי אפליקציות) אל Google Drive.‏\n\nכשתפעיל את הגיבוי האוטומטי, נתוני המכשיר והאפליקציות יישמרו מדי פעם באופן מרוחק. נתוני אפליקציות יכולים להיות מכל סוג שהאפליקציה שומרת (בהתבסס על הגדרות המפתח), כולל נתונים שעשויים להיות רגישים, כמו אנשי קשר, הודעות ותמונות."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"הגדרות ניהול מכשיר"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"מנהל מכשיר"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"בטל הפעלה"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"הסר התקנה"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"השבת את מנהל המערכת של מכשיר זה"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"הסר את התקנת האפליקציה"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"בטל הפעלה והסר התקנה"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"מנהלי מכשירים"</string>
     <string name="no_device_admins" msgid="702695100241728775">"אין מנהלי מכשירים זמינים"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"אישי"</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="6246742476064507965">"להפעיל את מנהל המכשיר?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"הפעל"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"הפעל את מנהל המערכת של מכשיר זה"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"מנהל מכשיר"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"הפעלת מנהל מערכת זה תאפשר לאפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> לבצע את הפעולות הבאות:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"מנהל מערכת זה פעיל ומאפשר לאפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> לבצע את הפעולות הבאות:"</string>
@@ -2301,7 +2306,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏האם להפעיל שיחות טלפון ו-SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏היסטוריית השיחות וה-SMS תשותף עם המשתמש הזה."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"מידע למקרה חירום"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"נגיש באמצעות מסך הנעילה בחייגן החירום"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"נגיש לכל אחד מחייגן החירום ללא צורך בביטול נעילת הטלפון"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"אפשר אפליקציות ותוכן"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"אפליקציות והגבלות"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור האפליקציה"</string>
@@ -2623,22 +2628,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"עבור למצב \'התראות בלבד\' עד <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"שנה ל\'הפרעות בכל מצב\'"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"חסום כשהמסך פועל"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"מנע הצצה או הופעה במסך של הודעות שהושתקו במצב \'נא לא להפריע\'"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"חסום כשהמסך כבוי"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"מנע מהודעות שהושתקו במצב \'נא לא להפריע\' להפעיל את המסך או את אור חיווי ההודעה המהבהב."</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"כבוי"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"כאשר המסך פועל"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"כאשר המסך כבוי"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"כאשר המסך מופעל או כבוי"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
     <string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"‏הזן את מספר ה-PIN של מנהל המערכת"</string>
@@ -2885,13 +2882,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"פתח את אפליקציית המצלמה על ידי סיבוב כפול של פרק כף היד"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"לחץ על לחצן ההפעלה פעמיים כדי לפתוח את המצלמה"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"הפעל את המצלמה במהירות מבלי לבטל את נעילת הטלפון"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"גודל תצוגה"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"הגדלה והקטנה של הפריטים המופיעים במסך"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"דחיסות תצוגה, מרחק מתצוגה במסך, קנה מידה, שינוי קנה מידה"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"הגדלה והקטנה של הפריטים המופיעים במסך. ייתכן שמיקומן של חלק מהאפליקציות במסך ישתנה."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"תצוגה מקדימה"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"הקטנה"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"הגדלה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f21b766..0533500 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"指紋認証センサーに触れるだけで、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。\n\nこれらの操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"注: 指紋は複雑なパターンやPINよりも安全面で劣る可能性があります。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"詳細"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"注: 指紋は複雑なパターンや PIN よりも安全面で劣る可能性があります。"<annotation id="url">"詳細"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"次へ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"端末保護機能が有効になりません。このタブレットの紛失、盗難、データ消去時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"端末保護機能が有効になりません。この端末の紛失、盗難、データ消去時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"端末保護機能が有効になりません。このスマートフォンの紛失、盗難、データ消去時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"端末保護機能が有効になりません。このタブレットの紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"端末保護機能が有効になりません。この端末の紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"端末保護機能が有効になりません。このスマートフォンの紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"スキップ"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"戻る"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"センサー位置の確認"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"端末の背面にある指紋認証センサーを探します。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"端末の指紋認証センサーの位置を示した図"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"最大で<xliff:g id="COUNT">%d</xliff:g>個の指紋を追加できます"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"すべての指紋を削除しますか？"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"指紋認証を使用して端末のロックを解除したり、購入を許可したり、アプリにログインしたりすることはできなくなります。"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"端末の保護"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"指紋でロックを解除する"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"画面ロックを選択"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"画面ロックの選択"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"スマートフォンの保護"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"指紋は、複雑なパターン、PIN、パスワードよりも安全面で劣る可能性があります。バックアップのロック画面を設定して安全を確保してください。"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"このタブレットが他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"この端末が他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"このスマートフォンが他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"予備の画面ロック方式を選択してください"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"画面ロック"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ロック解除方法を変更する"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中程度から高レベルのセキュリティ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"パスワード"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高レベルのセキュリティ"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"後で行う"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"現在の画面ロック"</string>
     <!-- no translation found for fingerprint_unlock_set_unlock_pattern (4939057588092120368) -->
     <skip />
@@ -477,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"パスワードを%d文字以上で入力してください"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PINは%d桁以上にしてください。"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"終了後 [次へ] をタップします"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"次へ"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"パスワードは<xliff:g id="NUMBER">%d</xliff:g>文字未満で指定してください。"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PINは<xliff:g id="NUMBER">%d</xliff:g>桁未満で指定してください。"</string>
@@ -707,13 +720,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"（変更なし）"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"選択してください"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"（複数の証明書が追加されています）"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"システム証明書を使用"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"指定しない"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"検証しない"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"証明書が指定されていません。この接続ではプライバシーが保護されません。"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ドメインを指定する必要があります。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS利用可"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （WPS利用可）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ネットワークパスワードを入力してください"</string>
@@ -1950,16 +1961,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"端末のデータ（Wi-Fiのパスワードや通話履歴など）とアプリのデータ（アプリで保存された設定やファイルなど）を自動的にリモートでバックアップします。\n\n自動バックアップをONにすると、端末のデータとアプリのデータは定期的にリモートで保存されます。アプリのデータとしては、連絡先、メッセージ、写真など、機密と見なされるデータを含め、（デベロッパーの設定に基づいて）アプリで保存されたすべてのデータがバックアップされる可能性があります。"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"端末管理の設定"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"端末管理アプリ"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"無効にする"</string>
-    <!-- no translation found for uninstall_device_admin (2019687470475335309) -->
-    <skip />
+    <string name="remove_device_admin" msgid="7736174723276745230">"この端末管理アプリを無効にする"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"アプリをアンインストール"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"無効にしてアンインストール"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"デバイス管理者"</string>
     <string name="no_device_admins" msgid="702695100241728775">"有効なデバイス管理者がいません"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"個人用"</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="6246742476064507965">"管理アプリを有効にしますか？"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"有効にする"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"この端末管理アプリを有効にする"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"端末管理アプリ"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"この管理アプリを有効にすると、次の操作を<xliff:g id="APP_NAME">%1$s</xliff:g>アプリに許可することになります。"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"この管理アプリは有効であり、<xliff:g id="APP_NAME">%1$s</xliff:g>アプリに次の操作を許可します。"</string>
@@ -2282,7 +2293,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"通話とSMSをONにしますか？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話とSMSの履歴がこのユーザーと共有されます。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急情報"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"ロック画面から緊急通報にアクセスして利用できます"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"スマートフォンのロックを解除せずに誰でも [緊急通報] からアクセスできます。"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
@@ -2601,7 +2612,7 @@
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"画面が ON のときにブロックする"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"[通知を非表示] でサイレントに設定した通知を受信したときに、画面上にポップアップ表示されなくなります"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"画面が OFF のときにブロックする"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"[通知を非表示] でサイレントに設定した通知を受信したときに、画面が ON になったり、光が点滅したりしなくなります"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"[通知を非表示] でサイレントに設定した通知を受信したときに、画面が ON になったり光が点滅したりしなくなります"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"OFF"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"画面が ON のとき"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"画面が OFF のとき"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 349f7d8..ef80a7d 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"გამოაერთე SD ბარათი"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB მეხსიერების წაშლა"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD ბარათის გასუფთავება"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"ეკრანზე ტექსტის დაპატარავება ან გადიდება."</string>
     <string name="small_font" msgid="2295331917424072635">"პატარა"</string>
     <string name="medium_font" msgid="2068475425515133701">"საშუალო"</string>
     <string name="large_font" msgid="599055175160971446">"დიდი"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"თქვენი ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის ან აპებში შესასვლელად, უბრალოდ შეეხეთ თითის ანაბეჭდის სენსორს. \n\n ყურადღება მიაქციეთ იმას, თუ ვის თითის ანაბეჭდებს დაამატებთ, რადგან ამ მოქმედებების შესრულება ნებისმიერ დამატებულ თითის ანაბეჭდს შეუძლია."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"შენიშვნა: თქვენი თითის ანაბეჭდი შეიძლება ძლიერ შაბლონზე ან PIN-კოდზე ნაკლებად საიმედო იყოს."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"შეიტყვეთ მეტი"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"შენიშვნა: თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე ან PIN-კოდზე ნაკლებად საიმედო იყოს. "<annotation id="url">"შეიტყვეთ მეტი"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"გაუქმება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"გაგრძელება"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტაბლეტის დაკარგვის, მოპარვის ან მისი მონაცემების ამოშლის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. მოწყობილობის დაკარგვის, მოპარვის ან მისი მონაცემების ამოშლის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტელეფონის დაკარგვის, მოპარვის ან მისი მონაცემების ამოშლის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტაბლეტის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტელეფონის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"მაინც გამოტოვება"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"დაბრუნება"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"სენსორის პოვნა"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"იპოვეთ თქვენი ტელეფონის უკანა ნაწილზე მდებარე თითის ანაბეჭდების სენსორი."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ილუსტრაცია მოწყობილობისა და თითის ანაბეჭდის სენსორის ადგილმდებარეობით"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"შეგიძლიათ დაამატოთ მაქსიმუმ <xliff:g id="COUNT">%d</xliff:g> თითის ანაბეჭდი"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"წაიშალოს ყველა თითის ანაბეჭდი?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"თქვენი ტელეფონის განსაბლოკად, შესყიდვების ავტორიზაციისთვის ან აპებში შესასვლელად თქვენი თითის ანაბეჭდების გამოყენებას ვერ შეძლებთ."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"დაიცავით თქვენი მოწყობილობა"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"განბლოკეთ თითის ანაბეჭდის მეშვეობით"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"აირჩიეთ ეკრანის დამბლოკველი"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"აირჩიეთ ეკრანის დაბლოკვის მეთოდი"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"დაიცავით ტელეფონი"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე, PIN-კოდზე ან პაროლზე ნაკლებად საიმედო იყოს. დააყენეთ ეკრანის დაბლოკვის სარეზერვო ხერხი, რათა დაცული იყოთ."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტაბლეტი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს მოწყობილობა ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტელეფონი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"აირჩიეთ თქვენი სარეზერვო ეკრანის დაბლოკვის მეთოდი"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ეკრანის დაბლოკვა"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ეკრანის დაბლოკვის ცვლილება"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"საშუალოდან მაღალი დონის უსაფრთხოება"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"პაროლი"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"მაღალი უსაფრთხოება"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ახლა არა"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"მიმდინარე ეკრანის დაბლოკვა"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"თითის ანაბეჭდი + ნიმუში"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"თითის ანაბეჭდი + PIN-კოდი"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"განბლოკვის პაროლის შეცვლა"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"პაროლი უნდა შედგებოდეს მინიმუმ %d სიმბოლოსგან"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-კოდი უნდა შეიცავდეს სულ მცირე %d ციფრს"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"დასრულების შემდეგ შეეხეთ „გაგრძელება“-ს"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"გაგრძელება"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"პაროლი უნდა შეიცავდეს <xliff:g id="NUMBER">%d</xliff:g> სიმბოლოზე ნაკლებს."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN არ უნდა შეიცავდეს <xliff:g id="NUMBER">%d</xliff:g>-ზე მეტ სიმბოლოს."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(უცვლელი)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"გთხოვთ, აირჩიოთ"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(დამატებულია მრავალი სერტიფიკატი)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"სისტემის სერტიფიკატების გამოყენება"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"არ მსურს მიწოდება"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"არ მსურს დადასტურება"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"სერტიფიკატი მითითებული არ არის. კავშირი არ იქნება კონფიდენციალური."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"მიუთითეთ დომენი."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ხელმისაწვდომია WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ხელმისაწვდომია)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"შეიყვანეთ თქვენი ქსელის პაროლი"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"გარემოს ეკრანი"</string>
     <string name="doze_summary" msgid="7128970177894383698">"გამოაღვიძეთ ეკრანი, როდესაც მოწყობილობას აიღებთ ან მიიღებთ შეტყობინებას."</string>
     <string name="title_font_size" msgid="4405544325522105222">"შრიფტის ზომა"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"ტექსტის გადიდება ან დაპატარავება"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ბარათის დაბლოკვის პარამეტრები"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM ბარათის დაბლოკვის დაყენება"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ბარათის დაბლოკვა"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"სპეციალური შესაძლებლობები"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"მარტივი წვდომის პარამეტრები"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"მხედველობის პარამეტრები"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"ამ მოწყობილობის მორგება თქვენი საჭიროებების შესაბამისად შეგიძლიათ. მარტივი წვდომის ამ პარამეტრების მოგვიანებით შეცვლა პარამეტრებიდან არის შესაძლებელი."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"სერვისები"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"ეკრანის წამკითხველი შექმნილია მხედველობის პრობლემების მქონე ადამიანებისთვის"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"სისტემა"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"ეკრანი"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"ტიტრები"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"მასშტაბირების ჟესტი"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"მასშტაბის გასაზრდელად, შეეხეთ 3-ჯერ"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"მასშტაბის გასადიდებლად და შესამცირებლად, შეეხეთ ეკრანს ერთი თითით სამჯერ ზედიზედ.\n\nგადიდებული მასშტაბისას, თქვენ შეგიძლიათ:\n"<ul>\n<li>"გადაადგილება — გადაატარეთ ეკრანს ორი ან მეტი თითი"</li>\n<li>"მასშტაბის რეგულირება — შეაერთეთ ორი ან მეტი თითი, ან გაშალეთ ისინი"</li></ul>\n\n"დროებით გასადიდებლად, შეეხეთ ეკრანს სამჯერ ზედიზედ და შეყოვნდით ბოლო შეხებისას. თითის აუშვებლად, გადაატარეთ თითი ეკრანს მისი სხვადასხვა ნაწილის დასათვალიერებლად. მასშტაბის ხელახლა შესამცირებლად, აუშვით თითი.\n\nშენიშვნა: მასშტაბირების ჟესტი მუშაობს ყველგან, გარდა კლავიატურისა და ნავიგაციის ზოლისა."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"მარტივი წვდომის მალსახმობი"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"ჩართული"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"გამორთული"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"მოწყობილობის მონაცემებისთვის (როგორიცაა Wi-Fi პაროლები და საუბრის ისტორია) და აპების მონაცემებისთვის (როგორიცაა აპების მიერ შენახული პარამეტრები და ფაილები) სარეზერვო ასლების ავტომატურად შექმნა განცალკევებით.\n\nროდესაც ჩართავთ სარეზერვო ასლების ავტომატურად შექმნას, მოწყობილობისა და აპების მონაცემები პერიოდულად ცალკე შეინახება. აპის მონაცემები შეიძლება იყოს აპის მიერ შენახული ნებისმიერი მონაცემი (დეველოპერის პარამეტრებზე დაყრდნობით), მათ შორის პოტენციურად სენსიტიური მონაცემები, როგორიცაა კონტაქტები, შეტყობინებები და ფოტოები."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"მოწყობილობის ადმინისტრირების პარამეტრები"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"მოწყობილობის ადმინისტრატორი"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"დეაქტივირება"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"დეინსტალაცია"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"მოწყობილობის ამ ადმინისტრატორის დეაქტივაცია"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"აპის დეინსტალაცია"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"დეაქტივაცია და დეინსტალაცია"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"მოწყობილობის ადმინისტრატორები"</string>
     <string name="no_device_admins" msgid="702695100241728775">"მოწყობილობის არცერთი ადმინისტრატორი არ არის ხელმისაწვდომი"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"პირადი"</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="6246742476064507965">"მოწყობილობის ადმინისტრატორი გააქტიურდეს?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"გააქტიურება"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"მოწყობილობის ამ ადმინისტრატორის გააქტიურება"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"მოწყობილობის ადმინისტრატორი"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ამ ადმინისტრატორის აქტივირება აპს <xliff:g id="APP_NAME">%1$s</xliff:g> საშუალებას მისცემს შეასრულოს შემდეგი ოპერაციები:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ადმინისტრატორი აქტიურია და <xliff:g id="APP_NAME">%1$s</xliff:g> აპლიკაციას შემდეგი ოპერაციების განხორციელების საშუალებას აძლევს:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ჩაირთოს სატელეფონო ზარები &amp; amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ზარის და SMS ისტორია გაზიარდება ამ მომხმარებელთან."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"საგანგებო ინფორმაცია"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"ხელმისაწვდომი იქნება ჩაკეტილი ეკრანის საგანგებო დარეკვის აპიდან"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"ხელმისაწვდომი იქნება ყველასთვის საგანგებო დარეკვის აპიდან, თქვენი ტელეფონის განბლოკვის გარეშე"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"აპებისა და კონტენტის დაშვება"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"აპლიკაციები შეზღუდვებით"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"აპლიკაციის პარამეტრების გაფართოება"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"მაღვიძარებზე მხოლოდ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-მდე გადაყვანა"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"„მუდმივად შეწყვეტის“ რეჟიმზე გადაყვანა"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"დაბლოკვა ჩართული ეკრანისას"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"„არ შემაწუხოთ“-ის მეშვეობით დადუმებული შეტყობინებებისთვის ეკრანზე გამოჩენის აღკვეთა"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"დაბლოკვა გამორთული ეკრანისას"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"„არ შემაწუხოთ“-ის მეშვეობით დადუმებული შეტყობინებებისთვის ეკრანის ჩართვისა თუ სინათლის ინდიკატორის გამოყენების აღკვეთა"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"გამორთული"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"ჩართული ეკრანისას"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"გამორთული ეკრანისას"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ჩართული ან გამორთული ეკრანისას"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
     <string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"შეიყვანეთ ადმინისტრატორის PIN"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"გახსენით კამერის აპი თქვენი მაჯის ორჯერ მოტრიალებით"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"კამერისთვის ჩართვის ღილაკზე ორჯერ დაჭერა"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"კამერის სწრაფად გახსნა ეკრანის განბლოკვის გარეშე"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"ჩვენების ზომა"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"ეკრანზე ერთეულების გადიდება ან დაპატარავება"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ეკრანის სიმკვრივე, ეკრანის მასშტაბირება, მასშტაბი, სკალირება"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"ეკრანზე არსებული ერთეულის დაპატარავება ან გადიდება. ზოგიერთმა აპმა თქვენს ეკრანზე შეიძლება პოზიცია შეიცვალოს."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"გადახედვა"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"დაპატარავება"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"გადიდება"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 4feb036..ad15bfe 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD картасын шығару"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB жадын өшіру"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD картасын өшіру"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Экрандағы мәтінді кішірейтеді немесе үлкейтеді."</string>
     <string name="small_font" msgid="2295331917424072635">"Кішкене"</string>
     <string name="medium_font" msgid="2068475425515133701">"Орташа"</string>
     <string name="large_font" msgid="599055175160971446">"Үлкен"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"Телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру үшін жай саусақ ізін оқу сканерін түртіңіз. \n\n Саусақ іздерін қосқанда сақ болыңыз — қосылған барлық саусақ іздері осы нәрселерді істей алады."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Ескертпе: саусақ ізінің қауіпсіздігі күшті өрнектен немесе PIN кодынан азырақ болады."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Толығырақ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Ескертпе: саусақ ізінің қауіпсіздігі күшті өрнектен немесе PIN кодынан азырақ болуы мүмкін. "<annotation id="url">"Қосымша мәліметтер"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Бас тарту"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Жалғастыру"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Планшет жоғалса, ұрланса немесе деректері өшірілсе, оны басқалардың пайдалануынан сақтау мүмкін болмайды."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса, ұрланса немесе деректері өшірілсе, осы құрылғыны басқалардың пайдалануын болдырмау мүмкін болмайды."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса, ұрланса немесе деректері өшірілсе, осы телефонды басқалардың пайдалануын болдырмау мүмкін болмайды."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса немесе ұрланса, басқалардың осы планшетті пайдалануын болдырмау мүмкін болмайды."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса немесе ұрланса, басқалардың осы құрылғыны пайдалануын болдырмау мүмкін болмайды."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса немесе ұрланса, басқалардың осы телефонды пайдалануын болдырмау мүмкін болмайды."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Бәрібір өткізіп жіберу"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Оралу"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Сенсорды табу"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Телефонның артқы жағындағы саусақ ізін оқитын сенсорды табыңыз."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Құрылғы мен саусақ таңбасы сенсорының орны бар сурет"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> дейін саусақ ізін қосуға болады"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Барлық саусақ іздерін жою керек пе?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Телефон құлпын ашу, сатып алуларды авторизациялау немесе олармен қолданбаларға кіру үшін саусақ іздерін пайдалана алмайсыз."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Құрылғыны қорғау"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Саусақ ізімен құлыпты ашу"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Экранды құлпын таңдау"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Экран құлпын таңдау"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Телефонды қорғау"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Саусақ ізінің қауіпсіздігі күшті өрнектен, PIN кодынан немесе кілтсөзден азырақ болуы мүмкін. Қорғау үшін қосалқы бекіту экранын реттеңіз."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"құрылғы қорғау мүмкіндіктерін іске қосу арқылы сіздің рұқсатыңызсыз планшетті басқалардың пайдалануына жол бермеңіз. Пайдаланғыңыз келетін экран құлпын таңдаңыз."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы құрылғыны рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы телефонды рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Сақтық көшірме экранын құлыптау әдісін таңдаңыз"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Экранды құлыптау"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Бекіту экранын өзгерту"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Орташадан жоғарыға қауіпсіздігі"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Кілтсөз"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Жоғары қауіпсіздік"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Қазір емес"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Ағымдағы экран құлпы"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Саусақ ізі + өрнек"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Саусақ ізі + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Бекітпе кілтсөзін өзгерту"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Кілтсөз кем дегенде %d таңбадан тұруы тиіс"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN код кем дегенде  %d бірліктен тұруы тиіс."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Аяқтағанда \"Жалғастыру\" пәрменін түртіңіз"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Жалғастыру"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Кілтсөздің құрамы <xliff:g id="NUMBER">%d</xliff:g> таңбадан кем болуы тиіс."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN құрамы <xliff:g id="NUMBER">%d</xliff:g> бірліктен кем болуы тиіс."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(өзгермеген)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Таңдаңыз"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Бірнеше сертификат қосылды)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Жүйелік сертификаттарды пайдалану"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Қамтамасыз етпеу"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Тексермеу"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертификат көрсетілмеген. Байланыс жеке болмайды."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Доменді көрсету керек."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS қол жетімді"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS қол жетімді)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Желі құпия сөзін енгізіңіз"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Айналаны көрсету"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Құрылғыны көтергенде немесе хабарландырулар алғанда экранды ояту"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Шрифт өлшемі"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Мәтінді үлкейтеді немесе кішірейтеді"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картасын бекіту параметрлері"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM картасының бекітпесін орнату"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM картасының бекітпесі"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Қол жетімділік"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Қол жетімділік параметрлері"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Көру параметрлері"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Бұл құрылғыны қажеттіліктерге сай реттей аласыз. Бұл арнайы мүмкіндіктерді кейінірек \"Параметрлер\" тармағында өзгертуге болады."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Қызметтер"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Экранды оқу құралы негізінен соқыр және көру қабілеті нашар адамдарға арналған"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Жүйе"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Дисплей"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Субтитр"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Ұлғайту қимылы"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Масштабтау үшін 3 рет түртіңіз"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Ұлғайту және кішірейту үшін экранды бір саусақпен 3 рет түртіңіз.\n\nҰлғайтулы күйде мыналарды орындауға болады:\n"<ul>\n<li>"Айналдыру: 2 немесе көбірек саусақты экран бетімен жүргізіңіз"</li>\n<li>"Масштабтау деңгейін реттеу: 2 немесе көбірек саусақты бір-біріне жақындатыңыз немесе бір-бірінен алшақтатыңыз"</li></ul>\n\n"Уақытша масштабтау үшін 3 рет түртіп, соңғы түртуде ұстап тұрыңыз. Саусақты ұстап тұрып, экран бетімен жылжытыңыз. Қалпына келтіру үшін саусақты көтеріңіз.\n\nЕскертпе: ұлғайту қимылы пернетақта мен шарлау тақтасынан басқа барлық жерде жұмыс істейді."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Қол жетімділік төте пернесі"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Қосулы"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Өшірулі"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Құрылғы деректерінің (мысалы, Wi-Fi құпия сөздері және қоңыраулар тарихы) және қолданба деректерінің (мысалы, қолданбалар сақтайтын параметрлер және файлдар) сақтық көшірмесін қашықтан автоматты түрде жасау.\n\nСақтық көшірмені автоматты түрде жасау функциясын қоссаңыз, құрылғы және қолданба деректері қашықтан сақталып отырады. Қолданба деректеріне қолданбаға сақталған кез келген дерек (әзірлеуші параметрлеріне байланысты), соның ішінде контактілер, хабарлар және фотосуреттер сияқты құпия деректер жатады."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Құрылғы әкімшілігінің параметрлері"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Құрылғы әкімшісі"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Өшіру"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Жою"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Осы құрылғы әкімшісін өшіру"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Қолданбаны алу"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Өшіру және жою"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Құрылғы әкімшілері"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Қол жетімді құрылғы әкімшілері жоқ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Жеке"</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="6246742476064507965">"Құрылғы әкімшісі іске қосылсын ба?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Іске қосу"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Осы құрылғы әкімшісін белсендіру"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Құрылғы әкімшісі"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Бұл әкімшіні іске қосу <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына келесі нәрселерді орындау мүмкіндігін береді:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Бұл әкімші қосылған және <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына келесі әрекеттерді орындауға рұқсат береді:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Телефон қоңырауларын және SMS қосу керек пе?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Қоңыраулар және SMS тарихы осы пайдаланушымен бөлісіледі."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Төтенше ақпарат"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Төтенше нөмір тергіште бекіту экраны арқылы қол жетімді"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Кез келген адам телефон құлпын ашпай төтенше нөмір тергіштен қол жеткізе алады"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Қолданбалар мен мазмұнға рұқсат беру"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Шектеулері бар қолданбалар"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Қолданба параметрлерін кеңейту"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дейін \"дабылдар ғана\" режиміне өзгерту"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Әрқашан тоқтатуға өзгерту"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Экран қосулы кезде бұғаттау"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\"Мазаламау\" арқылы үнсіз етілген хабарландырулардың ағымдағы экранда қысқа уақытқа көрінуін немесе қалқып шығуын болдырмайды"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Экран өшірулі кезде бұғаттау"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\"Мазаламау\" арқылы үнсіз етілген хабарландырулардың экранды қосуын немесе хабарландыру шамын жыпылықтатуын болдырмайды"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Өшірулі"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Экран қосулы кезде"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Экран өшірулі кезде"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Экран қосулы немесе өшірулі кезде"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Әкімші PIN кодын енгізу"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Білекті екі рет бұру арқылы камера қолданбасын ашу"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера үшін қуат түймес. екі рет басыңыз"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Экран құлпын ашпастан камераны жылдам ашу"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Дисплей өлшемі"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Экрандағы элементтерді үлкейтеді немесе кішірейтеді"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"дисплей тығыздығы, экранды масштабтау, масштаб, масштабтау"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Экрандағы элементтерді кішірейтеді немесе үлкейтеді. Экрандағы кейбір қолданбалардың орны өзгеруі мүмкін."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Алдын ала көру"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Кішірек ету"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Үлкенірек ету"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 5222164..030d6d6 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"គ្រាន់តែប៉ះមុខងារចាប់ស្នាមម្រាមដៃ នោះអ្នកអាចដោះសោទូរស័ព្ទរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធី។ \n\n សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម ពីព្រោះស្នាមម្រាមដែលបានបន្ថែមនឹងអាចធ្វើកិច្ចការទាំងនោះបាន។"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកអាចមានសុវត្ថិភាពតិចជាងលំនាំ ឬកូដ PIN ដែលរឹងមាំ។"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"ស្វែងយល់បន្ថែម"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកអាចមានសុវត្ថិភាពតិចជាលំនាំ ឬកូដ PIN រឹងមាំ។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"បោះបង់"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"បន្ត"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើថេប្លេតនេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើឧបករណ៍នេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃក្នុងការប្រើថេប្លេតនេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើឧបករណ៍នេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើទូរស័ព្ទនេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"រំលងទោះបីយ៉ាងណាក៏ដោយ"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"ថយ​ក្រោយ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ស្វែងរកឧបករណ៍ចាប់សញ្ញា"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ដាក់ឧបករណ៍ចាប់សញ្ញាស្នាមម្រាមដៃនៅខាងក្រោយទូរស័ព្ទរបស់អ្នក។"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"រូបភាពបង្ហាញទីតាំងឧបករណ៍ចាប់សញ្ញាស្នាមម្រាមដៃ"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"អ្នកអាចបន្ថែមស្នាមម្រាមដៃរហូតដល់ <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"យកស្នាមម្រាមដៃទាំងអស់ចេញ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"អ្នកនឹងមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក ផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីដោយប្រើពួកវាបានទេ។"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ការពារឧបករណ៍របស់អ្នក"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ដោះសោដោយប្រើស្នាមម្រាមដៃរបស់អ្នក"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ជ្រើស​ការ​ចាក់សោ​អេក្រង់"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"ជ្រើសការចាក់សោអេក្រង់"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ការពារទូរស័ព្ទរបស់អ្នក"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ស្នាមម្រាមដៃអាចមានសុវត្ថិភាពតិចជាលំនាំ កូដ PIN ឬពាក្យសម្ងាត់រឹងមាំ។ ដំឡើងអេក្រង់ចាក់សោបម្រុងដើម្បីឲ្យមានសុវត្ថិភាព។"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើថេប្លេតនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើឧបករណ៍នេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ជ្រើសរើសវិធីចាក់សោអេក្រង់បម្រុងទុក"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ចាក់សោ​អេក្រង់"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ប្ដូរ​ការ​ចាក់​សោ​អេក្រង់"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"សុវត្ថិភាព​ពី​មធ្យម​ទៅ​ខ្ពស់"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ពាក្យសម្ងាត់​"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"សុវត្ថិភាព​ខ្ពស់"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"មិនមែនឥឡូវទេ"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"ការចាក់សោអេក្រង់បច្ចុប្បន្ន"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ស្នាមម្រាមដៃ + លំនាំ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ស្នាមម្រាមដៃ + កូដ PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ពាក្យ​សម្ងាត់​ត្រូវ​មាន​យ៉ាង​ហោច​ណាស់ %d តួអក្សរ"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"កូដ PIN ត្រូវ​តែ​មាន​​យ៉ាង​ហោច​ណាស់ %d តួ​"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"ប៉ះដើម្បីបន្តនៅពេលរួចរាល់"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"បន្ត"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ពាក្យ​សម្ងាត់​ត្រូវ​តែ​តិច​ជាង <xliff:g id="NUMBER">%d</xliff:g> តួអក្សរ។"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"កូដ PIN ត្រូវ​តែ​​​មាន​លេខ​តិច​ជាង <xliff:g id="NUMBER">%d</xliff:g> ។"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(មិន​ផ្លាស់ប្ដូរ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"សូមជ្រើសរើស"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(បានបន្ថែមវិញ្ញាបនបត្រច្រើន)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"ប្រើវិញ្ញាបនបត្រប្រព័ន្ធ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"កុំផ្តល់"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"កុំបញ្ជាក់សុពលភាព"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"មិនមានវិញ្ញាបនបត្រដែលបានបញ្ជាក់ទេ។ ការតភ្ជាប់របស់អ្នកនឹងមិនមានលក្ខណៈឯកជនទេ។"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ត្រូវតែបញ្ជាក់ដែន"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS អាច​ប្រើ​បាន"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"បញ្ចូល​ពាក្យ​សម្ងាត់​បណ្ដាញ​របស់​អ្នក"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"បម្រុងទុកទិន្នន័យឧបករណ៍ដោយស្វ័យប្រវត្តិ (ដូចជាពាក្យសម្ងាត់ Wi-Fi និងប្រវត្តិការហៅទូរស័ព្ទ) និងទិន្នន័យកម្មវិធី (ដូចជាការកំណត់ និងឯកសារដែលបានផ្ទុកដោយកម្មវិធី) ពីចម្ងាយ។\n\nនៅពេលអ្នកបើកការបម្រុងទុកស្វ័យប្រវត្តិ ទិន្នន័យឧបករណ៍ និងកម្មវិធីនឹងត្រូវបានរក្សាទុកពីចម្ងាយជាទៀងទាត់។ ទិន្នន័យកម្មវិធីអាចជាទិន្នន័យណាដែលកម្មវិធីបានរក្សាទុក (ផ្អែកលើការកំណត់ផ្នែកអ្នកអភិវឌ្ឍន៍) រាប់បញ្ចូលទាំងទិន្នន័យដែលសំខាន់ខ្លាំង ដូចជាទំនាក់ទំនង សារ និងរូបថត។"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"កំណត់​ការ​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"កម្មវិធី​គ្រប់គ្រង​ឧបករណ៍"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"ធ្វើ​ឲ្យ​អសកម្ម"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"លុបការដំឡើង"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ធ្វើឲ្យអ្នកគ្រប់គ្រងឧបករណ៍នេះអសកម្ម"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"លុប​កម្មវិធី"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"លែងធ្វើឲ្យសកម្ម និងដោះការដំឡើង"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"អ្នក​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="no_device_admins" msgid="702695100241728775">"គ្មាន​អ្នក​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ផ្ទាល់ខ្លួន"</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="6246742476064507965">"ធ្វើ​ឲ្យ​កម្មវិធី​គ្រប់គ្រង​ឧបករណ៍សកម្ម?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"ធ្វើ​ឲ្យ​សកម្ម"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"ធ្វើឲ្យអ្នកគ្រប់គ្រងឧបករណ៍នេះសកម្ម"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"កម្មវិធី​គ្រប់គ្រង​ឧបករណ៍"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ការ​ធ្វើ​ឲ្យ​អ្នក​គ្រប់គ្រង​នេះ​សកម្ម​នឹង​អនុញ្ញាត​ឲ្យ​កម្មវិធី <xliff:g id="APP_NAME">%1$s</xliff:g> អនុវត្ត​ប្រតិបត្តិការ​ដូច​ខាង​ក្រោម៖"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"អ្នក​គ្រប់គ្រង​នេះ​សកម្ម និង​អនុញ្ញាត​ឲ្យ​កម្មវិធី <xliff:g id="APP_NAME">%1$s</xliff:g> អនុវត្ត​ប្រតិបត្តិការ​ដូច​ខាង​ក្រោម៖"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"បើកការហៅទូរស័ព្ទ &amp; សារ SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ប្រវត្តិ​ហៅ និង​សារ SMS នឹង​ត្រូវ​បាន​ចែករំលែក​ជា​មួយ​អ្នកប្រើ​នេះ។"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ព័ត៌មានបន្ទាន់"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"អាចចូលដំណើរការបានតាមរយៈអេក្រង់ជាប់សោក្នុងកម្មវិធីហៅបន្ទាន់"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"អាចចូលដំណើរការបានដោយអ្នកទាំងឡាយដែលស្ថិតក្នុងការហៅអាសន្នដោយមិនចាំបាច់ដោះសោទូរស័ព្ទរបស់អ្នក"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"អនុញ្ញាត​កម្មវិធី និង​មាតិកា"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"កម្មវិធី​មាន​ការ​ដាក់កម្រិត"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ពង្រីក​ការ​កំណត់​សម្រាប់​កម្មវិធី"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 34e5349..b3ae151 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD ಕಾರ್ಡ್ ಅನ್‌ಮೌಂಟ್‌ ಮಾಡಿ"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸು"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಅಳಿಸು"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"ಪರದೆಯ ಮೇಲೆ ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ."</string>
     <string name="small_font" msgid="2295331917424072635">"ಸಣ್ಣ"</string>
     <string name="medium_font" msgid="2068475425515133701">"ಮಧ್ಯಮ"</string>
     <string name="large_font" msgid="599055175160971446">"ದೊಡ್ಡದು"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳಿಗೆ ದೃಢೀಕರಣ ನೀಡಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ. \n\n ನೀವು ಯಾರ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸುತ್ತೀರಿ ಎಂಬ ಕುರಿತು ಎಚ್ಚರದಿಂದಿರಿ - ಸೇರಿಸಿದ ಯಾವುದೇ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳಿಗೆ ಇವುಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ಗಮನಿಸಿ: ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ನಮೂನೆ ಅಥವಾ ಪಿನ್‌ಗಿಂತ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ಗಮನಿಸಿ: ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ರದ್ದುಮಾಡು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ಮುಂದುವರಿಸು"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ. ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದು ಹೋದರೆ, ಕಳವಾದರೆ ಅಥವಾ ಅಳಿಸಿ ಹೋದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ, ಕಳವಾದರೆ ಅಥವಾ ಅಳಿಸಿ ಹೋದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ. ಈ ಫೋನ್ ಕಳೆದು ಹೋದರೆ, ಕಳವಾದರೆ ಅಥವಾ ಅಳಿಸಿ ಹೋದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ. ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ. ಈ ಫೋನ್ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"ಹೇಗಾದರೂ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"ಹಿಂದಿರುಗು"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ಸೆನ್ಸಾರ್ ಪತ್ತೆಹಚ್ಚಿ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಅನ್ನು ನಿಮ್ಮ ಫೋನ್ ಹಿಂಬದಿಯಲ್ಲಿ ಕಂಡುಹಿಡಿಯಿರಿ."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ಸಾಧನ ಮತ್ತು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಸ್ಥಳದೊಂದಿಗೆ ವಿವರಣೆ"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"ನೀವು <xliff:g id="COUNT">%d</xliff:g> ಫಿಂಗರ್‌‌ ಫ್ರಿಂಟ್‌‌ಗಳವರೆಗೂ ಸೇರಿಸಬಹುದು"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ಎಲ್ಲಾ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅದರ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ರಕ್ಷಿಸಿ"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ನಿಮ್ಮ ಫಿಂಗರ್‌‌ಫ್ರಿಂಟ್‌‌ನೊಂದಿಗೆ ಅನ್‌ಲಾಕ್ ಮಾಡಿ"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"ಪರದೆ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ಬಲವಾದ ಪ್ಯಾಟರ್ನ್, ಪಿನ್‌ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ಗಿಂತ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು. ಸುರಕ್ಷಿತವಾಗಿರಲು ಬ್ಯಾಕಪ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಹೊಂದಿಸಿ."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಸಾಧನವನ್ನು ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಫೋನ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಪರದೆ ಲಾಕ್ ವಿಧಾನವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ಪರದೆ ಲಾಕ್"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ಲಾಕ್ ಪರದೆಯನ್ನು ಬದಲಾಯಿಸು"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ಮಧ್ಯಮದಿಂದ ಅಧಿಕವರೆಗೆ ಭದ್ರತೆ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ಅಧಿಕ ಭದ್ರತೆ"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ಸದ್ಯಕ್ಕೆ ಬೇಡ"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"ಪ್ರಸ್ತುತ ಪರದೆ ಲಾಕ್"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ + ಪ್ಯಾಟರ್ನ್"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ + ಪಿನ್"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ಪಾಸ್‌ವರ್ಡ್‌ ಕನಿಷ್ಠ %d ಅಕ್ಷರಗಳಾಗಿರಬೇಕು"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ಪಿನ್‌ ಕನಿಷ್ಠ ಪಕ್ಷ %d ಅಂಕಿಗಳಾಗಿರಬೇಕು"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"ಮುಗಿದಾಗ ಮುಂದುವರಿಸು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ಮುಂದುವರಿಸು"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ಪಾಸ್‌ವರ್ಡ್‌ <xliff:g id="NUMBER">%d</xliff:g> ಗಿಂತ ಕಡಿಮೆ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ಪಿನ್‌ <xliff:g id="NUMBER">%d</xliff:g> ಗಿಂತ ಕಡಿಮೆ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ಬದಲಾವಣೆಯಾಗದ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"ದಯವಿಟ್ಟು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(ಬಹು ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"ಸಿಸ್ಟಮ್ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ಒದಗಿಸಬೇಡಿ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ಮೌಲ್ಯೀಕರಿಸಬೇಡಿ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ಯಾವುದೇ ಪ್ರಮಾಣಪತ್ರ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ. ನಿಮ್ಮ ಸಂಪರ್ಕವು ಖಾಸಗಿಯಾಗಿರುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ಡೊಮೇನ್ ನಿರ್ದಿಷ್ಟ ಪಡಿಸಬೇಕು."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ಲಭ್ಯವಿದೆ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ಲಭ್ಯವಿದೆ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್‌ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"ಆವರಿಸಿದ ಪರದೆ"</string>
     <string name="doze_summary" msgid="7128970177894383698">"ನೀವು ಸಾಧನವನ್ನು ಕೈಗೆತ್ತಿಕೊಂಡಾಗ ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಿದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಗೊಳಿಸು"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್ ಹೊಂದಿಸು"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"ಪ್ರವೇಶ ಲಭ್ಯತೆ"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ಪ್ರವೇಶಿಸುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ವಿಷನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"ನಿಮ್ಮ ಅಗತ್ಯಗಳಿಗೆ ಸರಿಹೊಂದುವಂತೆ ಈ ಸಾಧನವನ್ನು ನೀವು ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಈ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಂತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"ಸೇವೆಗಳು"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"ಸ್ಕ್ರೀನ್‌ರೀಡರ್ ಪ್ರಮುಖವಾಗಿ ದೃಷ್ಟಿಹೀನತೆ ಮತ್ತು ಕಡಿಮೆ ದೃಷ್ಟಿ ಹೊಂದಿರುವ ಜನರಿಗೆ ಆಗಿದೆ"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"ಸಿಸ್ಟಂ"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"ಪ್ರದರ್ಶನ"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"ಶೀರ್ಷಿಕೆಗಳು"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"ವರ್ಧನೆಯ ಗೆಸ್ಚರ್‌"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ಝೂಮ್ ಮಾಡಲು 3 ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"ಝೂಮ್ ಇನ್ ಮತ್ತು ಝೂಮ್ ಔಟ್ ಮಾಡಲು ಒಂದು ಬೆರಳಿನಿಂದ ಪರದೆಯನ್ನು 3 ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ.\n\nಝೂಮ್ ಇನ್ ಮಾಡಿದಾಗ, ನೀವು:\n"<ul>\n<li>" ಸ್ಕ್ರಾಲ್ ಮಾಡಬಹುದು: ಪರದೆಯಗಲಕ್ಕೂ 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಮಟ್ಟವನ್ನು ಹೊಂದಿಸಿ: ಒಟ್ಟಿಗೆ 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳನ್ನು ಪಿಂಚ್ ಮಾಡಿ ಅಥವಾ ಅವುಗಳನ್ನು ಬೇರೆ ಬೇರೆಯಾಗಿ ವಿಭಜಿಸಿ"</li></ul>\n\n"ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಮಾಡಲು, 3 ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಕೊನೆಯ ಟ್ಯಾಪ್ ಮೇಲೆ ಹೋಲ್ಡ್ ಮಾಡಿ. ನಿಮ್ಮ ಬೆರಳನ್ನು ಕೆಳಗೆ ಹಿಡಿದುಕೊಳ್ಳುವಾಗ, ಪರದೆಯ ಎಲ್ಲೆಡೆ ಸಂಚರಿಸಲು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ. ಹಿಂದಕ್ಕೆ ಝೂಮ್ ಔಟ್ ಮಾಡಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಮೇಲಕ್ಕೆತ್ತಿ.\n\n ಗಮನಿಸಿ: ವರ್ಧನೆಯ ಗೆಸ್ಚರ್ ಕೀಬೋರ್ಡ್ ಮತ್ತು ನ್ಯಾವಿಗೇಶನ್ ಬಾರ್ ಹೊರತುಪಡಿಸಿ ಎಲ್ಲೆಡೆಯೂ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ಪ್ರವೇಶ ಶಾರ್ಟ್‌ಕಟ್‌"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"ಆನ್"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ಆಫ್"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"ಸಾಧನ ಡೇಟಾ (Wi-Fi ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸದಂತಹವು) ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು (ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಸಂಗ್ರಹಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಫೈಲ್‌ಗಳಂತಹವು) ರಿಮೋಟ್ ಮೂಲಕ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬ್ಯಾಕಪ್ ಮಾಡಿ.\n\nನೀವು ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ಸಾಧನ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ರಿಮೋಟ್ ಮೂಲಕ ನಿಯತಕಾಲಿಕವಾಗಿ ಉಳಿಸಲಾಗುವುದು. ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಎಂದರೆ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಕ ಉಳಿಸಲಾಗಿರುವ (ಡೆವಲಪರ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಆಧರಿಸಿ) ಯಾವುದೇ ಡೇಟಾ ಆಗಿರಬಹುದು. ಇದು ಸಂಪರ್ಕಗಳು, ಸಂದೇಶಗಳು ಮತ್ತು ಫೋಟೋಗಳಂತಹ ಸಂಭವನೀಯ ಸೂಕ್ಷ್ಮ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"ಸಾಧನದ ನಿರ್ವಹಣೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"ಸಾಧನ ನಿರ್ವಾಹಕ"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"ಅಸ್ಥಾಪಿಸು"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ಈ ಸಾಧನ ನಿರ್ವಾಹಕರನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ಅಪ್ಲಿಕೇಶನ್ ಅಸ್ಥಾಪಿಸಿ"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಮತ್ತು ಅಸ್ಥಾಪಿಸಿ"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"ಸಾಧನ ನಿರ್ವಾಹಕಗಳು"</string>
     <string name="no_device_admins" msgid="702695100241728775">"ಯಾವುದೇ ಲಭ್ಯವಿರುವ ಸಾಧನ ನಿರ್ವಾಹಕಗಳು ಇಲ್ಲ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ವೈಯಕ್ತಿಕ"</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="6246742476064507965">"ಸಾಧನ ನಿರ್ವಾಹಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"ಕ್ರಿಯಾತ್ಮಕಗೊಳಿಸು"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"ಈ ಸಾಧನ ನಿರ್ವಾಹಕರನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"ಸಾಧನ ನಿರ್ವಾಹಕ"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ಈ ನಿರ್ವಾಹಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಈ ಕೆಳಗಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ಈ ನಿರ್ವಾಹಕವು ಸಕ್ರಿಯವಾಗಿದೆ ಮತ್ತು ಈ ಕೆಳಗಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ಫೋನ್ ಕರೆಗಳು &amp; SMS ಆನ್ ಮಾಡುವುದೇ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ಕರೆ ಮತ್ತು SMS ಇತಿಹಾಸವನ್ನು ಈ ಬಳಕೆದಾರರ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತದೆ."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ತುರ್ತು ಮಾಹಿತಿ"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"ತುರ್ತುಪರಿಸ್ಥಿತಿ ಡಯಲರ್‌ನಲ್ಲಿ ಲಾಕ್ ಪರದೆಯ ಮೂಲಕ ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡದೆಯೇ ತುರ್ತು ಡಯಲರ್‌ನ ಯಾರಾದರೂ ಪ್ರವೇಶಿಸಬಹುದು"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ಅಪ್ಲಿಕೇಶನ್‌‌ಗಳು ಮತ್ತು ವಿಷಯವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ನಿರ್ಬಂಧಗಳೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ಅಪ್ಲಿಕೇಶನ್‌ಗಾಗಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ವಿಸ್ತರಿಸಿ"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ವರೆಗೆ ಮಾತ್ರ ಅಲಾರಮ್‌ಗಳಲ್ಲಿ ಬದಲಾವಣೆ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ಯಾವಾಗಲೂ ಅಡಚಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"ಪರದೆ ಆನ್ ಆಗಿರುವಾಗ ನಿರ್ಬಂಧಿಸಿ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"ಪರದೆಯ ಮೇಲೆ ಇಣುಕು ನೋಟ ಅಥವಾ ಪಾಪ್ ಮಾಡುವುದರಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದಗೊಳಿಸಿದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ ನಿರ್ಬಂಧಿಸಿ"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"ಪರದೆ ಆನ್ ಮಾಡಿ ಅಥವಾ ಅಧಿಸೂಚನೆ ಲೈಟ್‌ ಅನ್ನು ಪಲ್ಸ್ ಮಾಡುವುದರಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದ ಮಾಡಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ಆಫ್"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"ಪರದೆ ಆನ್ ಆಗಿರುವಾಗ"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ಪರದೆ ಆನ್ ಅಥವಾ ಆಫ್ ಆಗಿರುವಾಗ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"ನಿರ್ವಾಹಕರ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ನಿಮ್ಮ ಮಣಿಕಟ್ಟನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸುವ ಮೂಲಕ ಕ್ಯಾಮರಾ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ಕ್ಯಾಮರಾಗೆ ಪವರ್ ಬಟನ್ ಎರಡು ಬಾರಿ ಒತ್ತಿ"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡದೆಯೇ ಕ್ಯಾಮರಾವನ್ನು ತ್ವರಿತವಾಗಿ ತೆರೆಯಿರಿ"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"ಪ್ರದರ್ಶನ ಗಾತ್ರ"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"ಐಟಂಗಳನ್ನು ಪರದೆಯ ಮೇಲೆ ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ಸಾಂದ್ರತೆ, ಪರದೆ ಝೂಮ್, ಅಳತೆ, ಅಳತೆಯ ಪ್ರಮಾಣವನ್ನು ಪ್ರದರ್ಶಿಸಿ"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"ಪರದೆಯ ಮೇಲಿನ ಐಟಂಗಳನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದಾಗಿ ಮಾಡಿ. ನಿಮ್ಮ ಪರದೆಯ ಮೇಲಿರುವ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"ಚಿಕ್ಕದಾಗಿಸು"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"ದೊಡ್ಡದಾಗಿಸು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8145f87..c606892 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"지문 센서를 터치하기만 하면 휴대전화를 잠금 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 있습니다. \n\n 누구의 지문을 추가할지 신중하게 결정하세요. 추가된 모든 지문으로 이러한 작업을 수행할 수 있습니다."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"참고: 지문은 강력한 패턴 또는 PIN보다 보안이 취약합니다."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"자세히 알아보기"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"참고: 지문은 강력한 패턴 또는 PIN보다 안전하지 못합니다. "<annotation id="url">"자세히 알아보기"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"취소"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"계속"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"기기 보호 기능이 활성화되지 않습니다. 태블릿을 분실 또는 도난당했거나 삭제된 경우 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"기기 보호 기능이 활성화되지 않습니다. 기기가 분실, 도난 또는 삭제되는 경우 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"기기 보호 기능이 활성화되지 않습니다. 스마트폰이 분실, 도난 또는 삭제되는 경우 다른 사람이 이 스마트폰을 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"기기 보호 기능이 활성화되지 않습니다. 태블릿을 분실하거나 도난당했을 때 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"기기 보호 기능이 활성화되지 않습니다. 기기를 분실하거나 도난당했을 때 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"기기 보호 기능이 활성화되지 않습니다. 스마트폰을 분실하거나 도난당했을 때 다른 사람이 이 스마트폰을 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"건너뛰기"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"뒤로 이동"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"센서 찾기"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"휴대전화 뒷면에 있는 지문 센서를 찾으세요."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"기기와 지문 센서 위치가 포함된 그림"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"지문을 <xliff:g id="COUNT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"모든 지문을 삭제할까요?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"지문을 사용하여 휴대전화를 잠금 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"기기 보호"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"지문으로 잠금 해제"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"화면 잠금 선택"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"화면 잠금 선택"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"휴대전화 보호"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"지문은 강력한 패턴, PIN, 비밀번호보다 안전하지 못합니다. 보안을 유지하려면 백업 잠금 화면을 설정하세요."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 태블릿을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 기기를 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 스마트폰을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"백업 화면 잠금 방식 선택"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"화면 잠금"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"화면 잠금 변경"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"중상급 보안"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"비밀번호"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"상급 보안"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"나중에"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"현재 화면 잠금"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"지문 + 패턴"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"지문 + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"비밀번호는 %d자 이상이어야 합니다."</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN은 %d자리 이상이어야 합니다."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"완료되면 계속을 탭하세요."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"계속"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"비밀번호는 <xliff:g id="NUMBER">%d</xliff:g>자 미만이어야 합니다."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN은 <xliff:g id="NUMBER">%d</xliff:g>자 미만이어야 합니다."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(변경 안함)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"선택하세요."</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(여러 인증서가 추가됨)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"시스템 인증 사용"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"제공하지 않음"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"확인하지 않음"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"지정한 인증서가 없습니다. 비공개로 연결되지 않습니다."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"도메인을 지정해야 합니다."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS 사용 가능"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"네트워크 비밀번호 입력"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"기기 데이터(예: Wi-Fi 비밀번호, 통화 기록)와 앱 데이터(예: 앱에서 저장한 설정 및 파일)를 원격으로 자동 백업합니다.\n\n자동 백업을 사용하도록 설정하면 기기 및 앱 데이터가 정기적으로 원격 저장됩니다. 앱 데이터는 연락처, 메시지, 사진과 같은 민감한 데이터를 포함하여 개발자 설정에 따라 앱에서 저장한 모든 데이터가 해당될 수 있습니다."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"기기 관리 설정"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"기기 관리자"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"비활성화"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"제거"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"이 기기 관리자를 비활성화"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"애플리케이션 제거"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"비활성화 및 제거"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"기기 관리자"</string>
     <string name="no_device_admins" msgid="702695100241728775">"사용할 수 있는 기기 관리자가 없습니다."</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"개인"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"직장"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"사용 가능한 Trust Agent 없음"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"기기 관리자 활성화"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"활성화"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"이 기기 관리자를 활성화"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"기기 관리자"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"관리자를 활성화하면 <xliff:g id="APP_NAME">%1$s</xliff:g> 앱에서 다음 작업을 수행할 수 있습니다."</string>
     <string name="device_admin_status" msgid="4252975713178851910">"관리자가 활성 상태이며 <xliff:g id="APP_NAME">%1$s</xliff:g> 앱에서 다음 작업을 수행할 수 있도록 허용합니다."</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"통화 및 SMS 기능을 사용하시겠습니까?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"통화 및 SMS 기록이 이 사용자와 공유됩니다."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"긴급 상황 정보"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"긴급 다이얼러에서 잠금 화면을 통해 액세스할 수 있음"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"스마트폰을 잠금 해제하지 않고 긴급 다이얼러에서 누구나 액세스 가능"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 7b20572..1707f15 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD карта ажыратылсын"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB сактагычты тазалоо"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD картаны тазалоо"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Экрандагы текстти кичирейтип же чоңойтуңуз."</string>
     <string name="small_font" msgid="2295331917424072635">"Кичине"</string>
     <string name="medium_font" msgid="2068475425515133701">"Орточо"</string>
     <string name="large_font" msgid="599055175160971446">"Чоң"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. \n\n Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз – манжа изи кошулган колдонуучулардын бардыгы бул нерселерди аткара алышат."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Эскертүү: Манжа издерине караганда сүрөт ачкыч же PIN-код кыйла коопсузураак."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Көбүрөөк билүү"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Эскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз. "<annotation id="url">"Көбүрөөк билүү"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Жокко чыгаруу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Улантуу"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Ал жоголуп же уурдалып кетсе же анын ичиндеги дайындар өчүрүлсө, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Ал жоголуп же уурдалып кетсе же анын ичиндеги дайындар өчүрүлсө, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Ал жоголуп же уурдалып кетсе же анын ичиндеги дайындар өчүрүлсө, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Планшет жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Түзмөк жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Телефон жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Өткөрүп жиберүү"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Артка баруу"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Сенсорду табуу"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Манжа изинин сенсорун телефонуңуздун артына жайгаштырыңыз."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Түзмөк жана манжа изи сенсорунун жайгашкан жери менен сүрөттөмө"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> чейин манжа изин кошсоңуз болот"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Бардык манжа издери алынып салнснб?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Манжа издериңиз менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же каттоо эсебине кире албай каласыз."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Түзмөгүңүздү коргоңуз"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Манжа изиңиз менен кулпусун ачыңыз"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Экран бекитүүнү тандоо"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Экран кулпусун тандоо"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Телефонуңузду коргоңуз"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Эскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч, PIN код же сырсөз менен коргоо бир кыйла коопсуз. Коопсуздук үчүн экран кулпусунун камдык көчүрмөсүн жөндөп коюңуз."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул планшетти сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул түзмөктү сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул телефонду сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Экранды кулпулоонун көмөкчү ыкмасын тандаңыз"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Бөгөттөөчү көшөгө"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Бөгөттөөчү көшөгөнү алмаштыруу"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Коопсуздугу ортодон жогору"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Сырсөз"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Коопсуздугу жогору"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Азыр эмес"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Учурдагы экран кулпусу"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Манжа изи + Графикалык ачкыч"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Манжа изи + PIN код"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Кулпн ачуу срсзн өзгрт"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Сырсөз кеминде %d белгиден турушу керек"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN\'де кеминде %d сан болушу керек"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Бүткөндөн кийин \"Улантууну\" таптаңыз"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Улантуу"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Сырсөз <xliff:g id="NUMBER">%d</xliff:g> белгиден кыска болушу керек."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN\'де <xliff:g id="NUMBER">%d</xliff:g> аз сан болушу керек."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(өзгөрбөгөн)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Тандаңыз"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Бир нече тастыктама кошулду)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Тутумдун тастыктамаларын көрсөтүү"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Берилбесин"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Күчүнө киргизилбесин"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Эч тастыктама көрсөтүлгөн жок. Туташууңуз купуя болбойт."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Домен көрсөтүлүшү керек."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS жеткиликтүү"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS жеткиликтүү)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Тармактагы сырсөзүңүздү киргизиңиз"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Градиент дисплейи"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Түзмөк көтөрүлгөндө же эскертмелер алынганда экран ойгонсун"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Арип өлчөмү"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Текстти чоңойтуп же кичирейтиңиз"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM карта кулпусунун жөндөөлөрү"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM карта кулпусун жөндөө"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM карта кулпусу"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Атайын мүмкүнчүлүктөр"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Атайын мүмкүнчүлүктөрдүн жөндөөлөрү"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Көрүү мүмкүнчүлүгүнүн жөндөөлөрү"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Бул түзмөктү өз талаптарыңызга жараша ыңгайлаштырып алсаңыз болот. Бул атайын мүмкүнчүлүктөрдү кийинчерээк Жөндөөлөрдөн өзгөртсө болот."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Кызматтар"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Экран окугуч негизинен сокур жана көзү начар көргөн адамдар үчүн чыгарылган"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Дисплей"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Субтитрлер"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Чоңойтуучу жаңсоо"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Өлчөмүн өзгөртүү үчүн 3 жолу таптаңыз"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Бул функция менен экранды 3 жолу таптап көрүнүштү чоңойтуп-кичирейте аласыз.\n\nКөрүнүш чоңоюп турганда төмөнкү аракеттерди жасай аласыз:\n"<ul>\n<li>"Сыдыруу: Бир нече манжаңыз менен экранды сүрүңүз"</li>\n<li>"Көрүнүштү чоңойтуу/кичирейтүү: Экранды чымчыңыз же манжаларыңызды ажыратыңыз"</li></ul>\n\n"Белгилүү бир жерлерди убактылуу чоңойтуу үчүн экранды 3 жолу таптап, кармап туруңуз. Мурунку көлөмгө кайтуу үчүн манжаңызды көтөрүңүз.\n\nЭскертүү: Чоңойтуу жаңсоолору баскычтопто жана чабыттоо тилкесинде иштебейт."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Жеткиликтүүлүк тез чакырмалары"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Жандырылган"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Өчүрүлгөн"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсүн алыстан автоматтык түрдө сактоо.\n\nКамдык көчүрмөнү автоматтык түрдө сактоо мүмкүнчүлүгү иштетилгенде, түзмөктүн жана колдонмонун дайындары маалы менен автоматтык түрдө сакталып турат. Иштеп чыгуучунун жөндөөлөрүнө ылайык колдонмодо сакталган дайындарда байланыштар, билдирүүлөр, сүрөттөр сыяктуу купуя маалыматтар камтылышы мүмкүн."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Түзмөктү администрациялоонун жөндөөлөрү"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Түзмөктүн администратору"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Өчүрүү"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Чыгарып салуу"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Бул түзмөктүн администраторун өчүрүү"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Колдонмону чыгарып салуу"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Өчүрүү жана чыгарып салуу"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Түзмөктүн администраторлору"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Жеткиликтүү түзмөк администраторлору жок"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Жеке"</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="6246742476064507965">"Түзмөктүн администратору жандырылсынбы?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Жандыруу"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Бул түзмөктүн администраторун жандыруу"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Түзмөктүн администратору"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Бул администраторду жандыруу <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна кийинки амалдарды аткарууга уруксат берет:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Бул администратор иштеп турат жана <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна кийинки амалдарды аткарууга уруксат берет:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Телефон чалуулары менен &amp; SMS иштетлснби?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Чалуу жана SMS таржымалы бул колдонуучу менен бөлүшүлөт."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Шашылыш кырдаал жөнүндө маалымат"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Шашылыш чалуу режиминде кулпуланган экранда көрүнөт"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Өзгөчө кырдаалдагы тергич аркылуу каалаган адам телефонуңуздун кулпусун ачпастан кире берет"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Колдонмолорго жана мазмунга уруксат"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Чектелген колдонмолор"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Колдонмонун тууралоолорун ачуу"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> чейин \"Ойготкучтар гана\" режимин иштетүү"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Экран күйүп турганда бөгөттөлсүн"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\"Тынчымды албагыла\" режиминде эскертмелер тууралуу маалымат экранда көрсөтүлбөйт же калкып чыкпайт"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Экран өчүп турганда бөгөттөлсүн"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\"Тынчымды албагыла\" режиминде бөгөттөлгөн эскертмелер алынганда экран же жарык индикатору күйбөсүн"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Өчүк"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Экран күйүп турганда"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Экран өчүп турганда"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Экран күйүп же өчүп турганда"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Администратор PIN\'ин киргиңиз"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Колуңузду эки айлантып, камера колдонмосун ачыңыз"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера үчүн кубат баскычын эки басыңыз"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Камераны экраныңыздын кулпусун ачпастан, тез эле ачып алыңыз"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Көрсөтүлүүчү өлчөмү"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Экрандагы нерселерди чоңойтуп же кичирейтиңиз"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"дисплей тыгыздыгы, экранды чоңойтуу, шкла, шкалалоо"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Экраныңыздагы нерселерди кичирейтип же чоңойтуңуз. Экраныңыздагы айрым колдонмолордун орду өзгөрүшү мүмкүн."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Алдын ала көрүү"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Кичирээк кылуу"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Чоңураак кылуу"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6ea5ae7..d2220de 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"ພຽງແຕ່ສຳຜັດເຊັນເຊີລາຍນິ້ວມືເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸຍາດການຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບ. \n\n ຈົ່ງລະມັດລະວັງລາຍນິ້ວມືໃຜແດ່ທີ່ທ່ານເພີ່ມເຂົ້າ - ທຸກລາຍນິ້ວມືທີ່ເພີ່ມເຂົ້າຈະສາມາດເຮັດສິ່ງເຫຼົ່ານີ້ໄດ້."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ໝາຍເຫດ: ການໃຊ້ລາຍນິ້ວມືຂອງທ່ານອາດຈະປອດໄພນ້ອຍກວ່າການໃຊ້ແບບຮູ້ ຫຼື PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"ຮຽນຮູ້ເພີ່ມ​ເຕີມ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ໝາຍເຫດ: ລາຍນິ້ວມືຂອງທ່ານອາດຈະມີຄວາມປອດໄພໜ້ອຍກວ່າການໃຊ້ຮູບແບບ ຫຼື PIN ທີ່ເດົາຍາກ. "<annotation id="url">"ຮຽນຮູ້ເພີ່ມເຕີມ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"​ຍົກ​ເລີກ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"​ສືບ​ຕໍ່"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອ​ນ​ຈະ​ບໍ່​ຖືກ​ເປີດ​ນຳ​ໃຊ້. ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ປ້ອງ​ກັນບໍ່ໃຫ້ຄົນ​ອື່ນ​​ໃຊ້​ແທັບເລັດ​ນີ້​ໄດ້ ຖ້າ​ມັນ​ເສຍ​ໄປ, ຖືກ​ລັກ ຫຼື​ ຖືກ​ລ້າງ​ເຄື່ອງ."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອ​ນ​ຈະ​ບໍ່​ຖືກ​ເປີດ​ນຳ​ໃຊ້. ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ປ້ອງ​ກັນບໍ່ໃຫ້ຄົນ​ອື່ນ​​ໃຊ້​ອຸ​ປະ​ກອນ​ນີ້​ໄດ້ ຖ້າ​ມັນ​ເສຍ​ໄປ, ຖືກ​ລັກ ຫຼື​ ຖືກ​ລ້າງ​ເຄື່ອງ."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອ​ນ​ຈະ​ບໍ່​ຖືກ​ເປີດ​ນຳ​ໃຊ້. ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ປ້ອງ​ກັນບໍ່ໃຫ້ຄົນ​ອື່ນ​​ໃຊ້​ໂທລະສັບ​ນີ້​ໄດ້ ຖ້າ​ມັນ​ເສຍ​ໄປ, ຖືກ​ລັກ ຫຼື​ ຖືກ​ລ້າງ​ເຄື່ອງ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ຖືກເປີດນຳໃຊ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໄດ້ ຖ້າມັນເສຍ ຫຼືຖືກລັກ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ຖືກເປີດນຳໃຊ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໄດ້ ຖ້າມັນເສຍ ຫຼືຖືກລັກ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ຖືກເປີດນຳໃຊ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໄດ້ ຖ້າມັນເສຍ ຫຼືຖືກລັກ."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"ແນວ​ໃດ​ກໍ​ຂ້າມ​ໄປ"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"​ກັບ​ຄືນ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ຊອກ​ຫາ​ເຊັນ​ເຊີ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ຊອກ​ເຊັນ​ເຊີກວດຈັບ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ຢູ່​ດ້ານ​ຫຼັງ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ການ​ອະ​ທິ​ບາຍ​ປະ​ກອບ​ດ້ວຍ​ທີ່​ຕັ້ງ​ເຊັນ​ເຊີ​ອຸ​ປະ​ກອນ ແລະ​ລາຍ​ນີ້ວ​ມື"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"ທ່ານ​ສາ​ມາດ​ເພີ່ມ​ບໍ່ເກີນ <xliff:g id="COUNT">%d</xliff:g> ລາຍ​ນີ້ວ​ມື​"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ເອົາ​ທຸກ​ລາຍ​ນີ້ວ​ມື​ອອກ​ໄປ​ບໍ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ ເພື່ອ​ປົດ​ລັອກ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ, ໃຫ້​ສິດ​ການ​ຊື້, ຫຼື ເຂົ້າ​ສູ່​ລະ​ບົບ​ຫາ​ແອັບ​ຂອງ​ພວກ​ມັນ​ໄດ້."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ປົກປ້ອງອຸປະກອນຂອງທ່ານ"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ປົດລັອກດ້ວຍລາຍນິ້ວມືຂອງທ່ານ"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ເລືອກການລັອກໜ້າຈໍ"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"ເລືອກການລັອກໜ້າຈໍ"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ປົກ​ປ້ອງ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ລາຍນິ້ວມືອາດຈະມີຄວາມປອດໄພໜ້ອຍກວ່າການໃຊ້ຮູບແບບ, PIN ຫຼື ລະຫັດຜ່ານທີ່ເດົາຍາກ. ໃຫ້ຕັ້ງໜ້າຈໍລັອກສຳຮອງໄວ້ເພື່ອຄວາມປອດໄພ."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ເລືອກວິ​ທີ​ລັອກ​ໜ້າ​ຈໍ​ການ​ສຳ​ຮອງ​ຂອງ​ທ່ານ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ການລັອກໜ້າຈໍ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ປ່ຽນໜ້າຈໍລັອກ"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ຄວາມປອດໄພລະດັບປານກາງຫາສູງ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ລະຫັດຜ່ານ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ຄວາມ​ປອດ​ໄພ​ສູງ​"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ບໍ່​ແມ່ນ​ຕອນ​ນີ້"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"ລັອກ​ໜ້າ​ຈໍ​ປະ​ຈຸ​ບັນ"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ລາຍນິ້ວມື + ຮູບແບບ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ລາຍນິ້ວມື + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ປ່ຽນລະຫັດປົດລັອກ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ລະຫັດຜ່ານຕ້ອງມີໂຕອັກສອນຢ່າງໜ້ອຍ %d ໂຕ"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ລະຫັດ PIN ຕ້ອງມີຢ່າງໜ້ອຍ %d ໂຕເລກ"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"ແຕະ ສືບຕໍ່ ເມື່ອສຳເລັດແລ້ວ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ດຳເນີນການຕໍ່"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ລະຫັດຜ່ານຕ້ອງໜ້ອຍກວ່າ <xliff:g id="NUMBER">%d</xliff:g> ໂຕອັກສອນ."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ລະຫັດ PIN ຕ້ອງມີໜ້ອຍກວ່າ <xliff:g id="NUMBER">%d</xliff:g> ໂຕເລກ."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ບໍ່ມີການປ່ຽນແປງ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"ກະລຸນາເລືອກ"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(ເພີ່ມຫຼາຍໃບຢັ້ງຢືນແລ້ວ)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"ໃຊ້ໃບຢັ້ງຢືນຂອງລະບົບ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ບໍ່ໃຫ້"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ບໍ່ກວດຮັບຮອງ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ບໍ່ໄດ້ລະບຸໃບຢັ້ງຢືນໃດໆ. ການເຊື່ອມຕໍ່ຂອງທ່ານຈະບໍ່ເປັນສ່ວນຕົວ."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ຕ້ອງລະບຸໂດເມນ."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ສາມາດໃຊ້ WPS ໄດ້"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ໃສ່​ລະຫັດ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ"</string>
@@ -1597,7 +1608,7 @@
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"ຄຳບັນຍາຍ"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"ທ່າທາງການຂະຫຍາຍໜ້າຈໍ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ແຕະ 3 ຄັ້ງເພື່ອຊູມ"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"ເພື່ອຊູມເຂົ້າ ແລະ ຊູມອອກ ໃຫ້ແຕະໜ້າຈໍ 3 ຄັ້ງດ້ວຍໜຶ່ງນີ້ວມື.\n\nໃນຂະນະທີ່ຊູມເຂົ້າ, ທ່ານສາມາດ:\n"<ul>\n<li>"ເລື່ອນ: ລາກ 2 ຫຼື ຫຼາຍນິ້ວມືຜ່ານໜ້າຈໍ"</li>\n<li>"ປັບລະດັບການຊູມ: ຢິບ 2 ຫຼື ຫຼາຍນິ້ວມືເຂົ້າກັນ ຫຼື ແຜ່ພວກມັນອອກ"</li></ul>\n\n"ເພື່ອຊູມຊົ່ວຄາວ, ໃຫ້ແຕະ 3 ຄັ້ງ ແລະຄ້າງໄວ້ໃນການແຕະຄັ້ງສຸດທ້າຍ. ໃນຂະນະທີ່ຄ້າງນິ້ວມືຂອງທ່ານໄວ້, ໃຫ້ລາກເພື່ອຍ້າຍໄປມາໃນໜ້າຈໍ. ຍົກນິ້ວມືຂອງທ່ານຂຶ້ນເພື່ອຊູມອອກຄືນ.\n\nໝາຍເຫດ: ທ່າທາງການຂະຫຍາຍໜ້າຈໍໃຊ້ໄດ້ຢູ່ທຸກບ່ອນ ຍົກເວັ້ນແປ້ນພິມ ແລະ ແຖບການນຳທາງ."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"ເພື່ອຊູມເຂົ້າ ແລະ ຊູມອອກ ໃຫ້ແຕະໜ້າຈໍ 3 ຄັ້ງດ້ວຍໜຶ່ງນິ້ວມື.\n\nໃນຂະນະທີ່ຊູມເຂົ້າ, ທ່ານສາມາດ:\n"<ul>\n<li>"ເລື່ອນ: ລາກ 2 ຫຼື ຫຼາຍນິ້ວມືຜ່ານໜ້າຈໍ"</li>\n<li>"ປັບລະດັບການຊູມ: ຢິບ 2 ຫຼື ຫຼາຍນິ້ວມືເຂົ້າກັນ ຫຼື ແຜ່ພວກມັນອອກ"</li></ul>\n\n"ເພື່ອຊູມຊົ່ວຄາວ, ໃຫ້ແຕະ 3 ຄັ້ງ ແລະຄ້າງໄວ້ໃນການແຕະຄັ້ງສຸດທ້າຍ. ໃນຂະນະທີ່ຄ້າງນິ້ວມືຂອງທ່ານໄວ້, ໃຫ້ລາກເພື່ອຍ້າຍໄປມາໃນໜ້າຈໍ. ຍົກນິ້ວມືຂອງທ່ານຂຶ້ນເພື່ອຊູມອອກຄືນ.\n\nໝາຍເຫດ: ທ່າທາງການຂະຫຍາຍໜ້າຈໍໃຊ້ໄດ້ຢູ່ທຸກບ່ອນ ຍົກເວັ້ນແປ້ນພິມ ແລະ ແຖບການນຳທາງ."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ທາງລັດສຳລັບການເຂົ້າເຖິງ"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"ເປີດ"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ປິດ"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"ສຳ​ຮອງ​ຂໍ້​ມູນ​ອຸ​ປະ​ກອນໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ (ເຊັ່ນ ລະ​ຫັດ​ຜ່ານ Wi-Fi ແລະ​ປະ​ຫວັດ​ການ​ໂທ) ແລະ​ຂໍ້​ມູນ​ແອັບ (ເຊັ່ນ ການ​ຕັ້ງ​ຄ່າ ແລະ ໄຟ​ລ໌​ທີ່​ແອັບ​ເກັບ​ໄວ້) ໂດຍ​ທາງ​ໄກ.\n\nເມື່ອ​ທ່ານ​ເປີດ​ການ​ສຳ​ຮອງ​ອັດ​ຕະ​ໂນ​ມັດ, ຂໍ້​ມູນ​ອຸ​ປະ​ກອນ ແລະ​ແອັບຈະ​ຖືກ​ບັນ​ທຶກ​ເປັນ​ໄລ​ຍະ​ໂດຍ​ທາງ​ໄກ. ຂໍ້​ມູນ​ແອັບ​ສາ​ມາດ​ເປັນ​ຂໍ້​ມູນ​ໃດ​ໜຶ່ງ​ທີ່​ແອັບ​ບັນ​ທຶກ​ໄວ້ (ອີງ​ຕາມ​ການ​ຕັ້ງ​ຄ່າ​ຜູ້​ພັດ​ທະ​ນາ), ລວມ​ທັງ​ຂໍ້​ມູນ​ທີ່​ອາດ​ຈະ​ລະ​ອຽດ​ອ່ອນ​ເຊັ່ນ: ລາຍ​ຊື່, ຂໍ້​ຄວາມ, ແລະ​ຮູບ."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"ການຕັ້ງຄ່າການເບິ່ງແຍງອຸປະກອນ"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"ຜູ່ເບິ່ງແຍງອຸປະກອນ"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"ປິດການນຳໃຊ້"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"ຖອນການຕິດຕັ້ງ"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ປິດນຳໃຊ້ຜູ້ເບິ່ງແຍງລະບົບຂອງອຸປະກອນນີ້"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ຖອນຕິດຕັ້ງແອັບ"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"ປິດນຳໃຊ້ ແລະ ຖອນຕິດຕັ້ງ"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"ຜູ່ເບິ່ງແຍງລະບົບອຸປະກອນ"</string>
     <string name="no_device_admins" msgid="702695100241728775">"ບໍ່ມີຜູ່ເບິ່ງແຍງລະບົບອຸປະກອນ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"​ສ່ວນ​ໂຕ"</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="6246742476064507965">"ເປີດນຳໃຊ້ຜູ່ເບິ່ງແຍງລະບົບຂອງອຸປະກອນ?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"ເປິດນຳໃຊ້"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"ເປີດນຳໃຊ້ຜູ້ເບິ່ງແຍງລະບົບຂອງອຸປະກອນນີ້"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"ຜູ່ເບິ່ງແຍງລະບົບອຸປະກອນ"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ການເປີດນຳໃຊ້ຜູ່ເບິ່ງແຍງລະບົບນີ້ ຈະອະນຸຍາດໃຫ້ <xliff:g id="APP_NAME">%1$s</xliff:g> ສາມາດດຳເນີນການຕໍ່ໄປນີ້ໄດ້:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ຜູ່ເບິ່ງແຍງລະບົບນີ້ຍັງເຮັດວຽກຢູ່ ແລະອະນຸຍາດໃຫ້ແອັບຯ <xliff:g id="APP_NAME">%1$s</xliff:g> ເຮັດສິ່ງຕໍ່ໄປນີ້ໄດ້:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ເປີດ​ໂທ​ລະ​ສັບ &amp; SMS ບໍ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ປະ​ຫວັດ​ການ​ໂທ​ ແລະ​ການ​ສົ່ງ SMS ຈະ​ຖືກ​ແບ່ງ​ປັນ​ໃຫ້​ກັບ​ຜູ່​ໃຊ້​ນີ້."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ຂໍ້ມູນສຸກເສີນ"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"ເຂົ້າເຖິງໄດ້ຜ່ານໜ້າຈໍລັອກໃນຕົວໂທອອກສຸກເສີນ"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"ທຸກຄົນສາມາດເຂົ້າເຖິງໄດ້ຈາກແປ້ນໂທສຸກເສີນໂດຍບໍ່ຕ້ອງປົດລັອກໂທລະສັບຂອງທ່ານ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ອະນຸຍາດແອັບຯ ແລະເນື້ອຫາ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ແອັບພລິເຄຊັນທີ່ມີຂໍ້ຈຳກັດ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ຂະຫຍາຍການຕັ້ງຄ່າສຳລັບແອັບພລິເຄຊັນ"</string>
@@ -2577,7 +2589,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ປ່ຽນ​ເປັນ​ຂັດ​ຈັງ​ຫວະ​ທຸກ​ຄັ້ງ"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"ບລັອກໄວ້ ເມື່ອໜ້າຈໍເປີດຢູ່"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"ປ້ອງກັນການແຈ້ງເຕືອນທີ່ຖືກປິດສຽງໂດຍ \'ຫ້າມລົບກວນ\' ບໍ່ໃຫ້ໂຜ່ຂຶ້ນ ຫຼື ເດັ້ງຂຶ້ນມາໃນໜ້າຈໍ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"ປ້ອງກັນການແຈ້ງເຕືອນທີ່ຖືກປິດສຽງໂດຍ \'ຫ້າມລົບກວນ\' ບໍ່ໃຫ້ປາກົດຂຶ້ນ ຫຼື ໂດດຂຶ້ນມາໃນໜ້າຈໍ"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"ບລັອກໄວ້ ເມື່ອໜ້າຈໍປິດຢູ່"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"ປ້ອງກັນການແຈ້ງເຕືອນທີ່ຖືກປິດສຽງໂດຍ \'ຫ້າມລົບກວນ\' ບໍ່ໃຫ້ເປີດໜ້າຈໍ ຫຼື ກະພິບໄຟເຕືອນ"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ປິດ"</string>
@@ -2819,7 +2831,7 @@
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ກົດ​ປຸ່ມ​ປິດ​ເປີດ​ສອງ​ຄັ້ງ​ສຳ​ລັບ​ກ້ອງ​ຖ່າຍ​ຮູບ"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ເປີດ​ກ້ອງ​ຖ່າຍ​ຮູບ​ດ່ວນ​ໂດຍ​ບໍ່​ຕ້ອງ​ປົດ​ລັອກໜ້າຈໍ​ຂອງ​ທ່ານ"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"ຂະໜາດສະແດງຜົນ"</string>
-    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"ເຮັດໃຫ້ລາຍກາຕ່າງໆໃນໜ້າຈໍໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"ເຮັດໃຫ້ລາຍການຕ່າງໆໃນໜ້າຈໍໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ຄວາມໜາແໜ້ນຈໍສະແດງຜົນ, ການຊູມໜ້າຈໍ, ຂະໜາດ, ການຈັດມາດຕາສ່ວນ"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"ເຮັດໃຫ້ລາຍການຕ່າງໆໃນໜ້າຈໍຂອງທ່ານນ້ອຍລົງ ຫຼື ໃຫຍ່ຂຶ້ນ. ບາງແອັບໃນໜ້າຈໍຂອງທ່ານອາດຈະປ່ຽນຕຳແໜ່ງ."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"ສະແດງຕົວຢ່າງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f79221e..8085a6e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -335,10 +335,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atrakinti kontroliniu kodu "</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Tiesiog palieskite kontrolinio kodo jutiklį, kad atrakintumėte telefoną, įgaliotumėte pirkimo procesus ar prisijungtumėte prie programų.\n\nNaudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Pastaba: kontrolinis kodas gali būti ne toks saugus kaip atrakinimo piešinys ar PIN kodas."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Sužinokite daugiau"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Pastaba: kontrolinis kodas gali būti ne toks saugus kaip sudėtingas piešinys ar PIN kodas. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Atšaukti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tęsti"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio planšetinio kompiuterio, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Įrenginio apsaugos funkcija nebus suaktyvinta. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio įrenginio, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Įrenginio apsaugos funkcija nebus suaktyvinta. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio telefono, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų planšetiniu kompiuteriu, jei jį prarasite ar jis bus pavogtas."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų įrenginiu, jei jį prarasite ar jis bus pavogtas."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų telefonu, jei jį prarasite ar jis bus pavogtas."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Vis tiek praleisti"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Grįžti"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Raskite jutiklį"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Raskite kontrolinio kodo jutiklį telefono užpakalinėje dalyje."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Įrenginio ir kontrolinio kodo jutiklio vietos iliustracija"</string>
@@ -372,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Galite pridėti iki <xliff:g id="COUNT">%d</xliff:g> kontrol. kod."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Pašalinti visus kontrolinius kodus?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Negalėsite naudoti kontrolinių kodų norėdami atrakinti telefoną, įgalioti pirkimo procesus ar prisijungti prie programų."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Taip, pašalinti"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Naudokite kontrolinį kodą, kad galėtumėte tęsti."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifruotė"</string>
@@ -409,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Apsaugokite savo įrenginį"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Atrakinimas naudojant kontrolinį kodą"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pasir. ekrano užrak."</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Pasirinkite ekrano užraktą"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Apsaugokite savo telefoną"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Kontrolinis kodas gali būti mažiau saugus nei sudėtingas atrakinimo piešinys, PIN kodas ar slaptažodis. Nustatykite atsarginį užrakinimo ekraną, kad būtumėte apsaugoti."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Neleiskite kitiems asmenims naudoti šio planšetinio kompiuterio be leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Neleiskite kitiems asmenims naudoti šio įrenginio be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Neleiskite kitiems asmenims naudoti šio telefono be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Pasirinkite atsarginį ekrano užrakto metodą"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrano užraktas"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Pakeisti užrak. ekraną"</string>
@@ -425,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidutinis–aukštas saugos lygis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Slaptažodis"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Aukštas saugos lygis"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ne dabar"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Esamas ekrano užraktas"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Kontrolinis kodas + atrakinimo piešinys"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Kontrolinis kodas + PIN kodas"</string>
@@ -477,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Slaptažodį turi sudaryti mažiausiai %d simboliai."</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodą turi sudaryti mažiausiai %d skaitm."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Atlikę palieskite „Tęsti“"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Slaptažodį turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> simboliai (-ių)."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN kodą turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> skaitmenys (-ų)."</string>
@@ -719,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepakeista)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Pasirinkite"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Pridėti keli sertifikatai)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Naudoti sistemos sertifikatus"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Neteikti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nepatvirtinti"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nenurodytas joks sertifikatas. Ryšys nebus privatus."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Būtina nurodyti domeną."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Įveskite tinklo slaptažodį"</string>
@@ -1963,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatiškai nuotoliniu būdu sukurkite atsarginę įrenginio duomenų (pvz., „Wi-Fi“ slaptažodžių ir skambučių istorijos) ir programų duomenų (pvz., programų nustatymų ir išsaugotų failų) kopiją.\n\nKai įjungiate automatinę atsarginę kopiją, įrenginio ir programų duomenys periodiškai išsaugomi nuotoliniu būdu. Programų duomenys gali būti bet kurie programų išsaugoti duomenys (atsižvelgiant į kūrėjo nustatymus), įskaitant duomenis, kurie gali būti neskelbtini, pvz., kontaktai, pranešimai ir nuotraukos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Įrenginio administravimo nustatymai"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Įrenginio administratorius"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Išaktyvinti"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Pašalinti"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Išaktyvinti šio įrenginio administratorių"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Pašalinti programą"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Išaktyvinti ir pašalinti"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Įrenginio administratoriai"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nėra galimų įrenginio administratorių"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Asmeninis"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Darbas"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nėra jokių galimų „trust agents“"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Suaktyvinti įrenginio administratorių?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktyvinti"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Suaktyvinti šio įrenginio administratorių"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Įrenginio administratorius"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Suaktyvinus šį administratorių „<xliff:g id="APP_NAME">%1$s</xliff:g>“ programai bus leidžiama atlikti nurodytas operacijas:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Administratorius aktyvus ir leidžia programai „<xliff:g id="APP_NAME">%1$s</xliff:g>“ atlikti šias operacijas:"</string>
@@ -2292,7 +2304,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Įjungti telefono skambučius ir SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Skambučių ir SMS istorija bus bendrinama su šiuo naudotoju."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Kritiškos padėties informacija"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Pasiekiama užrakinimo ekrane naudojant pagalbos numerio rinkiklį"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Bet kas gali pasiekti pagalbos numerio rinkiklį neatrakinęs jūsų telefono"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Leisti programas ir turinį"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programos su apribojimais"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Išplėsti programos nustatymus"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1b9f116..9296fbc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -333,10 +333,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atbloķēšana ar pirksta nospiedumu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs.\n\nŠīs darbības varēs veikt ar visiem tālrunī pievienotajiem pirkstu nospiedumiem, tādēļ esiet uzmanīgs, tos pievienojot."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Piezīme. Jūsu pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Uzzināt vairāk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Ņemiet vērā: jūsu pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN kods. "<annotation id="url">"Uzziniet vairāk"</annotation>"."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Atcelt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Turpināt"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo planšetdatoru nevarētu lietot citas personas, ja tas tiks pazaudēts, nozagts vai tiks dzēsti tajā saglabātie dati."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo ierīci nevarētu lietot citas personas, ja tā tiks pazaudēta, nozagta vai tiks dzēsti tajā saglabātie dati."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo tālruni nevarētu lietot citas personas, ja tas tiks pazaudēts, nozagts vai tiks dzēsti tajā saglabātie dati."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo planšetdatoru nevarētu lietot citas personas, ja tas tiks pazaudēts vai nozagts."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo ierīci nevarētu lietot citas personas, ja tā tiks pazaudēta vai nozagta."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo tālruni nevarētu lietot citas personas, ja tas tiks pazaudēts vai nozagts."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Tomēr izlaist"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Atpakaļ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensora atrašana"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Atrodiet pirkstu nospiedumu sensoru tālruņa aizmugurē."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Attēls ar ierīci un pirkstu nospiedumu sensora atrašanās vietu uz tās"</string>
@@ -370,6 +377,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Varat pievienot līdz <xliff:g id="COUNT">%d</xliff:g> pirkstu nospiedumiem."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vai noņemt visus nospiedumus?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Jūs nevarēsiet izmantot pirkstu nospiedumus, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Jā, noņemt"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Lai turpinātu, izmantojiet pirksta nospiedumu."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrējums"</string>
@@ -407,7 +416,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Aizsargājiet savu ierīci"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Ierīces atbloķēšana, izmantojot pirksta nospiedumu"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izv. ekrāna bloķēš."</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Izvēlieties ekrāna bloķēšanas veidu"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Aizsargājiet tālruni"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija, PIN kods vai parole. Papildu drošībai iestatiet rezerves bloķēšanas ekrānu."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo planšetdatoru bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo ierīci bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo tālruni bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izvēlieties rezerves ekrāna bloķēšanas metodi"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrāna bloķēšana"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Bloķ. ekr. izmaiņas"</string>
@@ -423,6 +436,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Vidējs līdz augsts drošības līmenis"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parole"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Augsts drošības līmenis"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ne tagad"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Pašreizējais ekrāna bloķēšanas iestatījums"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Pirksta nospiedums un kombinācija"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Pirksta nospiedums un PIN"</string>
@@ -475,7 +489,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parolē jābūt vismaz %d rakstzīmēm"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodā ir jābūt vismaz %d cipariem."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Kad pabeigts, pieskarieties Turpināt."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Turpināt"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parole nedrīkst būt garāka par <xliff:g id="NUMBER">%d</xliff:g> rakstzīmēm."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN nedrīkst būt garāks par <xliff:g id="NUMBER">%d</xliff:g> cipariem."</string>
@@ -711,13 +724,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(bez izmaiņām)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Lūdzu, atlasiet"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Pievienoti vairāki sertifikāti)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Izmantot sistēmas sertifikātus"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nenorādīt"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Neapstiprināt"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifikāts nav norādīts. Savienojums nebūs privāts."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Norādiet domēnu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ievadiet tīkla paroli"</string>
@@ -1947,15 +1958,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Ierīces dati (piemēram, Wi-Fi paroles un zvanu vēsture) un lietotņu dati (piemēram, iestatījumi un lietotnēs uzglabātie faili) tiek automātiski attālināti dublēti.\n\nKad esat ieslēdzis automātisko dublēšanu, ierīces un lietotņu dati tiek regulāri attālināti saglabāti. Lietotņu dati var būt jebkādi lietotnēs saglabātie dati (atkarībā no izstrādātāja iestatījumiem), tostarp potenciāli sensitīvi dati, piemēram, informācija par kontaktpersonām, ziņojumi un fotoattēli."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ierīces administrācijas iestatījumi"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Ierīces administrators"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Dezaktivēt"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Atinstalēt"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktivizēt šo ierīces administratoru"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Atinstalēt lietotni"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktivizēt un atinstalēt"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Ierīces administratori"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nav pieejamu ierīces administratoru"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Privāts"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Darba"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nav pieejama neviena uzticamības pārbaudes programma"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Vai aktivizēt ierīces administratoru?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivizēt"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktivizēt šo ierīces administratoru"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Ierīces administrators"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktivizējot šo administratoru, lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> tiks sniegta atļauja veikt šādas darbības:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Šis administrators ir aktivizēts un sniedz lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> atļauju veikt šādas darbības:"</string>
@@ -2276,7 +2288,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vai ieslēgt tālruņa zvanus un īsziņas?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ar šo lietotāju tiks kopīgota zvanu un īsziņu vēsture."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Ārkārtas informācija"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Pieejama, izmantojot bloķēšanas ekrāna ārkārtas numuru sastādītāju"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Pieejams ārkārtas numuru sastādītājā ikvienam, neatbloķējot tālruni."</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Lietotņu un satura atļaušana"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Lietojumprogrammas ar ierobežojumiem"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Izvērst lietojumprogr. iestat."</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 30b5ba3..b4eb570 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"Само допрете го сензорот за отпечатоци за да го отклучите телефонот, да авторизирате купувања или да се најавите на апликациите. \n\n Внимавајте чии отпечатоци додавате бидејќи сите додадени отпечатоци ќе може да ги прават овие работи."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Забелешка: вашиот отпечаток можеби е помалку безбеден од силна шема или ПИН."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Дознај повеќе"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Забелешка: вашиот отпечаток можеби е помалку безбеден од силна шема или ПИН. "<annotation id="url">"Дознајте повеќе"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Продолжи"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат таблетот доколку е изгубен, украден или избришан."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат уредот доколку е изгубен, украден или избришан."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат телефонот доколку е изгубен, украден или избришан."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат таблетот ако го загубите или ви го украдат."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат уредот ако го загубите или ви го украдат."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат телефонот ако го загубите или ви го украдат."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Сепак прескокни"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Оди назад"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Најдете го сензорот"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Пронајдете го сензорот за отпечатоци на задната страна на телефонот."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Илустрација со локација на уредот и сензорот за отпечаток"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Може да додавате до <xliff:g id="COUNT">%d</xliff:g> отпечатоци"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Да се отстранат сите отпечатоци?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Нема да може да ги користите отпечатоците за да го отклучите телефонот, да овластувате купувања или да се најавувате на апликации со нив."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Заштитете го уредот"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Отклучете со отпечаток"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Избери заклучување на екранот"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Избери заклучување на екранот"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Заштитете го телефонот"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Отпечатокот можеби е помалку безбеден од шема, ПИН или лозинка. Поставете резервен заклучен екран за да бидете безбедни."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречете ги другите да го користат уредот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Изберете резервен метод за заклучување на екранот"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заклучи екран"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промени закл. на екран"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Средно до високо ниво на безбедност"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Високо ниво на безбедност"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Не сега"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Тековно заклучување на екранот"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Отпечаток + шема"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Отпечаток + ПИН"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Смени лозинка за откл."</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Лозинката мора да содржи најмалку %d карактери"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ПИН кодот мора да има најмалку %d цифри"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Допрете Продолжи кога ќе завршите"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжи"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Лозинката мора да има помалку од <xliff:g id="NUMBER">%d</xliff:g> знаци."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ПИН кодот мора да има помалку од <xliff:g id="NUMBER">%d</xliff:g> цифри."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(непроменети)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Изберете"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Додадени се повеќе сертификати)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Користете системски сертификати"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не обезбедувај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не потврдувај"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Нема назначено сертификат. Вашата врска нема да биде приватна."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Мора да се наведе домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Достапен WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Достапен WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Внесете ја вашата мрежна лозинка"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Автоматски создајте резервна копија на податоците на уредот (како што се лозинки за Wi-Fi и историја на повици) и податоците за апликациите (како што се поставки и датотеки кои ги складирале апликациите) од далечина.\n\nОткако ќе вклучите автоматско создавање резервна копија, податоците за уредот и апликациите повремено се зачувуваат на далечина. Податоците за апликацијата може да бидат секакви податоци кои ги зачувала апликацијата (според поставките на програмерот), вклучувајќи потенцијално чувствителни податоци како што се контакти, пораки и фотографии."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Поставки на администратор на уред"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор на уред"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Деактивирај"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Деинсталирај"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Деактивирајте го администраторот на уредот"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Деинсталирај ја апликацијата"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Деактивирај и деинсталирај"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Администратори на уред"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Не се достапни администратори на уред"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Лични"</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="6246742476064507965">"Активирај администратор на уред?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Активирај"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Активирајте го администраторот на уредот"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Администратор на уред"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Со активирање на овој администратор ќе се овозможи апликацијата <xliff:g id="APP_NAME">%1$s</xliff:g> да ги врши следниве дејства:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Овој администратор е активен и дозволува апликацијата <xliff:g id="APP_NAME">%1$s</xliff:g> да ги врши следниве дејства:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Вклучи телефонски повици и СМС?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Со овој корисник ќе се сподели историјата на повици и СМС."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информации за итни случаи"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Достапно преку заклучениот екран од бирачот за итни случаи"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Достапно за секој од бирачот за итни случаи без отклучување на телефонот"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи апликации и содржина"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликации со ограничувања"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подесувања за апликација"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 66e7f02..3cf7632 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്‌സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ ഫിംഗർപ്രിന്റ് സെൻസറിൽ സ്പർശിച്ചാൽ മാത്രം മതി. \n\n ആരുടെയൊക്കെ ഫിംഗർപ്രിന്റുകൾ ചേർക്കുന്നു എന്ന കാര്യത്തിൽ നിങ്ങൾ ജാഗ്രത പുലർത്തുക, കാരണം ചേർത്തിട്ടുള്ള ഏത് ഫിംഗർപ്രിന്റിനും ഇതൊക്കെ ചെയ്യാനാകും."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ശ്രദ്ധിക്കുക: നിങ്ങളുടെ വിരലടയാളത്തിന്റെ സുരക്ഷ, ശക്തമായ പാറ്റേണിനേക്കാളോ PIN-നേക്കാളോ കുറവായിരിക്കാം."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"കൂടുതലറിയുക"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ശ്രദ്ധിക്കുക: ശക്തമായ പാറ്റേൺ അല്ലെങ്കിൽ പിൻ എന്നിവയെ അപേക്ഷിച്ച് ഫിംഗർപ്രിന്റിന്റെ സുരക്ഷിതത്വം കുറവായിരിക്കാം. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"റദ്ദാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"തുടരൂ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ടാബ്‌ലെറ്റ് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ അത് ഉപയോഗിക്കുന്നത് ഒഴിവാക്കാനാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഉപകരണം നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ അത് ഉപയോഗിക്കുന്നത് ഒഴിവാക്കാനാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഫോൺ നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ അത് ഉപയോഗിക്കുന്നത് ഒഴിവാക്കാനാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ടാബ്‌ലെറ്റ് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നത് നിങ്ങൾക്ക് തടയാനാകില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഉപകരണം നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ ഉപകരണം ഉപയോഗിക്കുന്നത് നിങ്ങൾക്ക് തടയാനാകില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഫോൺ നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ ഫോൺ ഉപയോഗിക്കുന്നത് നിങ്ങൾക്ക് തടയാനാകില്ല."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"ഏതുവിധേയനയും ഒഴിവാക്കുക"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"തിരിച്ചുപോവുക"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"സെൻസർ കണ്ടെത്തുക"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"നിങ്ങളുടെ ഫോണിന്റെ പിൻഭാഗത്ത് ഫിംഗർപ്രിന്റ് സെൻസർ കണ്ടെത്തുക."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ഉപകരണത്തിലെ ചിത്രീകരണവും ഫിംഗർപ്രിന്റ് സെൻസർ ലൊക്കേഷനും"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"നിങ്ങൾക്ക് <xliff:g id="COUNT">%d</xliff:g> വരെ ഫിംഗർപ്രിൻറുകൾ ചേർക്കാനാകും"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"എല്ലാ വിരലടയാളങ്ങളും നീക്കംചെയ്യണോ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"ഫോൺ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലുകൾ അംഗീകരിക്കുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നതിനോ നിങ്ങളുടെ വിരലടയാളങ്ങൾ ഉപയോഗിക്കാനാവില്ല."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"നിങ്ങളുടെ ഉപകരണം പരിരക്ഷിക്കുക"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ച് അൺലോക്കുചെയ്യുക"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"സ്‌ക്രീൻലോക്ക് തിരഞ്ഞെടുക്കൂ"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"സ്‌ക്രീൻലോക്ക് തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ഫോൺ പരിരക്ഷിക്കുക"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ശക്തമായ പാറ്റേൺ, പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ് എന്നിവയെ അപേക്ഷിച്ച് ഫിംഗർപ്രിന്റിന്റെ സുരക്ഷിതത്വം കുറവായിരിക്കാം. സുരക്ഷിതമായിരിക്കുന്നതിന് ഒരു ബാക്കപ്പ് ലോക്ക് സ്ക്രീൻ സജ്ജമാക്കുക."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഉപകരണം ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഫോൺ ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"നിങ്ങളുടെ ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് രീതി തിരഞ്ഞെടുക്കുക"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"സ്ക്രീൻ ലോക്ക്"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ലോക്ക് സ്‌ക്രീൻ മാറ്റുക"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ഇടത്തരം മുതൽ ഉയർന്ന സുരക്ഷ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"പാസ്‌വേഡ്"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ഉയർന്ന സുരക്ഷ"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ഇപ്പോൾ വേണ്ട"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"നിലവിലെ സ്‌ക്രീൻ ലോക്ക്"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ഫിംഗർപ്രിന്റ് + പാറ്റേൺ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ഫിംഗർപ്രിന്റ് + പിൻ"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"അൺലോക്ക് പാസ്‌വേഡ് മാറ്റുക"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"പാസ്‌വേഡിൽ %d പ്രതീകങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"പിൻ നമ്പറിൽ %d അക്കങ്ങളെങ്കിലും ഉണ്ടായിരിക്കണം"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"പൂർത്തിയാകുമ്പോൾ തുടരുക എന്നതിൽ ടാപ്പുചെയ്യുക"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"തുടരുക"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"പാസ്‌വേഡ് <xliff:g id="NUMBER">%d</xliff:g> പ്രതീകങ്ങളിൽ കുറവായിരിക്കണം."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"പിൻ <xliff:g id="NUMBER">%d</xliff:g> സംഖ്യകളിൽ കുറവായിരിക്കണം."</string>
@@ -646,7 +659,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"നെറ്റ്‌വർക്ക് ചേർക്കുക"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"വൈഫൈ നെറ്റ്‌വർക്കുകൾ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS പുഷ് ബട്ടൺ"</string>
-    <string name="wifi_menu_more_options" msgid="2448097861752719396">"കൂടുതല്‍ ഓപ്‌ഷനുകള്‍"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS പിൻ നൽകൽ"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"വൈഫൈ ഡയറക്‌ട്"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"സ്‌കാൻ ചെയ്യുക"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(മാറ്റം വരുത്തിയിട്ടില്ല)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(ഒന്നിലധികം സർട്ടിഫിക്കറ്റുകൾ ചേർത്തു)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"സിസ്റ്റം സർട്ടിഫിക്കറ്റുകൾ ഉപയോഗിക്കുക"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"നൽകരുത്"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"മൂല്യനിർണ്ണയം ചെയ്യരുത്"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"സർട്ടിഫിക്കറ്റൊന്നും വ്യക്തമാക്കിയിട്ടില്ല. നിങ്ങളുടെ കണക്ഷൻ സ്വകാര്യമായിരിക്കുകയില്ല."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ഒരു ഡൊമെയ്ൻ വ്യക്തമാക്കിയിരിക്കണം."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ലഭ്യമാണ്"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ലഭ്യമാണ്)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് പാസ്‌വേഡ് നൽകുക"</string>
@@ -1533,7 +1544,7 @@
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"ചേര്‍ക്കുക"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"നിഘണ്ടുവിൽ ചേർക്കുക"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"പദസമുച്ചയം"</string>
-    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"കൂടുതല്‍ ഓപ്‌ഷനുകള്‍"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"കുറച്ച് ഓപ്‌ഷനുകൾ"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ശരി"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"പദം:"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"ഉപകരണ വിവരവും (വൈഫൈ പാസ്‌വേഡുകളും കോൾ ചരിത്രവും പോലുള്ളവ) ആപ്പ് വിവരവും (ക്രമീകരണവും ആപ്പ്‌സ് സംഭരിച്ച ഫയലുകളും പോലുള്ളവ) വിദൂരമായി സ്വയമേവ ബാക്കപ്പെടുക്കുന്നു.\n\nനിങ്ങൾ സ്വയമേയുള്ള ബാക്കപ്പ് ഓണാക്കുമ്പോൾ, ഉപകരണ, ആപ്പ് വിവരം ഇടയ്‌ക്കിടെ വിദൂരമായി സംരക്ഷിക്കും. ആപ്പ് വിവരം എന്നത് കോൺടാക്റ്റുകൾ, സന്ദേശങ്ങൾ, ഫോട്ടോകൾ എന്നിവ പോലുള്ള രഹസ്യസ്വഭാവമുള്ളവ ഉൾപ്പെടെ ആപ്പ് സംരക്ഷിച്ചിട്ടുള്ള ഏതൊരു വിവരവും (ഡവലപ്പർ ക്രമീകരണം അടിസ്ഥാനമാക്കി) ആകാം."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"ഉപകരണ അഡ്മിനിസ്‌ട്രേഷൻ ക്രമീകരണങ്ങൾ"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"ഉപകരണ അഡ്മിനിസ്‌ട്രേറ്റർ"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"നിർജീവമാക്കുക"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"അൺഇൻസ്റ്റാളുചെയ്യുക"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ഈ ഉപകരണ അഡ്മിനിസ്ട്രേറ്റർ നിർജീവമാക്കുക"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ആപ്പ് അൺഇൻസ്റ്റാളുചെയ്യുക"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"നിർജീവമാക്കുക, അൺഇൻസ്റ്റാൾ ചെയ്യുക"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"ഉപകരണ അഡ്മിനിസ്‌ട്രേറ്റർ"</string>
     <string name="no_device_admins" msgid="702695100241728775">"ലഭ്യമായ ഉപകരണ അഡ്മി‌നിസ്‌ട്രേറ്ററുകൾ ഒന്നുമില്ല"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"വ്യക്തിഗതം"</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="6246742476064507965">"അഡ്മിനിസ്‌ട്രേറ്റർ സജീവമാക്കണോ?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"സജീവമാക്കുക"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"ഈ ഉപകരണ അഡ്മിനിസ്ട്രേറ്റർ സജീവമാക്കുക"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"ഉപകരണ അഡ്മിനിസ്‌ട്രേറ്റർ"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ഈ അഡ്മിനിസ്ട്രേറ്ററെ സജീവമാക്കുന്നത്, ഇനിപ്പറയുന്ന പ്രവർത്തനങ്ങൾ നിർവ്വഹിക്കാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> എന്ന അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ഈ അഡ്മിനിസ്ട്രേറ്റർ സജീവമായതിനാൽ ഇനിപ്പറയുന്ന പ്രവർത്തനങ്ങൾ നിർവ്വഹിക്കാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> എന്ന അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ഫോൺ കോളുകൾ, SMS എന്നിവ ഓണാക്കണോ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ഈ ഉപയോക്താവുമായി കോൾ, SMS എന്നിവയുടെ ചരിത്രം പങ്കിടും."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"അടിയന്തര വിവരം"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"അടിയന്തര ഡയലറിൽ ലോക്ക് സ്ക്രീനിലൂടെ ആക്സസ് ചെയ്യാവുന്നത്"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യാതെ, അടിയന്തര ഡയലറിൽ നിന്ന് ആർക്കും ആക്സസ് ചെയ്യാവുന്നത്"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"അപ്ലിക്കേഷനുകളും ഉള്ളടക്കവും അനുവദിക്കുക"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"നിയന്ത്രണങ്ങളുള്ള അപ്ലിക്കേഷനുകൾ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"അപ്ലിക്കേഷനുകൾക്കായുള്ള ക്രമീകരണങ്ങൾ വിപുലീകരിക്കുക"</string>
@@ -2282,7 +2294,7 @@
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"ടെർമിനലിൽ പണമടയ്ക്കൽ"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"ഒരു പണമടക്കൽ ആപ്പ് സജ്ജീകരിക്കുക. തുടർന്ന് കോൺടാക്റ്റ് രഹിത അടയാളമുള്ള ഏത് ടെർമിനലിലേക്കും നിങ്ങളുടെ ഫോണിന്റെ പിൻവശം തൊടുവിക്കുക."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"മനസ്സിലായി"</string>
-    <string name="nfc_more_title" msgid="815910943655133280">"കൂടുതല്‍..."</string>
+    <string name="nfc_more_title" msgid="815910943655133280">"കൂടുതൽ‍..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"നിങ്ങളുടെ മുൻഗണയായി സജ്ജമാക്കണോ?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"നിങ്ങൾ ടാപ്പുചെയ്‌ത് പണമടയ്‌ക്കുമ്പോൾ എല്ലായ്‌പ്പോഴും <xliff:g id="APP">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"നിങ്ങൾ ടാപ്പുചെയ്‌ത് പണമടയ്‌ക്കുമ്പോൾ എല്ലായ്‌പ്പോഴും <xliff:g id="APP_1">%2$s</xliff:g> എന്നതിന് പകരം <xliff:g id="APP_0">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
@@ -2848,7 +2860,7 @@
     <string name="about_summary" msgid="8460677224778433924">"Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="5358385863927403279">"നയം മുഖേന പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="default_admin_support_msg" msgid="1088691978121877039">"നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു.\nകൂടുതലറിയാൻ അഡ്മിനിസ്ട്രേറ്ററെ ബന്ധപ്പെടുക."</string>
-    <string name="admin_support_more_info" msgid="8901377038510512654">"കൂടുതല്‍ വിശദാംശങ്ങള്‍"</string>
+    <string name="admin_support_more_info" msgid="8901377038510512654">"കൂടുതൽ‍ വിശദാംശങ്ങള്‍"</string>
     <string name="admin_profile_owner_message" msgid="859900284865115324">"നെറ്റ്‌വർക്ക് പ്രവർത്തനവും ഉപകരണത്തിന്റെ ലൊക്കേഷൻ വിവരവും ഉൾപ്പെടെ, ഈ പ്രൊഫൈലുമായി ബന്ധപ്പെട്ട ക്രമീകരണങ്ങളും കോർപ്പറേറ്റ് ആക്‌സസും ആപ്സും ഡാറ്റയും നിരീക്ഷിക്കാനും നിയന്ത്രിക്കാനും നിങ്ങളുടെ അഡ്‌മിനിസ്‌ട്രേറ്റർക്ക് കഴിയും."</string>
     <string name="admin_profile_owner_user_message" msgid="853830977317489321">"നെറ്റ്‌വർക്ക് പ്രവർത്തനവും ഉപകരണത്തിന്റെ ലൊക്കേഷൻ വിവരവും ഉൾപ്പെടെ, ഈ ഉപകരണവുമായി ബന്ധപ്പെട്ട ക്രമീകരണങ്ങളും കോർപ്പറേറ്റ് ആക്‌സസും ആപ്സും ഡാറ്റയും നിരീക്ഷിക്കാനും നിയന്ത്രിക്കാനും നിങ്ങളുടെ അഡ്‌മിനിസ്‌ട്രേറ്റർക്ക് കഴിയും."</string>
     <string name="admin_device_owner_message" msgid="2060220398673683105">"നെറ്റ്‌വർക്ക് പ്രവർത്തനവും ഉപകരണത്തിന്റെ ലൊക്കേഷൻ വിവരവും ഉൾപ്പെടെ, ഈ ഉപകരണവുമായി ബന്ധപ്പെട്ട ക്രമീകരണങ്ങളും കോർപ്പറേറ്റ് ആക്‌സസും ആപ്സും ഡാറ്റയും നിരീക്ഷിക്കാനും നിയന്ത്രിക്കാനും നിങ്ങളുടെ അഡ്‌മിനിസ്‌ട്രേറ്റർക്ക് കഴിയും."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 5b0ea24..f967937 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD картыг салгах"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB санг арилгах"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD картыг арилгах"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Дэлгэц дээрх текстийг томруулах, жижигрүүлэх."</string>
     <string name="small_font" msgid="2295331917424072635">"Жижиг"</string>
     <string name="medium_font" msgid="2068475425515133701">"Дундаж"</string>
     <string name="large_font" msgid="599055175160971446">"Том"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"Та апп-д нэвтрэх, худалдан авах, утасныхаа түгжээг тайлахын тулд хурууны хээ мэдрэгчийг дарна уу. \n\n Та хэн нэгний хурууны хээг нэмсэн тохиолдолд тухайн хүн дээрх үйлдлийг хийх боломжтой тул нэмэх хүнээ болгоомжтой сонгоно уу."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Санамж: Таны хурууны хээ нь хүчтэй зурган хээ болон PIN-ээс хамгаалалт муутай байж магадгүй."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Дэлгэрэнгүй үзэх"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Тайлбар: Таны хурууны хээ нь ярвигтай зурган түгжээ болон PIN-с хамгаалалт багатай байж болзошгүй. "<annotation id="url">"Дэлгэрэнгүй үзэх"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Цуцлах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Үргэлжлүүлэх"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Төхөөрөмжийн хамгаалалтын функц идэвхжихгүй. Энэ таблетийг алга болгох, хулгайд алдах эсвэл мэдээлэл нь устсан тохиолдолд та уг таблетийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Төхөөрөмжийн хамгаалалтын функц идэвхжихгүй. Энэ төхөөрөмжийг алга болгох, хулгайд алдах эсвэл мэдээлэл нь устсан тохиолдолд та уг төхөөрөмжийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Төхөөрөмжийн хамгаалалтын функц идэвхжихгүй. Энэ утсыг алга болгох, хулгайд алдах эсвэл мэдээлэл нь устсан тохиолдолд та уг утсыг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ тaблетыг алга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг таблетийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ төхөөрөмжийг алга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг төхөөрөмжийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ утсыг aлга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг утсыг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ямар ч үед алгасах"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Буцах"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Мэдрэгч хай"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Утасныхаа ард хурууны хээ мэдрэгчийг байршуул"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Төхөөрөмж болон хурууны хээний мэдрэгчийн байршлын зураг"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Та <xliff:g id="COUNT">%d</xliff:g> хүртэлх хурууны хээ нэмж болно"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Бүх хурууны хээг устгах уу?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Ta цаашид хурууны хээг ашиглан утсаа нээх, худалдан авах болон апп-д нэвтрэх боломжгүй болно."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Төхөөрөмжөө хамгаалаарай"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Түгжээг хурууны хээгээ ашиглан тайлна уу"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Дэлгэцийн түгжээг сонгоно уу"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Дэлгэцийн түгжээг сонгоно уу"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Утсаа хамгаалах"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Хурууны хээ нь сайн зурган түгжээ, PIN, нууц үгийг бодвол хамгаалалт муутай байж болзошгүй. Хамгаалалттай байхын тулд нөөцлөх түгжээг тохируулна уу."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ таблетийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ төхөөрөмжийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ утсыг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Дэлгэц түгжих нөөц аргачлалаа сонгох"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Дэлгэцийн түгжээ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Дэлгэцийн түгжээг өөрчлөх"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Дундажаас өндөр хамгаалалттай"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Нууц үг"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Өндөр хамгаалалттай"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Одоо биш"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Одоо байгаа дэлгэцийн түгжээ"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Хурууны хээ + Загвар"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Хурууны хээ + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Тайлах нууц үгийг өөрчлөх"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Нууц үг хамгийн багадаа %d үсэгтэйй байх ёстой"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN хамгийн багадаа %d цифртэй байх ёстой"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Дууссан үедээ Үргэлжлүүлэх сонголтыг дарна уу"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Үргэлжлүүлэх"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Нууц үг <xliff:g id="NUMBER">%d</xliff:g>-с цөөн үсэгтэй байх ёстой."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN <xliff:g id="NUMBER">%d</xliff:g>-с цөөн цифртэй байх ёстой."</string>
@@ -694,13 +706,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(өөрчлөгдөөгүй)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Сонгоно уу"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Олон сертификат нэмсэн)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Системийн гэрчилгээ ашигла"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"\"Бүү олго\""</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Хүчин төгөлдөр бүү болго"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ямар ч сертификат заагаагүй байна. Таны холболт хувийн биш байх болно."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Домэйн зааж өгөх шаардлагатай."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS боломжтой"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS боломжтой)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Сүлжээний нууц үгээ оруулна уу"</string>
@@ -878,8 +888,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Орчинтой тохирсон дэлгэц"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Төхөөрөмжийг хөдөлгөх, мэдэгдэл хүлээн авахад дэлгэцийг асаах"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Фонтын хэмжээ"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Текстийг том эсвэл жижиг болгох"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картын түгжээний тохиргоо"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM картын түгжээг тохируулах"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM картын түгжээ"</string>
@@ -1580,21 +1589,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Хандалт"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Хандалтын тохиргоо"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Харааны тохиргоо"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Та энэ төхөөрөмжийг өөрийнхөө шаардлагад нийцүүлэн тохируулах боломжтой. Эдгээр сонголтуудыг дараа нь Тохиргоо хэсэгт өөрчлөх боломжтой."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Үйлчилгээнүүд"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Дэлгэц уншигчийг ерөнхийдөө сохор буюу харааны гажигтай хүмүүст зориулсан"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Дэлгэц"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Титрүүд"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Томруулах үйлдэл"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Томруулахын тулд 3 удаа дар"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Томруулж, багасгахын тулд дэлгэцэн дээр хуруугаараа 3 удаа товш. \n\n Томруулсан байхдаа та: \n"<ul>\n<li>" Гүйлгэх: 2 ба түүнээс дээш хуруугаараа дэлгэцэн дээгүүр гүйлгэх "</li>\n<li>" Томруулах хувийг тохируулах: 2 ба түүнээс дээш хуруугаа хооронд нь ойртуулан хавчих, эсвэл салгаж холдуулах "</li></ul>\n\n" Түр томруулах бол 3 удаа товш, сүүлийн удаадаа гараа авалгүй дар. Дарсан чигтээ дэлгэцэн дээрээ гүйлгэн явуул. Томролтыг буцаах бол хуруугаа ав. \n\n Тайлбар: Томруулах үйлдэл нь гар болон хайлтын цэснээс бусад бүх хэсэгт үйлчилнэ."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Хандалтын товчилбор"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Идэвхтэй"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Идэвхгүй"</string>
@@ -1928,15 +1932,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Алсаас автоматаар төхөөрөмжийн өгөгдөл (Wi-Fi нууц үг, дуудлагын түүх гэх мэт) ба апп-ын өгөгдөл (апп-ын тохиргоо, хадгалсан файл гэх мэт)-ийг нөөцлөх.\n\nАвтомат нөөцлөлт нээсэн тохиолдолд төхөөрөмж, апп-ын өгөгдлийг тогтмол хугацаанд алсаас хадгална. Тус өгөгдөлд апп-ын хадгалсан бүх өгөгдөл орно (хөгжүүлэгчийн тохиргоонд үндэслэн). Үүнд: харилцагчийн хаяг, зурвас, зураг гэх мэт хувийн мэдээлэл."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Төхөөрөмжийн администрацын тохиргоо"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Төхөөрөмжийн администратор"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Идэвхгүйжүүлэх"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Устгах"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Энэ төхөөрөмжийн админыг идэвхгүй болгох"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Апп устгах"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Идэвхгүй болгох ба Устгах"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Төхөөрөмжийн администратор"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Төхөөрөмжийн боломжит администратор байхгүй"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Хувийн"</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="6246742476064507965">"Төхөөрөмжийн администраторыг идэвхжүүлэх үү?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Идэвхжүүлэх"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Энэ төхөөрөмжийн админыг идэвхжүүлэх"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Төхөөрөмжийн администратор"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Энэ администраторыг идэвхжүүлэх нь <xliff:g id="APP_NAME">%1$s</xliff:g> апп-д дараах үйлдлүүдийг хийхийг зөвшөөрөх болно:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Энэ администратор идэвхтэй байгаа бөгөөд <xliff:g id="APP_NAME">%1$s</xliff:g> апп-д дараах үйлдлүүдийг хийхийг зөвшөөрсөн:"</string>
@@ -2257,7 +2262,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Утасны дуудлага &amp; SMS-г хүлээн авах уу?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Энэ хэрэглэгчтэй утасны дуудлага болон SMS түүхийг хуваалцах болно."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Яаралтай тусламжийн мэдээлэл"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Яаралтай залгагчийн дэлгэцийн түгжээгээр дамжуулан хандах боломжтой"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Яаралтай дуудлага хийгч нь таны утасны түгжээг тайлалгүйгээр залгах боломжтой"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Апп болон контентыг зөвшөөрөх"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Хязгаарлалттай аппликешнүүд"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Аппликешний тохиргоог дэлгэх"</string>
@@ -2571,22 +2576,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> хүртэл анхааруулах горимд шилжих"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Үргэлж саад бол горимд шилжих"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Дэлгэц асаалттай үед хаах"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\"Саад Бүү Бол\" төлөвт байгаа тохиолдолд анхааруулах мэдэгдэл чимээгүй ирэхэд дэлгэцийг байнга асааж харахаас сэргийлэх"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Дэлгэц унтарсан үед хаах"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\"Саад Бүү Бол\" төлөвт байгаа тохиолдолд анхааруулах мэдэгдэл чимээгүй ирэхэд дэлгэц асах буюу гэрэл анивчихаас сэргийлэх"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Идэвхгүй"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Дэлгэц асаалттай үед"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Дэлгэц унтарсан үед"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Дэлгэц асаалттай буюу унтраалттай үед"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Админ PIN оруулна уу"</string>
@@ -2821,13 +2818,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Бугуйгаа 2 удаа эргүүлэн камерын апп-ыг нээгээрэй"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камер нээхийн тулд асаах/унтраах товчлуурыг 2 удаа дараарай"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Камерыг дэлгэцийн түгжээ тайлалгүйгээр төвөггүй нээх"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Харагдах хэмжээ"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Дэлгэц дээрх зүйлсийг том эсвэл жижиг болгох"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"дэлгэцийн нягтрал, дэлгэцийг томруулах, хэмжих, хэмжээс"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Дэлгэц дээрх зүйлсийг том, эсвэл жижиг болгох. Дэлгэц дээрх зарим апп-ын байр өөрчлөгдөж болно."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Урьдчилж харах"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Жижигрүүлэх"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Томруулах"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 150ee8a..b57434e 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD कार्ड अनमाउंट करा"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB संचयन मिटवा"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD कार्ड मिटवा"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"स्क्रीन वरील मजकूर आणखी लहान किंवा आणखी मोठा करा."</string>
     <string name="small_font" msgid="2295331917424072635">"लहान"</string>
     <string name="medium_font" msgid="2068475425515133701">"मध्‍यम"</string>
     <string name="large_font" msgid="599055175160971446">"मोठा"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्यासाठी किंवा अॅप्समध्ये साइन इन करण्यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा  करा. \n\n आपण ज्याचे फिंगरप्रिंट जोडता त्याबद्दल सावधगिरी बाळगा - जोडलेले कोणतेही फिंगरप्रिंट या गोष्टी करण्यात सक्षम असतील."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"टीप: मजबूत नमुना किंवा पिनपेक्षा आपले फिंगरप्रिंट कमी सुरक्षित असू शकतात."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"अधिक जाणून घ्या"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"टीप: आपले फिंगरप्रिंट सशक्त नमुना किंवा पिनपेक्षा कमी सुरक्षित असू शकते. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"सुरु ठेवा"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा टॅब्लेट गहाळ झाल्यास, चोरी झाल्यास किंवा पुसला गेल्यास, तो वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हे डिव्हाइस गहाळ झाल्यास, चोरी झाल्यास किंवा पुसले गेल्यास, ते वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन गहाळ झाल्यास, चोरी झाल्यास किंवा पुसला गेल्यास, तो वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा टॅब्लेट गहाळ किंवा चोरी झाल्यास तो वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हे डिव्हाइस गहाळ किंवा चोरी झाल्यास ते वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन गहाळ किंवा चोरी झाल्यास तो वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"तरीही वगळा"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"परत जा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर शोधा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"आपल्‍या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सर शोधा."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिव्हाइस आणि फिंगरप्रिंट सेन्सर स्थानासह चित्रे"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"आपण <xliff:g id="COUNT">%d</xliff:g> पर्यंत फिंगरप्रिंट जोडू शकता"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सर्व फिंगरप्रिंट काढायचे?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"आपण आपल्या फिंगरप्रिंटचा वापर आपला फोन अनलॉक करण्‍यासाठी, खरेदी प्रमाणित करण्‍यासाठी किंवा त्यांच्यासह अॅप्समध्‍ये साइन इन करण्‍यासाठी करण्‍यात सक्षम असणार नाही."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"आपले डिव्हाइस संरक्षित करा"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"आपल्या फिंगरप्रिंटसह अनलॉक करा"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रीन लॉक निवडा"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"स्क्रीन लॉक निवडा"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"आपला फोन संरक्षित करा"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"आपले फिंगरप्रिंट सशक्त नमुना किंवा पिन किंवा संकेतशब्दापेक्षा कमी सुरक्षित असू शकते. सुरक्षित असण्यासाठी बॅकअप लॉक स्क्रीन सेट करा."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"आपली बॅक अप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लॉक स्क्रीन बदला"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्यम ते उच्च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"संकेतशब्द"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षितता"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"सध्या नाही"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रीन लॉक"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"फिंगरप्रिंट + नमुना"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"फिंगरप्रिंट + पिन"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"संकेतशब्द अनलॉक करा बदला"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"संकेतशब्द कमीत कमी %d वर्ण असणे आवश्यक आहे"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"पिन कमीत कमी %d अंकांचा असावा"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"पूर्ण झाल्यानंतर सुरु ठेवा टॅप करा"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"सुरु ठेवा"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"संकेतशब्द <xliff:g id="NUMBER">%d</xliff:g> वर्णांपेक्षा कमीचा असावा."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"पिन <xliff:g id="NUMBER">%d</xliff:g> अंकांपेक्षा कमीचा असावा."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(न बदललेले)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"कृपया निवडा"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(एकाधिक प्रमाणपत्रे जोडली)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टीम प्रमाणपत्रे वापरा"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान करू नका"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित करू नका"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र निर्दिष्ट केले नाही. आपले कनेक्शन खाजगी होणार नाही."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन निर्दिष्ट करणे आवश्यक आहे."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क संकेतशब्द प्रविष्ट करा"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"अँबियन्ट प्रदर्शन"</string>
     <string name="doze_summary" msgid="7128970177894383698">"आपण डिव्हाइस निवडता किंवा सूचना प्राप्त करता तेव्हा स्क्रीन सक्रिय करा"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फॉन्ट आकार"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"मजकूर आणखी मोठा किंवा आणखी लहान करा"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग्ज"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"सिम कार्ड लॉक सेट अप करा"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"सिम कार्ड लॉक"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"प्रवेशयोग्यता"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"प्रवेशयोग्यता सेटिंग्ज"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृष्टी सेटिंग्ज"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"आपल्या गरजा पूर्ण करण्यासाठी आपण हे डिव्हाइस सानुकूलित करू शकता. ही प्रवेशयोग्यता वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलू शकता."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"सेवा"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"स्क्रीनवाचक साधन प्रामुख्याने दृष्टीहीन आणि कमी दृष्टी असलेल्या लोकांसाठी आहे"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"सिस्टम"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"प्रदर्शन"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"मथळे"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"विस्तृतीकरण जेश्चर"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"झूम करण्यासाठी 3 वेळा टॅप करा"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"झूम वाढविण्यासाठी आणि कमी करण्यासाठी स्क्रीनवर एका बोटाने तीन वेळा टॅप करा.\n\nझूम वाढविले असताना, आपण हे करू शकता:\n"<ul>\n<li>"स्क्रोल करणे: स्क्रीनवर 2 किंवा अधिक बोटे ड्रॅग करा"</li>\n<li>"झूम पातळी समायोजित करणे: दोन किंवा अधिक बोटे एकत्र करून पिंच करा किंवा ती पसरवा"</li></ul>\n\n"तात्पुरते झूम करण्यासाठी, 3 वेळा टॅप करा आणि शेवटचे टॅप केल्यावर धरून ठेवा. आपले बोट खाली धरून ठेवून, स्क्रीनभोवती ड्रॅग करा. परत झूम कमी करण्यासाठी आपले बोट उचला.\n\nटीप: विस्तृतीकरण जेश्चर कीबोर्ड आणि नेव्हिगेशन बार व्यतिरिक्त कुठेही कार्य करते."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"प्रवेशयोग्यता शॉर्टकट"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"चालू"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"बंद"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"स्वयंचलितपणे डिव्‍हाइस डेटाचा (जसे की वाय-फाय संकेतशब्द आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे संचयित केलेल्या सेटिंग्ज आणि फायली) दूरस्‍थपणे बॅकअप घ्‍या.\n\nआपण स्वयंचलित बॅकअप चालू करता तेव्‍हा, डिव्‍हाइस आणि अ‍ॅप डेटा मधूनमधून दूरस्‍थपणे जतन केला जातो. अ‍ॅप डेटा हा संपर्क, संदेश आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने जतन केलेला कोणताही डेटा असू शकतो (विकासकाच्या सेटिंग्जवर आधारित)."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"डिव्हाइस प्रशासन सेटिंग्ज"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"डिव्हाइस प्रशासक"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"निष्क्रिय करा"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"विस्थापित करा"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"हा डिव्हाइस प्रशासक निष्क्रिय करा"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"अॅप विस्थापित करा"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"निष्क्रिय करा आणि विस्थापित करा"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"डिव्हाइस प्रशासक"</string>
     <string name="no_device_admins" msgid="702695100241728775">"कोणतेही उपलब्ध डिव्हाइस प्रशासक नाहीत"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"वैयक्तिक"</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="6246742476064507965">"डिव्हाइस प्रशासक सक्रिय करायचे?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"सक्रिय करा"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"हा डिव्हाइस प्रशासक सक्रिय करा"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"डिव्हाइस प्रशासक"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"हे सक्रिय केल्याने प्रशासक <xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ला खालील कार्ये करण्याची अनुमती देईल:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"हा प्रशासक सक्रिय आहे आणि <xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ला खालील कार्ये करण्याची अनुमती देतो:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कॉल आणि SMS चालू करायचे?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास सामायिक केला जाईल."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आणीबाणी माहिती"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"आणीबाणी डायलरमध्‍ये लॉक स्क्रीन द्वारे प्रवेश करण्‍यायोग्य"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"आपला फोन अनलॉक न करता आणीबाणी डायलर मधून कोणाही द्वारे प्रवेश करण्यायोग्य"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंध असलेले अनुप्रयोग"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगासाठी सेटिंग्ज विस्तृत करा"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"केवळ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> पर्यंत अलार्मवर बदला"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"नेहमी व्‍यत्यय आणा वर बदला"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"स्क्रीन चालू असताना अवरोधित करा"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"व्यत्यय आणू नका द्वारे न दिसणाऱ्या सूचनांना स्क्रीनवर दिसण्यापासून किंवा डोकावण्यापासून प्रतिबंधित करा"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"स्क्रीन बंद असते तेव्हा अवरोधित करा"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"व्यत्यय आणू नका द्वारे न दिसणाऱ्या सूचनांना स्क्रीन चालू करण्यापासून किंवा सूचना प्रकाशाची उघडझाप करण्यापासून प्रतिबंधित करा"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"बंद"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"स्क्रीन चालू असताना"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रीन बंद असताना"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रीन चालू किंवा बंद असताना"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
     <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"प्रशासक पिन प्रविष्‍ट करा"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"आपले मनगट दोनदा वळवून कॅमेरा अॅप उघडा"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कॅमेर्‍यासाठी उर्जा बटण दोनदा दाबा"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"आपली स्क्रीन अनलॉक न करता कॅमेरा द्रुतपणे उघडा"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"प्रदर्शन आकार"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"स्क्रीन वरील आयटम आणखी मोठे किंवा आणखी लहान करा."</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"प्रदर्शन घनता, स्क्रीन झूम, मापन, मापन करीत आहे"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"आपल्या स्क्रीन वरील आयटम आणखी लहान किंवा आणखी मोठे करा. आपल्या स्क्रीन वरील काही अॅप्स स्थान बदलू शकतात."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"पूर्वावलोकन"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"आणखी लहान करा"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"आणखी मोठे करा"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 0de3f78..2778361 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Nyahlekap kad SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Padam storan USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Padam kad SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Kecilkan atau besarkan teks pada skrin."</string>
     <string name="small_font" msgid="2295331917424072635">"Kecil"</string>
     <string name="medium_font" msgid="2068475425515133701">"Sederhana"</string>
     <string name="large_font" msgid="599055175160971446">"Besar"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Buka kunci dengan cap jari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Sentuh sahaja penderia cap jari untuk membuka telefon anda, membenarkan pembelian atau log masuk ke apl. \n\n Berhati-hati tentang cap jari yang anda tambahkan - sebarang cap jari yang ditambahkan dapat melakukan perkara ini."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota: Cap jari anda mungkin kurang selamat berbanding corak atau PIN yang kukuh."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Ketahui lebih lanjut"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Nota: Cap jari anda mungkin kurang selamat berbanding corak atau PIN yang kukuh. "<annotation id="url">"Ketahui lebih lanjut"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Teruskan"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika hilang, dicuri atau dipadamkan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika hilang, dicuri atau dipadamkan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika hilang, dicuri atau dipadamkan."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika tablet tersebut hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika peranti tersebut hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika telefon tersebut hilang atau dicuri."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Langkau juga"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Kembali"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Cari penderia"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cari penderia cap jari di bahagian belakang telefon anda."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrasi yang memaparkan peranti dan lokasi penderia cap jari"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Anda boleh menambah sehingga <xliff:g id="COUNT">%d</xliff:g> cap jari"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alih keluar semua cap jari?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Anda tidak akan dapat menggunakan cap jari untuk membuka kunci telefon, membenarkan pembelian atau log masuk ke apl."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ya, alih keluar"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Gunakan cap jari anda untuk meneruskan."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Penyulitan"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Lindungi peranti anda"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Buka kunci menggunakan cap jari anda"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci skrin"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Pilih kunci skrin"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Lindungi telefon anda"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Cap jari mungkin kurang selamat berbanding corak, PIN atau kata laluan yang kukuh. Sediakan skrin kunci sandaran untuk lebih selamat."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Halang orang lain daripada menggunakan tablet ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Halang orang lain daripada menggunakan peranti ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Halang orang lain daripada menggunakan telefon ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Pilih kaedah kunci skrin sandaran anda"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci skrin"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Tukar kunci skrin"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Keselamatan sederhana ke tinggi"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Kata laluan"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Keselamatan tinggi"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Bukan sekarang"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Kunci skrin semasa"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Cap Jari + Corak"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Cap Jari + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Kata laluan mesti sekurang-kurangnya %d aksara"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mesti sekurang-kurangnya %d digit"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Ketik Teruskan apabila selesai"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Teruskan"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Kata laluan mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> aksara."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> digit."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(tidak berubah)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Sila pilih"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Berbilang sijil ditambahkan)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Gunakan sijil sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Jangan berikan"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Jangan sahkan"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Tiada sijil yang ditentukan. Sambungan anda tidak akan menjadi sambungan peribadi."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Perlu nyatakan domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan kata laluan rangkaian anda"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Paparan ambien"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Aktifkan skrin apabila anda mengambil peranti atau menerima pemberitahuan"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Besarkan atau kecilkan teks"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Tetapan kunci kad SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Sediakan kunci kad SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kunci kad SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Kebolehaksesan"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tetapan kebolehaksesan"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Tetapan Penglihatan"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Anda boleh menyesuaikan peranti ini mengikut keperluan anda. Ciri kebolehaksesan ini boleh diubah kemudian dalam Tetapan."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Perkhidmatan"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Pembaca skrin terutamanya untuk orang yang buta dan rabun"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Paparan"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Kapsyen"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gerak isyarat pembesaran"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Ketik 3 kali untuk mengezum"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Untuk mengezum masuk dan keluar, ketik skrin 3 kali menggunakan satu jari.\n\nSemasa dizum masuk, anda boleh:\n"<ul>\n<li>"Tatal: Seret menggunakan sekurang-kurangnya 2 jari merentasi skrin"</li>\n<li>"Laraskan tahap zum: Rapatkan sekurang-kurangnya dua jari atau regangkannya"</li></ul>\n\n"Untuk mengezum buat sementara waktu, ketik 3 kali dan tahan pada ketikan terakhir. Sambil menekan jari anda, seret untuk bergerak di sekitar skrin. Angkat jari anda untuk mengezum keluar.\n\nNota: Gerak isyarat pembesaran berfungsi di semua tempat kecuali pada papan kekunci dan bar navigasi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan kebolehaksesan"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Hidupkan"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Mati"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Sandarkan data peranti (seperti kata laluan Wi-Fi dan sejarah panggilan) dan data apl (seperti tetapan dan fail yang disimpan mengikut apl) dari jauh secara automatik.\n\nApabila anda menghidupkan sandaran automatik, data peranti dan apl disimpan secara berkala dari jauh. Data apl boleh terdiri daripada sebarang data yang telah disimpan oleh apl (berdasarkan tetapan pembangun), termasuk data yang berkemungkinan sensitif, seperti kenalan, mesej dan foto."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Tetapan pentadbir peranti"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Pentadbir peranti"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Nyahaktifkan"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Nyahpasang"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Nyahaktifkan pentadbir peranti ini"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Nyahpasang apl"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Nyahaktifkan dan Nyahpasangkan"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Pentadbir peranti"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Tiada pentadbir peranti tersedia"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Peribadi"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Tempat Kerja"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Tiada ejen amanah tersedia"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktifkan pentadbir peranti?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktifkan"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktifkan pentadbir peranti ini"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Pentadbir peranti"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Mengaktifkan pentadbir ini akan membenarkan aplikasi <xliff:g id="APP_NAME">%1$s</xliff:g> melaksanakan pengendalian berikut:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Pentadbir ini aktif dan membenarkan aplikasi <xliff:g id="APP_NAME">%1$s</xliff:g> melaksanakan pengendalian berikut:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Hidupkan panggilan telefon &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Sejarah panggilan dan SMS akan dikongsi dengan pengguna ini."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Maklumat kecemasan"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Boleh diakses melalui skrin kunci pada pendail kecemasan"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Boleh diakses oleh sesiapa sahaja daripada pendail kecemasan tanpa membuka kunci telefon anda"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Benarkan apl dan kandungan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan sekatan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Kembangkn tetapan utk aplikasi"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Tukar kepada penggera sahaja hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Tukar kepada sentiasa ganggu"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Sekat apabila skrin dihidupkan"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Halang pemberitahuan yang disenyapkan oleh Jangan Ganggu daripada mengintai atau muncul pada skrin"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Sekat apabila skrin dimatikan"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Halang pemberitahuan yang disenyapkan oleh Jangan Ganggu daripada menghidupkan skrin atau mendenyutkan lampu pemberitahuan"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Matikan"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Apabila skrin dihidupkan"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Apabila skrin dimatikan"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Apabila skrin dihidupkan atau dimatikan"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Masukkan PIN pentadbir"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Buka apl kamera dengan memusingkan pergelangan tangan anda dua kali"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tekan butang kuasa dua kali untuk kamera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Buka kamera dengan cepat tanpa membuka kunci skrin"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Saiz paparan"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Besarkan atau kecilkan item pada skrin"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"kepadatan paparan, zum skrin, skala, penskalaan"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Kecilkan atau besarkan item pada skrin anda. Sesetengah apl pada skrin anda mungkin berubah kedudukan."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Pratonton"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Buat yang lebih kecil"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Buat yang lebih besar"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 04c9197..c876537 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"သင့်ဖုန်းကို သော့ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန်၊ သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် လက်ဗွေဖတ်ကိရိယာကိုသာ ထိလိုက်ပါ။\n\n မည်သည့်လက်ဗွေကို သင်ထည့်သွင်းသလဲဆိုတာကို ဂရုစိုက်ပါ − ထည့်သွင်းလိုက်သည့် လက်ဗွေများအားလုံးသည် ဤအရာများကို လုပ်နိုင်ပါလိမ့်မည်။"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"မှတ်ချက်- သင့်လက်ဗွေရာသည် ခိုင်မာသော ပုံစံ သို့မဟုတ် PIN ထက် လုံခြုံရေးနည်းနိုင်သည်။"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"ပိုပြီး လေ့လာရန်"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"မှတ်ချက် − သင့်လက်ဗွေသည် လုံခြုံသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ်ထက် လုံခြုံမှုပိုအားနည်းပါသည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ဖျက်သိမ်းရန်"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ဆက်လုပ်ရန်"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ အခိုးခံရလျှင် သို့မဟုတ် ရှင်းလင်းလိုက်လျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ အခိုးခံရလျှင် သို့မဟုတ် ရှင်းလင်းလိုက်လျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ အခိုးခံရလျှင် သို့မဟုတ် ရှင်းလင်းလိုက်လျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"မည်သို့ပင်ဖြစ်စေ ကျော်ပါ"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"နောက်သို့ သွားပါ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"အာရုံခံကိရိယာ ရှာရန်"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"လက်ဗွေရာ အာရုံခံကိရိယာအား သင့်ဖုန်း၏ကျောဘက်တွင် နေရာချပါ။"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"စက်ကိရိယာနှင့် လက်ဗွေရာအာရုံခံစက် ကိုတည်နေရာနှင့်အတူသရုပ်ဖော်ပုံ"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"လက်ဗွေရာ <xliff:g id="COUNT">%d</xliff:g> ခု အထိ သင်ထည့်နိုင်၏"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"လက်ဗွေ အားလုံးကို ဖယ်ရှားရမလား?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"သင်သည် သင့်ဖုန်းကို သော့ဖွင့်ခြင်း၊ ဈေးဝယ်မှုများကို အတည်ပြုခြင်း၊ သို့မဟုတ် အကပ်များကို လက်မှတ်ထိုးဝင်ရန်အတွက် သင်၏ လက်ဗွေများကို သုံးနိုင်မည် မဟုတ်ပါ။"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"သင့်စက်ပစ္စည်းအား ကာကွယ်ပါ"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"သင့်လက်ဗွေဖြင့် သော့ဖွင့်ပါ"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"မျက်နှာပြင်သော့ပိတ်နည်းရွေးရန်"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"မျက်နှာပြင် သော့ပိတ်ရန်ကို ရွေးရန်"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"သင့်ဖုန်းကို ကာကွယ်ပါ"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"လက်ဗွေသည် လုံခြုံသည့် ပုံစံ၊ ပင်နံပါတ် သို့မဟုတ် စကားဝှက်ထက် လုံခြုံမှုပိုအားနည်းပါသည်။ လုံခြုံမှုရှိစေရန် အရန်လော့ခ်ချထားသည့်မျက်နှာပြင်တစ်ခုကို ထည့်သွင်းပါ။"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤတက်ဘလက်ကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤစက်ပစ္စည်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤဖုန်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"သင့်ရဲ့အရန်သင့်သိမ်းဆည်းမျက်နှာပြင်သော့ခတ်တဲ့နည်းလမ်းကိုရွေးချယ်ပါ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ဖန်သားပြင် သော့ချခြင်း"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"မျက်နှာပြင်သော့ပြောင်း"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"အလယ်အလတ်မှ မြင့်သော လုံခြုံရေး"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"လျို့ဝှက် နံပါတ်"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"လုံခြုံရေး မြင့်မည်"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ယခု မဟုတ်ပါ"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"လက်ရှိမျက်နှာပြင် သော့ချခြင်း"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"လက်ဗွေ + ပုံစံ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"လက်ဗွေ + ပင်နံပါတ်"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ဖွင့်ရန်စကားဝှက်အား ပြောင်းမည်"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"စကားဝှက်နံပါတ်မှာ အနည်းဆုံး အက္ခရာ%dရှိရမည်"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ပင်နံပါတ်သည် အနည်းဆုံး ဂဏန်း %d လုံး ရှိရမည်။"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"ပြီးသွားလျှင် ရှေ့ဆက်ပါ ကိုတို့ပါ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ဆက်ရန်"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"စကားဝှက်သည် <xliff:g id="NUMBER">%d</xliff:g> စာလုံးရေထက် နည်းရမည်။"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ပင်နံပါတ်သည် ဂဏန်း <xliff:g id="NUMBER">%d</xliff:g> လုံးအောက်ထက် နည်းရမည်။"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ပြောင်းလဲခြင်းမရှိ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"ကျေးဇူးပြု၍ ရွေးချယ်ပါ"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(အသိမှတ်ပြုလက်မှတ်များ ပေါင်းထည့်ပြီးပါပြီ)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"စနစ်ပိုင်း အသိအမှတ်ပြုလက်မှတ်များကို သုံးပါ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"မပေးထားပါ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"အတည်မပြုပါ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"အသိမှတ်ပြုလက်မှတ် မသတ်မှတ်ထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ဒိုမိန်းတစ်ခု သတ်မှတ်ပေးရပါမည်။"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSရရှိုနိုင်သည်"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSရရှိုနိုင်သည်)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"သင်၏ ကွန်ရက် စကားဝှက်ကို ထည့်သွင်းရန်"</string>
@@ -1588,7 +1599,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"အများ သုံးစွဲနိုင်မှု"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"အများ သုံးစွဲနိုင်မှု ဆက်တင်များ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"မြင်ရမှု ဆက်တင်များ"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ ဤအများသုံးစွဲနိုင်မှုအင်္ဂါရပ်ကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ ဤသုံးရလွယ်သည့် ဝန်ဆောင်မှုများကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"ဆားဗစ်ဆိုင်ရာ"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"မျက်နှာပြင်ဖတ်စနစ်သည် မျက်မမြင်နှင့် မျက်စိမှုန်သူများအတွက် အဓိကဖြစ်ပါသည်"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"(ဝိုင်ဖိုင် စကားဝှက်နှင့် ခေါ်ဆိုမှုမှတ်တမ်း အစရှိသော) စက်ကိရိယာဒေတာများနှင့် (ဆက်တင်များနှင့် app များမှ သိမ်းဆည်းထားသော ဖိုင်များ အစရှိသော) app ဒေတာများအား အဝေးမှ အလိုအလျောက် အရံသိမ်းဆည်းပါ။ \n\nအလိုအလျောက် အရံသိမ်းဆည်းခြင်းအား ဖွင့်ထားသည့်အခါ၊ စက်ကိရိယာနှင့် app ဒေတာများအား ကာလအပိုင်းအခြားအလိုက် အဝေးမှ သိမ်းဆည်းသွားမည်။ App ဒေတာ ဆိုသည်မှာ (ဆော့ဖ်ဝဲရေးသူ ဆက်တင်အား အခြေပြုလျက်) app မှ သိမ်းဆည်းထားသော မည်သည့်ဒေတာမဆို ဖြစ်နိုင်ပြီး အဆက်အသွယ်များ၊ စာတိုများနှင့် ဓာတ်ပုံများ အစရှိသည့် အရေးကြီးသည့် ဒေတာများလည်း ပါဝင်နိုင်သည်။"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"စက်၏ ထိန်းချုပ်ကိုင်တွယ်မှု ဆက်တင်များ"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"စက်၏ ထိန်းချုပ်ကိုင်တွယ်သူ"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"အလုပ်မလုပ်ရန် ရပ်ဆိုင်းခြင်း"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"ဖြုတ်ပါ"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ဤစက်ပစ္စည်း စီမံခန့်ခွဲသူကို ဖြုတ်လိုက်ပါ"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"အက်ပ်ကို ဖယ်ရှားပါ"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"ပိတ်ပါ သို့မဟုတ် ဖယ်ထုတ်ပါ"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"စက်ပစ္စည်းထိန်းချုပ်မှုအား စီမံသူ"</string>
     <string name="no_device_admins" msgid="702695100241728775">"စက်ပစ္စည်းထိန်းချုပ်မှုအား စီမံသူ မည်သူမှမရှိပါ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ကိုယ်ရေး"</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="6246742476064507965">"စက်၏ ထိန်းချုပ်ကိုင်တွယ်သူအဖြစ် စတင်သုံးစွဲမည်လား?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"စတင်အသုံးပြုနိုင်စေရန် ပြုလုပ်မည်"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"ဤစက်ပစ္စည်း၏ စီမံခန့်ခွဲသူကို စသွင်းပါ"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"စက်၏ ထိန်းချုပ်ကိုင်တွယ်သူ"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ဤထိန်းချုပ်ကိုင်တွယ်သူကို အသက်သွင်းခြင်းဖြင့် အပလီကေးရှင်း<xliff:g id="APP_NAME">%1$s</xliff:g>ကို အောက်ပါလုပ်ဆောင်ချက်များဆောင်ရွက်ရန် ခွင့်ပြုမည်"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ထိန်းချုပ်ကိုင်တွယ်သူမှာ အလုပ်လုပ်ဆောင်နေပြီး  ဤအပ်ပလီကေးရှင်းကို<xliff:g id="APP_NAME">%1$s</xliff:g>ဖော်ပြပါတို့အား လုပ်ဆောင်ရန်ခွင့်ပြုသည်"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ဖုန်းခေါ်ဆိုမှုများ&amp; SMS ကို ဖွင့်မည်လား။"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ခေါ်ဆိုမှု နှင့် SMS မှတ်တမ်းကို ဒီအသုံးပြုသူနှင့် မျှဝေပေးမည်။"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"အရေးပေါ်အချက်အလက်"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"အရေးပေါ်ဖုန်းခေါ်ဆိုမှုစနစ်တွင် သော့ခတ်ထားသည့်မျက်နှာပြင်မှနေ၍ အသုံးပြုနိုင်သည်"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"သင့်ဖုန်းကို လော့ခ်ဖြုတ်စရာမလိုဘဲ အရေးပေါ်ခေါ်ဆိုမှုခလုတ်ကို မည်သူမဆို အသုံးပြုနိုင်သည်"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"အပလီကေးရှင်းနှင့် ပါရှိချက်များကို ခွင့်ပြုရန်"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ကန့်သတ်ချက်များရှိသော အပလီကေးရှင်းများ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"အပလီကေးရှင်းဆက်တင်းများကိုချဲ့ပြပါ"</string>
@@ -2579,7 +2591,7 @@
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"မျက်နှာပြင်ဖွင့်ထားစဉ်တွင် ပိတ်ဆို့ပါ"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"မျက်နှာပြင်ပေါ်တွင် ဖော်ပြခြင်း သို့မဟုတ် ပေါ်လာခြင်းကို Do Not Disturb မှတားဆီးခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"မျက်နှာပြင်ပိတ်ထားစဉ်တွင် ပိတ်ဆို့ပါ"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"မျက်နှာပြင်ကိုဖွင့်ခြင်း သို့မဟုတ် သတိပေးချက်မီးကို မိတ်တုတ်မိတ်တုတ်ပြုလုပ်ခြင်းများကို Do Not Disturb မှတားဆီးခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"မျက်နှာပြင်ကိုဖွင့်ခြင်း သို့မဟုတ် သတိပေးချက်မီးကို မှိတ်တုတ်မှိတ်တုတ်ပြုလုပ်ခြင်းများကို Do Not Disturb မှတားဆီးခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ပိတ်ပါ"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"မျက်နှာပြင် ဖွင့်ထားစဉ်"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"မျက်နှာပြင် ပိတ်ထားစဉ်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1ea2fbb..f916238 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Avmonter minnekort"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Slett USB-lagring"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Tøm SD-kort"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Gjør teksten på skjermen større eller mindre."</string>
     <string name="small_font" msgid="2295331917424072635">"Liten"</string>
     <string name="medium_font" msgid="2068475425515133701">"Middels"</string>
     <string name="large_font" msgid="599055175160971446">"Stor"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås opp med avtrykk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Bare trykk på fingeravtrykkssensoren for å låse opp telefonen, autorisere kjøp eller logge på apper. \n\n Vær forsiktig med hvilke fingeravtrykk du legger til – alle som legges til, kan utføre disse handlingene."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Merk: Fingeravtrykk kan være mindre sikkert enn et sterkt mønster eller PIN-koder."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Finn ut mer"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Merk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode. "<annotation id="url">"Finn ut mer"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsett"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke dette nettbrettet hvis du mister det, det blir stjålet eller innholdet blir slettet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne enheten hvis du mister den, den blir stjålet eller innholdet blir slettet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne telefonen hvis du mister den, den blir stjålet eller innholdet blir slettet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke dette nettbrettet hvis du mister det eller det blir stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne enheten hvis du mister den eller den blir stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne telefonen hvis du mister den eller den blir stjålet."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Hopp over likevel"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Gå tilbake"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Finn sensoren"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finn fingeravtrykksensoren på baksiden av telefonen."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustrasjon med enheten og plasseringen av fingeravtrykksensoren"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Du kan legge til opptil <xliff:g id="COUNT">%d</xliff:g> fingeravtrykk"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vil du fjerne alle fingeravtrykk?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Du kommer ikke til å kunne bruke fingeravtrykk til å låse opp telefonen, autorisere kjøp eller logge på apper."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, fjern"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Bruk fingeravtrykket ditt for å fortsette."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Beskytt enheten"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Lås opp med fingeravtrykket ditt"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Velg skjermlås"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Velg skjermlås"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Beskytt telefonen"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Merk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode. Konfigurer en låseskjerm som et reservealternativ for å være sikker."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindre at andre bruker dette nettbrettet uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindre at andre bruker denne enheten uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindre at andre bruker denne telefonen uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Velg reservemetode for skjermlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjermlås"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Endre skjermlås"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Middels til høy sikkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Høy sikkerhet"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ikke nå"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Gjeldende skjermlås"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingeravtrykk og mønster"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingeravtrykk og PIN-kode"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Passord må bestå av minst %d tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden må ha minst %d sifre"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Trykk på Fortsett når du er ferdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Passordet må inneholde færre enn <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-koden må inneholde færre enn <xliff:g id="NUMBER">%d</xliff:g> sifre."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(uendret)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Velg"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Flere sertifikater er lagt til)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Bruk systemsertifikat"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ikke oppgi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ikke godkjenn"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ingen sertifikater er spesifisert. Tilkoblingen din blir ikke privat."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Du må angi et domene."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Skriv inn nettverkspassordet ditt"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Omgivelsesskjerm"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Slå på skjermen igjen når du gjenopptar bruken av enheten eller når du mottar varsler"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer SIM-kort-lås"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kort-lås"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Tilgjengelighet"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tilgjengelighetsinnstillinger"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsinnstillinger"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enheten etter egne behov. Tilgjengelighetsfunksjonene kan du endre senere i innstillingene."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Skjermleseren er hovedsakelig for blinde og svaksynte"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Skjerm"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Teksting"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Forstørrelsesbevegelser"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trykk tre ganger for å zoome"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"For å zoome inn og ut, trykk på skjermen tre ganger med én finger.\n\nNår du har zoomet inn, kan du\n"<ul>\n<li>"rulle: Dra to eller flere fingre over skjermen"</li>\n<li>"justere zoomnivået: Klyp sammen to eller flere fingre, eller spre dem fra hverandre."</li></ul>\n\n"For å forstørre midlertidig, trykk tre ganger, hold inne og dra fingeren over skjermen for å utforske forskjellige deler. Løft fingeren for å gå tilbake til det forrige bildet.\n\nMerk: Forstørrelsesbevegelser fungerer overalt, utenom på tastaturet og i navigeringsraden."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snarvei for tilgjengelighet"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"På"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Sikkerhetskopiér enhetsdata (for eksempel Wi-Fi-passord og anropslogg) og appdata (for eksempel innstillinger og filer lagret av apper) automatisk fra en ekstern posisjon.\n\nNår du slår på automatisk sikkerhetskopiering, lagres app- og enhetsdata automatisk fra en ekstern posisjon. Appdata kan være alle slags data apper har lagret (basert på utviklerinnstillinger), inkludert potensielle sensitive data, for eksempel kontakter, meldinger og bilder."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Innstillinger for enhetsadministrasjon"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhetsadministrator"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Avinstaller"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiver denne enhetsadministratoren"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Avinstaller appen"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiver og avinstaller"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Enhetsadministratorer"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Ingen tilgjengelige enhetsadministratorer"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personlig"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Jobb"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Ingen tilgjengelige pålitelige agenter"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktiver enhetsadministrator?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiver"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktivér denne enhetsadministratoren"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Enhetsadministrator"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktivering av denne administratoren tillater appen <xliff:g id="APP_NAME">%1$s</xliff:g> å utføre følgende handlinger:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Administratoren er aktiv og tillater at appen <xliff:g id="APP_NAME">%1$s</xliff:g> utfører følgende handlinger:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du slå på telefonsamtaler og SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Anrops- og tekstmeldingsloggen deles med denne brukeren."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informasjon for nødstilfeller"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Tilgjengelig via alternativet for nødanrop på låseskjermen"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Tilgjengelig for alle via alternativet for nødanrop – du trenger ikke å låse opp telefonen"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillat apper og innhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apper med begrensninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utvidelsesinnstillinger for appen"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Endre til Bare alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Bytt til Alltid forstyrr"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokkér når skjermen er på"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Unngå at varsler som er lydløse når «Ikke forstyrr»-modusen er slått på, vises på skjermen"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokkér når skjermen er av"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Unngå at varsler som er lydløse når Ikke forstyrr er aktivert, slår skjermen på eller får varsellyset til å blinke"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Av"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Når skjermen er på"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skjermen er av"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skjermen er på eller av"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Skriv inn administrator-PIN-koden"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Åpne kameraappen ved å vri to ganger på håndleddet"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tykk på av/på-knappen to ganger for kamera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Åpne kameraet raskt uten å låse opp skjermen"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Skjermstørrelse"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Gjør alt på skjermen større eller mindre"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"skjermtetthet, zoom på skjermen, skala, skalering"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Gjør alt på skjermen større eller mindre. Enkelte apper på skjermen kan skifte plassering."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Forhåndsvisning"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Gjør mindre"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Gjør større"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 7ea1d4a..d80ebc6 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"तपाईँको फोन अनलक गर्न, खरिद प्रमाणीत गर्न, वा अनुप्रयोगमा साइन इन गर्न फिंगरप्रिन्ट सेन्सरमा छुनुहोस्। \n\n फिंगरप्रिन्टहरू थप्ने सवालमा साबधान रहनुहोस् - थपिएको कुनै पनि फिंगरप्रिन्टहरूले यी कुराहरू गर्न सक्षम हुनेछन्।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"नोट: तपाईँको फिंगरप्रिन्ट भरपर्दो ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"थप जान्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"टिपोट: तपाईंको फिंगरप्रिन्ट ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी राख्नुहोस्"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो ट्याब्लेट हरायो, चोरी भयो वा हटाइयो भने तपाईँ यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो यन्त्र हरायो, चोरी भयो वा हटाइयो भने तपाईँ यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो फोन हरायो, चोरी भयो वा हटाइयो भने तपाईँ यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो ट्याब्लेट हरायो वा चोरी भयो भने तपाईँ यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो यन्त्र हरायो वा चोरी भयो भने तपाईँ यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो फोन हरायो वा चोरी भयो भने तपाईँ यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"जसरी पनि छाड्नुहोस्"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"पछाडि फिर्ता जानुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर खोज्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"तपाईँको फोनको पछाडि तर्फ औठाछाप सेन्सरको स्थान निर्धारण गर्नुहोस्।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"यन्त्र साथ चित्रण र फिंगरप्रिन्ट सेन्सर स्थान"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"तपाईँ <xliff:g id="COUNT">%d</xliff:g> सम्म फिंगरप्रिन्टहरू थप्न सक्नुहुन्छ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सबै फिंगरप्रिन्टहरू हटाउने हो?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"तपाईँको फोन अनलक गर्न, खरिद अधिकार प्रदान गर्न वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्न तपाईँ आफ्नो फिंगरप्रिन्टहरूको प्रयोग गर्न सक्षम हुनु हुने छैन।"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"तपाईँको यन्त्र सुरक्षित गर्नुहोस्"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"तपाईंको फिंगरप्रिन्ट प्रयोग गरी अनलक गर्नुहोस्"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रिन लक छान्नुहोस्"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"स्क्रिन लक छान्‍नुहोस्"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"तपाईँको फोन सुरक्षित गर्नुहोस्"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"तपाईंको फिंगरप्रिन्ट ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ। सुरक्षित हुनका लागि ब्याकअप लक स्क्रिन सेटअप गर्नुहोस्।"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो ट्याब्लेट प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो यन्त्र प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो फोन प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"तपाईँको ब्याकअप स्क्रिन लक विधि छनौंट गर्नुहोस्"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रिन लक"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लक स्क्रिन बदल्नुहोस्"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्यमदेखि उच्च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड:"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"अहिले होइन"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रिन लक"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"फिंगरप्रिन्ट + ढाँचा"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"फिंगरप्रिन्ट + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलक पासवर्ड परिवर्तन गर्नुहोस्"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"पासवर्ड कम्तिमा %d अक्षरको हुनुपर्छ"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN कम्तिमा %d अंकहरूको हुनुपर्दछ"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"सकिएपछि जारी राख्नुहोस् मा ट्याप गर्नुहोस्"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी राख्नुहोस्"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"पासवर्डमा <xliff:g id="NUMBER">%d</xliff:g> भन्दा कम अक्षरहरू हुनुपर्दछ।"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN <xliff:g id="NUMBER">%d</xliff:g> भन्दा थोरै अङ्कको हुनुपर्छ।"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"कृपया चयन गर्नुहोस्"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(बहु प्रमाणपत्रहरू थपिए)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"प्रणालीका प्रमाणपत्रहरू प्रयोग गर्नुहोस्"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान नगर्नुहोस्"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित नगर्नुहोस्"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कुनै प्रमाणपत्र निर्दिष्ट गरिएको छैन। तपाईंको जडान निजी हुनेछैन।"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"डोमेन निर्दिष्ट गर्नुपर्छ"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध छ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आफ्नो सञ्जाल पासवर्ड प्रविष्ट गर्नुहोस्"</string>
@@ -1591,13 +1602,13 @@
     <string name="vision_settings_description" msgid="5679491180156408260">"तपाईंले आफ्नो आवश्यकताहरूसँग मेल खाने बनाउन यस यन्त्रलाई अनुकूलन गर्न सक्नुहुन्छ। यी पहुँच सुविधाहरू सेटिङमा पछि परिवर्तन गर्न सकिनेछ।"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"सेवाहरू"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"मुख्तया दृष्टि र कम दृष्टि भएका व्यक्तिहरूको लागि स्क्रिन पाठक"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"मुख्तया दृष्टिविहीन र कम दृष्टि भएका व्यक्तिहरूको लागि स्क्रिन रिडर"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"प्रणाली"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"प्रदर्शन"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"क्याप्सन"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"म्याग्निफिकेशन इसारा"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"जुम गर्न ३ पटक ट्याप गर्नुहोस्"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"To जुम इन र आउट गर्न स्क्रिनमा एक औंलाले ३ पटक ट्याप गर्नुहोस्.\n\nजुम इन हुदाँ, तपाईंले:\n"<ul>\n<li>"स्क्रोल गर्न सक्नुहुन्छ: २ वा थप औंलाले सर्वत्र स्क्रिनमा तान्नुहोस्"</li>\n<li>"जुम स्तर मिलाउनुहोस्: २ वा थप औंलाले पिन्च गर्नुहोस् वा तिनीहरूलाई सँगसँगै फैलाउनुहोस्"</li></ul>\n\n"अस्थायी रूपमा जुम गर्न, ३ पटक ट्याप गर्नुहोस् र पछिल्लो ट्यापमा समातिराख्नुहोस्। तपाईंको औंलालाई तलतिर राख्दा,सर्वत्र स्क्रिनमा सार्न तान्नुहोस्।. जुम हटाउन आफ्नो औंला छोड्नुहोस्।.\n\nध्यान दिनुहोस्:प्रशंसा गेस्चरले कुञ्जीपाटी र नेभिगेसन पट्टि बाकेक जहाँकही कार्य गर्छ।"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"जुम इन र आउट गर्न स्क्रिनमा एक औंलाले ३ पटक ट्याप गर्नुहोस्.\n\nजुम इन हुँदा, तपाईं निम्न कार्य गर्न सक्नुहुन्छ:\n"<ul>\n<li>"स्क्रोल गर्न: २ वा बढी औंलाले सर्वत्र स्क्रिनमा तान्नुहोस्"</li>\n<li>"जुम स्तर मिलाउन: २ वा बढी औंलाले पिन्च गर्नुहोस् वा तिनीहरूलाई सँगसँगै फैलाउनुहोस्"</li></ul>\n\n"अस्थायी रूपमा जुम गर्न, ३ पटक ट्याप गर्नुहोस् र पछिल्लो ट्यापमा थिचिरहनुहोस्। तपाईंको औंलालाई तलतिर राख्दा,सर्वत्र स्क्रिनमा सार्न तान्नुहोस्। जुम हटाउन आफ्नो औंला छोड्नुहोस्।.\n\nटिपोट :म्याग्निफिकेशन इसाराले कुञ्जीपाटी र नेभिगेसन पट्टि बाहेक जहाँकही काम गर्छ।"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"उपलब्धता सर्टकट"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"खुला"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"बन्द"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"यन्त्र डेटा (जस्तै Wi-Fi पासवर्डहरू र कल इतिहास) र अनुप्रयोग डेटा (जस्तै अनुप्रयोगहरूद्वारा भण्डारित सेटिङहरू र फाइलहरू) टाढाबाट स्वचालित रुपमा ब्याकअप गर्नुहोस्। \n\nजब तपाईँ स्वचालित ब्याकअप यन्त्र सक्षम गर्नुहुन्छ, यन्त्र र अनुप्रयोग डेटा आवधिक रूपमा टाढाबाट सुरक्षित गरिएको छ। सम्पर्क, सन्देशहरू, र तस्बिरहरू जस्तै सम्भावित संवेदनशील डेटा सहित, अनुप्रयोग डेटा कुनै पनि डेटा हुनसक्छ जुन अनुप्रयोगले (विकासकर्ता सेटिङहरूमा आधारित) सुरक्षित गरेको छ।"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"उपकरण प्रशासन सेटिङहरू"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"उपकरण व्यवस्थापक"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"निष्क्रिय गर्नुहोस्"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"स्थापना रद्द गर्नुहोस्"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"यस यन्त्र प्रशासकलाई निष्क्रिय गर्नुहोस्"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"अनुप्रयोगको स्थापना रद्द गर्नुहोस्"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"निष्क्रिय वा स्थापना रद्द गर्नुहोस्"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"उपकरण प्रशासकहरू"</string>
     <string name="no_device_admins" msgid="702695100241728775">"कुनै उपकरण व्यवस्थापकहरू उपलब्ध छैनन्"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"व्यक्तिगत"</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="6246742476064507965">"उपकरण प्रशासक सक्रिय पार्ने हो?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"सक्रिय गर्नुहोस्"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"यस यन्त्रको प्रशासकलाई सक्रिय गर्नुहोस्"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"उपकरण व्यवस्थापक"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"यस व्यवस्थापकलाई सक्रिय गर्नको लागि अनुप्रयोग <xliff:g id="APP_NAME">%1$s</xliff:g> ले  निम्नलिखित कारवाहीहरू गर्नको लागि अनुमति दिने छ:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"यो प्रशासक सक्रिय छ र  निम्नलिखित कारवाही गर्नका लागि <xliff:g id="APP_NAME">%1$s</xliff:g> अनुप्रयोगलाई अनुमति दिन्छ:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कल तथा SMS सक्षम गर्ने हो?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कल र SMS इतिहास यो प्रयोगकर्तासँग साझेदारी गरिने छ।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपतकालीन सूचना"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"आपतकालीन डायलरमा लक स्क्रिनद्वारा पहुँचयोग्य"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"तपाईँको फोन अनलक नगरिकन नै आपतकालीन डायलमा जोकोहीद्वारा पहुँच"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अनुप्रयोगहरू र सामग्री अनुमति दिनुहोस्"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबन्धको साथ अनुप्रयोगहरू"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"अनुप्रयोगको लागि सेटिङहरू विस्तार गर्नुहोस्"</string>
@@ -2576,14 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> सम्मको लागि मात्र अलार्म परिवर्तन गर्नुहोस्"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"सधैं अवरोध गर्ने गरी परिवर्तन गर्नुहोस्"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"स्क्रिन अन हुदाँ ब्लक गर्नुहोस्"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"स्क्रिनमा नियालेर वा बाहिर ल्याएर बाधा नपुर्‍याउनुहोस् द्वारा सुचनाहरू शान्त पार्नेलाई रोक्नुहोस्"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"स्क्रिन अफ हुदाँ ब्लक गर्नुहोस्"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"स्क्रिनमा बाधा नपुर्‍याउनुहोस् लाई अन गरी वा सूचना बत्तीलाई पल्स गरी सुचनाहरू शान्त पार्नेलाई रोक्नुहोस्"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"स्क्रिन अन हुँदा ब्लक गर्नुहोस्"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"स्क्रिनमा नियालेर वा बाहिर ल्याएर बाधा नपुर्‍याउनुहोस् द्वारा सुचनाहरू शान्त पार्ने कार्यलाई रोक्नुहोस्"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"स्क्रिन अफ हुँदा ब्लक गर्नुहोस्"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"स्क्रिनमा बाधा नपुर्‍याउनुहोस् लाई अन वा सूचना बत्तीलाई पल्स गरी सूचनाहरू शान्त पार्ने कार्यलाई रोक्नुहोस्"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"निष्क्रिय गर्नुहोस्"</string>
-    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"स्क्रिन अन हुदाँ"</string>
-    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रिन अफ हुदाँ"</string>
-    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रिन अन वा अफ हुदाँ"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"स्क्रिन अन हुँदा"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रिन अफ हुँदा"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रिन अन वा अफ हुँदा"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
     <string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"प्रशासक PIN प्रविष्ट गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8c48a68..7adce33 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD-kaart ontkoppelen"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB-opslag wissen"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD-kaart wissen"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"De tekst op het scherm kleiner of groter maken."</string>
     <string name="small_font" msgid="2295331917424072635">"Klein"</string>
     <string name="medium_font" msgid="2068475425515133701">"Gemiddeld"</string>
     <string name="large_font" msgid="599055175160971446">"Groot"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ontgrendelen met vingerafdruk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Tik op de vingerafdruksensor om je telefoon te ontgrendelen, toestemming te geven voor aankopen of in te loggen bij apps. \n\n Denk goed na voordat je vingerafdrukken van mensen toevoegt: deze acties kunnen met alle toegevoegde vingerafdrukken worden uitgevoerd."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Opmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Meer informatie"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Opmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode. "<annotation id="url">"Meer informatie"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuleren"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Doorgaan"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze tablet gebruiken in geval van verlies of diefstal of als de tablet wordt gewist."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen dit apparaat gebruiken in geval van verlies of diefstal of als het apparaat wordt gewist."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"De beschermingsfuncties voor dit apparaat worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze telefoon gebruiken in geval van diefstal of verlies of als de telefoon wordt gewist."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze tablet gebruiken in geval van verlies of diefstal."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen dit apparaat gebruiken in geval van verlies of diefstal."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze telefoon gebruiken in geval van verlies of diefstal."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Toch overslaan"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Terug"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"De sensor zoeken"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Zoek de vingerafdruksensor op de achterkant van je telefoon."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustratie met apparaat en locatie van vingerafdruksensor"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Je kunt maximaal <xliff:g id="COUNT">%d</xliff:g> vingerafdrukken toevoegen"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alle vingerafdrukken verwijderen?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Je kunt je vingerafdrukken niet gebruiken om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, verwijderen"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Gebruik je vingerafdruk om door te gaan."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryptie"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Bescherm je apparaat"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Ontgrendelen met je vingerafdruk"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Schermvergrendeling kiezen"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Schermvergrendeling kiezen"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Bescherm je telefoon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Je vingerafdruk is mogelijk minder veilig dan een sterk patroon, sterke pincode of sterk wachtwoord. Stel een back-upvergrendelingsscherm zijn voor betere beveiliging."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze tablet zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Kies je back-upmethode voor schermvergrendeling"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Schermvergrendeling"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schermvergr. wijzigen"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Gemiddelde tot zware beveiliging"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wachtwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Zware beveiliging"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Niet nu"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Huidige schermvergrendeling"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Vingerafdruk + patroon"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Vingerafdruk + pincode"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wachtwoord moet ten minste %d tekens lang zijn"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Pincode moet ten minste %d cijfers zijn"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tik op Doorgaan als je klaar bent"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Doorgaan"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wachtwoord moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> tekens."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Pincode moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> cijfers."</string>
@@ -886,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Actieve display"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Scherm activeren wanneer je het apparaat oppakt of meldingen ontvangt"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Tekst groter of kleiner maken"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-vergrendeling instellen"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaartvergrendeling"</string>
@@ -1588,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Toegankelijkheid"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Instellingen voor toegankelijkheid"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Instellingen voor zicht"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Schermlezer voornamelijk voor slechtziende en blinde mensen"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systeem"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Scherm"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Ondertiteling"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Vergrotingsgebaar"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tik drie keer om te zoomen"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Als je wilt in- en uitzoomen, tik je drie keer met één vinger op het scherm.\n\nAls je bent ingezoomd, kun je het volgende doen:\n"<ul>\n<li>"Scrollen: sleep met twee of meer vingers over het scherm"</li>\n<li>"Zoomniveau aanpassen: knijp twee of meer vingers samen of spreid ze uit elkaar"</li></ul>\n\n"Als je tijdelijk wilt inzoomen, tik je drie keer en blijf je het scherm aanraken bij de laatste tik. Terwijl je het scherm blijft aanraken, sleep je met je vinger om over het scherm te bewegen. Til je vinger op om weer uit te zoomen.\n\nOpmerking: Het vergrotingsgebaar werkt overal, behalve voor het toetsenbord en de navigatiebalk."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snelkoppeling voor toegankelijkheid"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aan"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Uit"</string>
@@ -1936,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatisch op afstand een back-up maken van apparaatgegevens (zoals wifi-wachtwoorden en oproepgeschiedenis) en app-gegevens (zoals instellingen en bestanden opgeslagen door apps).\n\nAls je de functie voor automatische back-ups inschakelt, worden apparaat- en app-gegevens periodiek op afstand opgeslagen. App-gegevens kunnen gegevens omvatten die een app heeft opgeslagen (op basis van de instellingen van de ontwikkelaar), waaronder potentieel gevoelige gegevens als contacten, berichten en foto\'s."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Instellingen voor apparaatbeheer"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Apparaatbeheerder"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deactiveren"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Verwijderen"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deze apparaatbeheerder uitschakelen"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"App verwijderen"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Uitschakelen en verwijderen"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Apparaatbeheerders"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Geen apparaatbeheerders beschikbaar"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Persoonlijk"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Werk"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Geen beschikbare trust-agents"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Apparaatbeheerder activeren?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activeren"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Deze apparaatbeheerder activeren"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Apparaatbeheerder"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Als je deze beheerder activeert, sta je de app <xliff:g id="APP_NAME">%1$s</xliff:g> toe de volgende bewerkingen uit te voeren:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Deze beheerder is actief en staat de app <xliff:g id="APP_NAME">%1$s</xliff:g> toe de volgende bewerkingen uit te voeren:"</string>
@@ -2265,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefoonoproepen en sms inschakelen?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"De oproep- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informatie bij nood"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Toegankelijk via vergrendelingsscherm in de kiezer voor noodoproepen"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Voor iedereen toegankelijk via de kiezer voor noodoproepen zonder je telefoon te ontgrendelen"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Apps en inhoud toestaan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps met beperkingen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Inst. uitbreiden voor app"</string>
@@ -2581,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Wijzigen in \'Alleen alarmen\' tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Wijzigen in \'Altijd onderbreken\'"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokkeren als scherm aan is"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Voorkomen dat meldingen die op stil zijn gezet door \'Niet storen\', op het huidige scherm verschijnen"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokkeren als scherm uit is"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Voorkomen dat meldingen die op stil zijn gezet door \'Niet storen\', het scherm inschakelen of het meldingslampje laten knipperen"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Uit"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Als scherm aan is"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Als scherm uit is"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Als scherm aan of uit is"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Pincode voor beheerder opgeven"</string>
@@ -2831,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open de camera-app door je pols twee keer te draaien"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Druk twee keer op aan/uit voor de camera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Camera snel openen zonder het scherm te ontgrendelen"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Weergavegrootte"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Items op het scherm groter of kleiner maken"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"weergavedichtheid, scherm zoomen, schaal, schalen"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Maak de items op je scherm kleiner of groter. De positie van bepaalde apps op je startscherm kan veranderen."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Voorbeeld"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Verkleinen"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Vergroten"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 132e0b3..fed92d0 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"ਆਪਣੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ, ਖ਼ਰੀਦਾਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ, ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੂਚਕ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। \n\n ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ - ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਕੋਈ ਵੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇਹ ਸਾਰੀਆਂ ਚੀਜ਼ਾਂ ਕਰਨਯੋਗ ਹੋ ਜਾਣਗੇ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"ਨੋਟ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਦੇ ਮੁਕਾਬਲੇ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"ਹੋਰ ਜਾਣੋ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ਰੱਦ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਹੋ ਜਾਂਦਾ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਜਾਂ ਇਸ ਦਾ ਡੈਟਾ ਸਾਫ਼ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ ਹੋ ਜਾਂਦੀ, ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਜਾਂ ਇਸ ਦਾ ਡੈਟਾ ਸਾਫ਼ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫੋਨ ਗੁੰਮ ਹੋ ਜਾਂਦਾ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਜਾਂ ਇਸ ਦਾ ਡੈਟਾ ਸਾਫ਼ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫੋਨ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"ਫੇਰ ਵੀ ਛੱਡੋ"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"ਵਾਪਸ ਜਾਓ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ਸੰਵੇਦਕ ਲੱਭੋ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ਆਪਣੇ ਫੋਨ ਦੇ ਪਿੱਛੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਦਾ ਪਤਾ ਲਗਾਓ।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ਡਿਵਾਈਸ ਵਾਲੀ ਤਸਵੀਰ ਅਤੇ ਫ਼ਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਸਥਾਨ"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜ ਸਕਦੇ ਹੋ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ਕੀ ਸਾਰੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਹਟਾਉਣੇ ਹਨ?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"ਤੁਸੀਂ ਆਪਣਾ ਫੋਨ ਅਨਲੌਕ ਕਰਨ, ਖ਼ਰੀਦਾਂ ਦਾ ਅਧਿਕਾਰ ਦੇਣ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਐਪਸ ਤੇ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ਆਪਣੀ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ ਲੌਕ ਚੁਣੋ"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"ਸਕ੍ਰੀਨ ਲੌਕ ਚੁਣੋ"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ਆਪਣੇ ਫੋਨ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ, PIN ਜਾਂ ਪਾਸਵਰਡ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ। ਸੁਰੱਖਿਅਤ ਰਹਿਣ ਲਈ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਸਥਾਪਤ ਕਰੋ।"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਧੀ ਚੁਣੋ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ਲੌਕ ਸਕ੍ਰੀਨ ਬਦਲੋ"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ਦਰਮਿਆਨੀ ਤੋਂ ਉੱਚ ਸੁਰੱਖਿਆ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ਪਾਸਵਰਡ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ਉੱਚ ਸੁਰੱਖਿਆ"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ਹੁਣ ਨਹੀਂ"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪੈਟਰਨ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ਫਿੰਗਰਪ੍ਰਿੰਟ + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ਅਨਲੌਕ ਪਾਸਵਰਡ ਬਦਲੋ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ %d ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN ਘੱਟੋ-ਘੱਟ  %d ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"ਮੁਕੰਮਲ ਹੋ ਜਾਣ \'ਤੇ ਜਾਰੀ ਰੱਖੋ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"ਪਾਸਵਰਡ <xliff:g id="NUMBER">%d</xliff:g> ਤੋਂ ਘੱਟ ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN <xliff:g id="NUMBER">%d</xliff:g> ਤੋਂ ਘੱਟ ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ਬਿਨਾਂ ਬਦਲਿਆ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"ਕਿਰਪਾ ਕਰਕੇ ਚੁਣੋ"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"ਸਿਸਟਮ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ਮੁਹੱਈਆ ਨਾ ਕਰੋ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ਪ੍ਰਮਾਣਿਤ ਨਾ ਕਰੋ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ਕੋਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨਿਰਧਾਰਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ। ਤੁਹਾਡਾ ਕਨੈਕਸ਼ਨ ਨਿੱਜੀ ਨਹੀਂ ਰਹੇਗਾ।"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ਇੱਕ ਡੋਮੇਨ ਨਿਰਧਾਰਤ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ਉਪਲਬਧ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ਉਪਲਬਧ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ਆਪਣਾ ਨੈਟਵਰਕ ਪਾਸਵਰਡ ਦਰਜ ਕਰੋ"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"ਡਿਵਾਈਸ ਡੇਟਾ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ (ਜਿਵੇਂ ਕਿ Wi-Fi ਪਾਸਵਰਡ ਅਤੇ ਕਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡੇਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਸ ਦਾ ਸਟੋਰ ਕੀਤੀ ਸੈੱਟਿੰਗਜ਼ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦਾ ਸਵੈਚਲ ਬੈੱਕ ਅੱਪ ਲਿਓ।\n\nਜਦੋਂ ਤੁਸੀਂ ਸਵੈਚਲ ਬੈੱਕ ਅੱਪ ਨੂੰ ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਡਿਵਾਈਸ ਅਤੇ ਐਪ ਡੇਟਾ ਨੂੰ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ ਅਵਧੀ ਅਨੁਸਾਰ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪ ਡੇਟਾ ਕੋਈ ਵੀ ਡੇਟਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ ਸੰਪਰਕ, ਸੁਨੇਹੇ, ਅਤੇ ਫੋਟੋਆਂ ਵਰਗੇ ਸੰਭਾਵੀ ਸੰਵੇਦਨਸ਼ੀਲ ਡੇਟਾ ਸਮੇਤ, ਕਿਸੇ ਐਪ ਨੇ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਹੁੰਦਾ ਹੈ (ਨਿਰਮਾਤਾ ਸੈੱਟਿੰਗਜ਼ ਦੇ ਅਧਾਰ \'ਤੇ)।"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"ਡਿਵਾਈਸ ਪ੍ਰਬੰਧ ਸੈਟਿੰਗਾਂ"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"ਨਿਸ਼ਕਿਰਿਆ ਬਣਾਓ"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਅਸਰਗਰਮ ਕਰੋ"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ਐਪ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ ਅਤੇ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ"</string>
     <string name="no_device_admins" msgid="702695100241728775">"ਕੋਈ ਉਪਲਬਧ ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ਨਿੱਜੀ"</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="6246742476064507965">"ਕੀ ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ ਨੂੰ ਸਕਿਰਿਆ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"ਸਕਿਰਿਆ ਬਣਾਓ"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"ਡਿਵਾਈਸ ਪ੍ਰਬੰਧਕ"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ਇਸਨੂੰ ਸਕਿਰਿਆ ਬਣਾਉਣ ਨਾਲ ਪ੍ਰਬੰਧਕ ਐਪ <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਹੇਠਾਂ ਦਿੱਤੇ ਓਪਰੇਸ਼ਨ ਪਰਫੌਰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਵੇਗਾ:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ਇਹ ਪ੍ਰਬੰਧਕ ਸਕਿਰਿਆ ਹੈ ਅਤੇ ਐਪ <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਇਹ ਓਪਰੇਸ਼ਨ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫੋਨ ਕਾਲਾਂ &amp; SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ਕਾਲ ਅਤੇ SMS ਇਤਿਹਾਸ ਇਸ ਉਪਭੋਗਤਾ ਨਾਲ ਸ਼ੇਅਰ ਕੀਤਾ ਜਾਏਗਾ।"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ਅਪਾਤਕਾਲ ਜਾਣਕਾਰੀ"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"ਅਪਾਤਕਾਲ ਡਾਇਲਰ ਵਿੱਚ ਲੌਕ ਸਕ੍ਰੀਨ ਦੁਆਰਾ ਪਹੁੰਚਯੋਗ ਹੈ"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"ਤੁਹਾਡੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਬਿਨਾਂ ਐਮਰਜੈਂਸੀ ਡਾਇਲਰ ਤੋਂ ਕਿਸੇ ਵੱਲੋਂ ਵੀ ਪਹੁੰਚਯੋਗ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ਪ੍ਰਤਿਬੰਧਾਂ ਵਾਲੇ ਐਪਲੀਕੇਸ਼ਨ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਸੈਟਿੰਗਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index acb2ec7..8b5c736 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -76,8 +76,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Odłącz kartę SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Wyczyść nośnik USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Wymaż kartę SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Powiększ lub pomniejsz tekst na ekranie."</string>
     <string name="small_font" msgid="2295331917424072635">"Mały"</string>
     <string name="medium_font" msgid="2068475425515133701">"Średni"</string>
     <string name="large_font" msgid="599055175160971446">"Duży"</string>
@@ -336,10 +335,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odblokuj odciskiem palca"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. \n\n Z rozwagą dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Uwaga: odcisk palca może być mniej bezpieczny niż trudny wzór lub kod PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Więcej informacji"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Uwaga: rozpoznawanie linii papilarnych może być mniej bezpieczne niż skomplikowany wzór lub kod PIN. "<annotation id="url">"Więcej informacji"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anuluj"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Dalej"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym możliwości używania tego tabletu w przypadku jego zgubienia, kradzieży lub zresetowania."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym możliwości używania tego urządzenia w przypadku jego zgubienia, kradzieży lub zresetowania."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym możliwości używania tego telefonu w przypadku jego zgubienia, kradzieży lub zresetowania."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym możliwości używania tego tabletu w przypadku jego zgubienia lub kradzieży."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym możliwości używania tego urządzenia w przypadku jego zgubienia lub kradzieży."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym możliwości używania tego telefonu w przypadku jego zgubienia lub kradzieży."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Pomiń mimo to"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Wstecz"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Znajdź czytnik"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Znajdź czytnik linii papilarnych z tyłu telefonu."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracja pokazująca urządzenie i umiejscowienie czytnika linii papilarnych"</string>
@@ -373,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Możesz dodać do <xliff:g id="COUNT">%d</xliff:g> odcisków palców"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Usunąć wszystkie odciski palców?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Odcisków palców nie będzie można używać do odblokowywania telefonu, autoryzowania zakupów ani logowania się w aplikacjach."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Tak, usuń"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Użyj odcisku palca, by kontynuować."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
@@ -410,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zabezpiecz swoje urządzenie"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Odblokowywanie odciskiem palca"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Wybierz blokadę ekranu"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zabezpiecz telefon"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Uwaga: rozpoznawanie linii papilarnych może być mniej bezpieczne niż skomplikowany wzór, kod PIN lub hasło. Dla większego bezpieczeństwa ustaw dodatkową blokadę ekranu."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego tabletu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego urządzenia bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego telefonu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Wybierz dodatkową metodę blokowania ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blokada ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmiana blokady ekranu"</string>
@@ -426,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Średni i wysoki poziom zabezpieczeń"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Hasło"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Wysoki poziom zabezpieczeń"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Nie teraz"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Aktualna blokada ekranu"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Odcisk palca + wzór"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Odcisk palca + kod PIN"</string>
@@ -478,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Hasło musi mieć min. %d znaki"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN musi mieć co najmniej %d cyfry"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Gdy skończysz, dotknij Dalej"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Dalej"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Hasło musi mieć mniej znaków niż <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Kod PIN musi mieć mniej cyfr niż <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -720,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nie zmieniono)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Wybierz"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Dodano wiele certyfikatów)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Użyj certyfikatów systemowych"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nie podawaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nie sprawdzaj poprawności"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nie określono certyfikatu. Twoje połączenie nie będzie prywatne."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Musisz określić domenę."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Podaj hasło do sieci"</string>
@@ -904,8 +914,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ekran dostosowany do otoczenia"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Włącz ekran po podniesieniu urządzenia lub otrzymaniu powiadomień"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Powiększ lub pomniejsz tekst"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ustaw blokadę SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blokada karty SIM"</string>
@@ -1610,21 +1619,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Ułatwienia dostępu"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ustawienia widoczności"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Możesz dostosować urządzenie do swoich potrzeb. Funkcje ułatwień dostępu możesz zawsze zmienić w Ustawieniach."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usługi"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Czytnik ekranu przeznaczony głównie dla osób niewidomych i słabowidzących"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Ekran"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisy"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gest powiększenia"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Kliknij trzy razy, by powiększyć"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Powiększaj i pomniejszaj, klikając trzykrotnie ekran jednym palcem.\n\nW trybie powiększenia możesz wykonać te czynności:\n"<ul>\n<li>"Przesuwanie: przeciągnij co najmniej dwoma palcami po ekranie."</li>\n<li>"Regulowanie powiększenia: ściągnij lub rozsuń co najmniej dwa palce."</li></ul>\n\n"Tymczasowe powiększenie: kliknij trzykrotnie i za trzecim razem przytrzymaj. Trzymając palec na ekranie, przeciągnij go, by przesuwać widok. Podniesienie palca spowoduje powrót do poprzedniego widoku. \n\nUwaga: gest powiększenia działa wszędzie poza klawiaturą i paskiem nawigacyjnym."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Wł."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Wył."</string>
@@ -1970,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatycznie twórz zdalną kopię zapasową danych urządzenia (np. haseł Wi-Fi i historii połączeń) oraz danych aplikacji (np. ustawień i plików zapisanych przez aplikacje).\n\nKiedy włączysz automatyczną kopię zapasową, dane urządzenia i aplikacji będą regularnie zapisywane zdalnie. Dane aplikacji mogą obejmować dowolne informacje zapisane przez aplikację (w zależności od ustawień określonych przez programistę) – w tym potencjalnie poufne dane takie jak kontakty, wiadomości i zdjęcia."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ustawienia administracji"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator urządzenia"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Dezaktywuj"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Odinstaluj"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Wyłącz tego administratora urządzenia"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Odinstaluj aplikację"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Wyłącz i odinstaluj"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratorzy urządzenia"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Brak dostępnych administratorów urządzenia"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobiste"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Praca"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Brak agentów zaufania"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktywować administratora urządzenia?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktywuj"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Włącz tego administratora urządzenia"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator urządzenia"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktywowanie tego administratora zezwoli aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> na wykonywanie następujących operacji:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Administrator jest aktywny i zezwala aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> na wykonywanie następujących operacji:"</string>
@@ -2299,7 +2304,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Włączyć rozmowy telefoniczne i SMS-y?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historia połączeń i SMS-ów będzie dostępna dla tego użytkownika."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacje w nagłych wypadkach"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Dostępne na ekranie blokady przy wyborze numeru alarmowego"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Dostępne dla każdego na ekranie numeru alarmowego bez odblokowywania telefonu"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Zezwól na aplikacje i zawartość"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacje z ograniczeniami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozwiń ustawienia aplikacji"</string>
@@ -2621,22 +2626,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Zmień na same alarmy do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmień na ciągle powiadamianie"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokuj, gdy ekran jest włączony"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Powiadomienia wyciszone w trybie Nie przeszkadzać nie będą pojawiać się w szybkim podglądzie ani na ekranie"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokuj, gdy ekran jest wyłączony"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Powiadomienia wyciszone w trybie Nie przeszkadzać nie będą włączać ekranu ani nie będą sygnalizowane diodą powiadomień"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Wył."</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Gdy ekran jest włączony"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Gdy ekran jest wyłączony"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Gdy ekran jest włączony lub wyłączony"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Podaj PIN administratora"</string>
@@ -2883,13 +2880,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otwórz aplikację aparatu, obracając dwukrotnie nadgarstkiem"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Aparat: dwukrotnie naciśnij przyc. zasilania"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Szybko uruchom aparat bez odblokowywania ekranu"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Rozmiar wyświetlacza"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Powiększ lub pomniejsz elementy na ekranie"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"wyświetlacz, gęstość, powiększenie ekranu, skala, skalowanie"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Powiększ lub pomniejsz elementy na ekranie. Niektóre aplikacje na ekranie głównym mogą przesunąć się w inne miejsce."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Podgląd"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Pomniejsz"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Powiększ"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 16d483c..32e37ef 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmontar cartão SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Apagar armazenamento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Apagar cartão SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Tornar o texto na tela menor ou maior."</string>
     <string name="small_font" msgid="2295331917424072635">"Pequena"</string>
     <string name="medium_font" msgid="2068475425515133701">"Médio"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desb. c/ imp. digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Basta tocar no sensor de impressão digital para desbloquear o smartphone, autorizar compras ou fazer login em apps. \n\n Tenha cuidado com as impressões digitais que adicionar, pois todas elas poderão fazer essas ações."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Observação: sua impressão digital pode ser menos segura que um padrão forte ou um PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Saiba mais"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Observação: sua impressão digital pode ser menos segura do que um padrão ou PIN fortes. "<annotation id="url">"Saiba mais"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet se ele for perdido, roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet em caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo em caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone em caso de perda ou roubo."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localizar o sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressão digital na parte de trás do smartphone."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustração mostrando a localização do sensor de impressão digital no dispositivo"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas as impressões digitais?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Você não poderá usar suas impressões digitais para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use sua impressão digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger seu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com sua impressão digital"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Escolher bloqueio de tela"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteger o smartphone"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"A impressão digital pode ser menos segura do que um padrão, PIN ou senha fortes. Configure uma tela de bloqueio alternativa para ficar protegido."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha seu método de bloqueio de tela alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar tela bloqueio"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta segurança"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Agora não"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueio de tela atual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Impressão digital + padrão"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Impressão digital + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A senha deve ter no mínimo %d caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN deve ter no mínimo %d caracteres"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Toque em \"Continuar\" quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A senha deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"O PIN deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sem alteração)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Selecione"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"Vários certificados adicionados"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Usar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Não validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nenhum certificado especificado. Sua conexão não será particular."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"É necessário especificar um domínio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Ligar a tela ao pegar dispositivo ou receber notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configurações de visão"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Config.\"."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serviços"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Leitor de tela, usado principalmente para pessoas com deficiência visual total ou parcial"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Exibição"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Legendas"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gesto de ampliação"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toque três vezes para ampliar"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Para ampliar e reduzir, toque três vezes na tela com um dedo.\n\nCom o zoom aplicado, é possível:\n"<ul>\n<li>"Rolar: arraste dois dedos ou mais pela tela"</li>\n<li>"Ajustar o nível de zoom: faça um gesto de pinça com dois dedos ou mais juntando-os ou separando-os"</li></ul>\n\n"Para ampliar temporariamente, toque três vezes e segure o último toque. Fazendo pressão com o dedo, arraste-o para mover-se pela tela. Levante o dedo para diminuir o zoom.\n\nObservação: os gestos de ampliação funcionam em todos os lugares, exceto no teclado e na barra de navegação."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ligado"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desativado"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Fazer backup automático de dados do dispositivo (como senhas de Wi-Fi e histórico de chamadas) e dados de apps (como configurações e arquivos armazenados por apps) remotamente.\n\nQuando você ativa o backup automático, os dados do dispositivo e de apps são salvos periodicamente de modo remoto. Dados de apps podem ser quaisquer dados que um app tenha salvo (com base nas configurações de desenvolvedores), incluindo dados potencialmente confidenciais, como contatos, mensagens e fotos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configurações de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desativar"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalar"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desativar o administrador deste dispositivo"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desativar e desinstalar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores do dispositivo"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Não há administradores de dispositivo disponíveis"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pessoal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Trabalho"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nenhum agente de confiança disponível"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ativar o administrador do dispositivo?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Ativar"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Ativar o administrador deste dispositivo"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador do dispositivo"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá ao app <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está ativo e permite que o app <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefônicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Acessível pela tela de bloqueio no discador de emergência"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Qualquer pessoa pode acessar a partir do discador de emergência sem desbloquear o smartphone"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir apps e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear quando a tela está ativada"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear quando a tela está desativada"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" ativem a tela ou façam a luz de notificação pulsar"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desativada"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Quando a tela está ativada"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Inserir PIN do administrador"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press. o botão liga/desliga duas vezes p/ abrir a câmera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abrir a câmera rapidamente sem desbloquear a tela"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Tamanho da exibição"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Tornar os itens na tela maiores ou menores"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densidade de exibição, zoom da tela, escala, dimensionamento"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Tornar os itens na tela menores ou maiores. É possível que a posição de alguns apps na sua tela seja alterada."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Visualização"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Tornar menor"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Tornar maior"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0b87bf3..6d6088e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmontar cartão SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Apagar armazenamento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Apagar cartão SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Aumente ou diminua o texto no ecrã."</string>
     <string name="small_font" msgid="2295331917424072635">"Pequeno"</string>
     <string name="medium_font" msgid="2068475425515133701">"Médio"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloq. c/ impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. \n\n Quaisquer impressões digitais adicionadas podem executar estas ações, pelo que deve ter cuidado com quem adiciona."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota: a impressão digital pode ser menos segura do uma sequência ou um PIN fortes."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Saiba mais"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Nota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes. "<annotation id="url">"Saiba mais"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet se o perder ou for roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo se o perder ou for roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel se o perder ou for roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet se o perder ou for roubado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo se o perder ou for roubado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel se o perder ou for roubado."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar mesmo assim"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localizar o sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressões digitais na parte de trás do seu telemóvel."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustração com o dispositivo e a localização do sensor de impressões digitais"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Pode adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas impressões digitais?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Não poderá utilizar as impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utilize a sua impressão digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger o dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com a impressão digital"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Selecionar bloqueio do ecrã"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteger o telemóvel"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"A impressão digital pode ser menos segura do que um padrão, um PIN ou uma palavra-passe fortes. Configure um ecrã de bloqueio de segurança como medida de proteção adicional."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impeça terceiros de utilizar este tablet sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impeça terceiros de utilizar este dispositivo sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impeça terceiros de utilizar este telemóvel sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha o método de bloqueio de ecrã de segurança"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de ecrã"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar ecrã de bloq."</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a elevada"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurança elevada"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Agora não"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueio de ecrã atual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Impressão digital + padrão"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Impressão digital + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A palavra-passe tem de ter no mínimo %d caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN tem de ter, pelo menos, %d dígitos"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tocar em Continuar quando concluído"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A palavra-passe tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"O PIN deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
@@ -886,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Visualização de ambiente"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Ativar o ecrã quando pega no dispositivo ou recebe notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Aumentar ou diminuir o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -1588,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Definições de acessibilidade"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Definições de visão"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Pode personalizar este dispositivo de acordo com as suas necessidades. Pode alterar estas funcionalidades de acessibilidade mais tarde em Definições."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"serviços"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Leitor de ecrã principalmente para pessoas invisuais ou com visão reduzida"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"SISTEMA"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Visualização"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Legendas"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Toque de ampliação"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tocar três vezes para aumentar/diminuir o zoom"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Para aumentar ou diminuir o zoom, toque três vezes no ecrã com um dedo.\n\nEnquanto estiver a aumentar o zoom, pode:\n"<ul>\n<li>"Deslocar: arraste dois ou mais dedos pelo ecrã"</li>\n<li>"Ajustar o nível de zoom: junte dois ou mais dedos ou afaste-os"</li></ul>\n\n"Para aumentar/diminuir o zoom temporariamente, toque três vezes e mantenha o dedo no ecrã no último toque. Com o dedo no ecrã, arraste para se mover pelo mesmo. Levante o dedo para repor o nível de zoom.\n\nNota: o toque de ampliação funciona em todo o lado, exceto no teclado e na barra de navegação."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ativado"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desligado"</string>
@@ -1936,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Faça cópias de segurança automáticas dos dados do dispositivo (como palavras-passe de Wi-Fi e o histórico de chamadas) e dos dados das aplicações (como as definições e os ficheiros armazenados pelas aplicações) remotamente.\n\nQuando ativa a cópia de segurança automática, os dados do dispositivo e das aplicações são guardados remotamente de forma periódica. Os dados das aplicações podem ser quaisquer dados que uma aplicação tenha guardado (com base nas definições do programador), incluindo dados potencialmente confidenciais como contactos, mensagens e fotos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Definições de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desativar"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalar"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desativar este administrador do dispositivo"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar aplicação"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desativar e desinstalar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores do dispositivo"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Não existem administradores do dispositivo disponíveis"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pessoal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Trabalho"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nenhum agente fidedigno disponível"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ativar administrador do dispositivo?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Ativar"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Ativar este administrador do dispositivo"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador do dispositivo"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá à aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> efetuar as seguintes operações:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está ativo e permite que a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> efetue as seguintes operações:"</string>
@@ -2265,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será partilhado com este utilizador."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Acessíveis a partir do ecrã de bloqueio no telefone de emergência"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Acessíveis por qualquer pessoa a partir do telefone de emergência sem desbloquear o telemóvel"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicações e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicações com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir defin. da aplicação"</string>
@@ -2581,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear quando o ecrã está ligado"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Evitar que as notificações silenciadas pelo modo Não incomodar surjam no ecrã"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear quando o ecrã está desligado"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Evitar que as notificações silenciadas pelo modo Não incomodar liguem o ecrã ou ativem a luz de notificação de forma intermitente"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desativado"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Quando o ecrã está ligado"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando o ecrã está desligado"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando o ecrã está ligado ou desligado"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduzir o PIN de administrador"</string>
@@ -2831,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir a aplicação de câmara ao torcer o dispositivo no seu pulso"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Premir ligar/desligar 2 vezes p/ câmara"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abrir rapidamente a câmara sem desbloquear o ecrã"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Tamanho da visualização"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Aumentar ou diminuir os itens no ecrã"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densidade de apresentação, zoom do ecrã, escala, dimensionamento"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Aumente ou diminua os itens no ecrã. Algumas aplicações no ecrã podem mudar de posição."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Pré-visualizar"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Diminuir"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Aumentar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 16d483c..32e37ef 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desmontar cartão SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Apagar armazenamento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Apagar cartão SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Tornar o texto na tela menor ou maior."</string>
     <string name="small_font" msgid="2295331917424072635">"Pequena"</string>
     <string name="medium_font" msgid="2068475425515133701">"Médio"</string>
     <string name="large_font" msgid="599055175160971446">"Grande"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desb. c/ imp. digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Basta tocar no sensor de impressão digital para desbloquear o smartphone, autorizar compras ou fazer login em apps. \n\n Tenha cuidado com as impressões digitais que adicionar, pois todas elas poderão fazer essas ações."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Observação: sua impressão digital pode ser menos segura que um padrão forte ou um PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Saiba mais"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Observação: sua impressão digital pode ser menos segura do que um padrão ou PIN fortes. "<annotation id="url">"Saiba mais"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet se ele for perdido, roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou apagado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet em caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo em caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone em caso de perda ou roubo."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localizar o sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressão digital na parte de trás do smartphone."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustração mostrando a localização do sensor de impressão digital no dispositivo"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas as impressões digitais?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Você não poderá usar suas impressões digitais para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use sua impressão digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger seu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com sua impressão digital"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Escolher bloqueio de tela"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Proteger o smartphone"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"A impressão digital pode ser menos segura do que um padrão, PIN ou senha fortes. Configure uma tela de bloqueio alternativa para ficar protegido."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha seu método de bloqueio de tela alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar tela bloqueio"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Segurança média a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta segurança"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Agora não"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueio de tela atual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Impressão digital + padrão"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Impressão digital + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A senha deve ter no mínimo %d caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN deve ter no mínimo %d caracteres"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Toque em \"Continuar\" quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A senha deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"O PIN deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sem alteração)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Selecione"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"Vários certificados adicionados"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Usar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Não validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nenhum certificado especificado. Sua conexão não será particular."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"É necessário especificar um domínio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Ligar a tela ao pegar dispositivo ou receber notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configurações de visão"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Config.\"."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serviços"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Leitor de tela, usado principalmente para pessoas com deficiência visual total ou parcial"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Exibição"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Legendas"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gesto de ampliação"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toque três vezes para ampliar"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Para ampliar e reduzir, toque três vezes na tela com um dedo.\n\nCom o zoom aplicado, é possível:\n"<ul>\n<li>"Rolar: arraste dois dedos ou mais pela tela"</li>\n<li>"Ajustar o nível de zoom: faça um gesto de pinça com dois dedos ou mais juntando-os ou separando-os"</li></ul>\n\n"Para ampliar temporariamente, toque três vezes e segure o último toque. Fazendo pressão com o dedo, arraste-o para mover-se pela tela. Levante o dedo para diminuir o zoom.\n\nObservação: os gestos de ampliação funcionam em todos os lugares, exceto no teclado e na barra de navegação."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ligado"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desativado"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Fazer backup automático de dados do dispositivo (como senhas de Wi-Fi e histórico de chamadas) e dados de apps (como configurações e arquivos armazenados por apps) remotamente.\n\nQuando você ativa o backup automático, os dados do dispositivo e de apps são salvos periodicamente de modo remoto. Dados de apps podem ser quaisquer dados que um app tenha salvo (com base nas configurações de desenvolvedores), incluindo dados potencialmente confidenciais, como contatos, mensagens e fotos."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configurações de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desativar"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Desinstalar"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Desativar o administrador deste dispositivo"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Desativar e desinstalar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores do dispositivo"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Não há administradores de dispositivo disponíveis"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pessoal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Trabalho"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nenhum agente de confiança disponível"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ativar o administrador do dispositivo?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Ativar"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Ativar o administrador deste dispositivo"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador do dispositivo"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá ao app <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está ativo e permite que o app <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ativar chamadas telefônicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O histórico de chamadas e SMS será compartilhado com este usuário."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informações de emergência"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Acessível pela tela de bloqueio no discador de emergência"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Qualquer pessoa pode acessar a partir do discador de emergência sem desbloquear o smartphone"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir apps e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear quando a tela está ativada"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear quando a tela está desativada"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" ativem a tela ou façam a luz de notificação pulsar"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desativada"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Quando a tela está ativada"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Inserir PIN do administrador"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press. o botão liga/desliga duas vezes p/ abrir a câmera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abrir a câmera rapidamente sem desbloquear a tela"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Tamanho da exibição"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Tornar os itens na tela maiores ou menores"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densidade de exibição, zoom da tela, escala, dimensionamento"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Tornar os itens na tela menores ou maiores. É possível que a posição de alguns apps na sua tela seja alterada."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Visualização"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Tornar menor"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Tornar maior"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b31cfbb..38c54fd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -75,8 +75,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Demontați cardul SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ștergeți stocarea USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Ștergeți cardul SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Măriți sau micșorați textul de pe ecran."</string>
     <string name="small_font" msgid="2295331917424072635">"Mică"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medie"</string>
     <string name="large_font" msgid="599055175160971446">"Mare"</string>
@@ -142,7 +141,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Atingeți pentru a vă conecta la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Doriți să vă conectați la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Solicitarea accesului la agendă"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s doreşte să acceseze Agenda dvs. și istoricul apelurilor. Permiteți accesul pentru %2$s?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s dorește să acceseze Agenda dvs. și istoricul apelurilor. Permiteți accesul pentru %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"Nu doresc să fiu întrebat(ă) din nou"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Nu doresc să fiu întrebat(ă) din nou"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"Solicitarea accesului la mesaje"</string>
@@ -334,10 +333,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Deblocați cu amprenta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. \n\n Aveți grijă ce amprentă adăugați, deoarece aceste acțiuni sunt posibile folosind orice amprentă adăugată."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Notă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Aflați mai multe"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Notă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic. "<annotation id="url">"Aflați mai multe"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuați"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească tableta, dacă este pierdută, furată sau dacă datele de pe aceasta sunt șterse."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească acest dispozitiv, dacă este pierdut, furat sau dacă datele de pe acesta sunt șterse."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească acest telefon, dacă este pierdut, furat sau dacă datele de pe acesta sunt șterse."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească această tabletă, dacă este pierdută sau furată."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească acest dispozitiv, dacă este pierdut sau furat."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea să împiedicați alte persoane să folosească acest telefon, dacă este pierdut sau furat."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omiteți oricum"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Înapoi"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Găsiți senzorul"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Găsiți senzorul de amprentă pe partea din spate a telefonului."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Imagine cu dispozitivul și poziția senzorului de amprentă"</string>
@@ -371,6 +377,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Puteți să adăugați până la <xliff:g id="COUNT">%d</xliff:g> (de) amprente"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Eliminați toate amprentele?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Nu veți putea folosi amprentele ca să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, eliminați"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Folosiți amprenta pentru a continua."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptare"</string>
@@ -381,13 +389,13 @@
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea telefonului, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric ori o parolă), va trebui să deblocați ecranul pentru a decripta telefonul de fiecare dată când îl porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți telefonul conectat pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptați tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptați telefonul"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcați bateria și încercaţi din nou."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcați bateria și încercați din nou."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conectați încărcătorul și încercați din nou."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setați un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptați?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puțin o oră, timp în care tableta se va reporni de mai multe ori."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Operația de criptare este ireversibilă și întreruperea ei va duce la pierderea datelor. Criptarea durează cel puțin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptare"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Aşteptaţi criptarea tabletei. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aşteptaţi criptarea telefonului. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
@@ -408,7 +416,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protejați dispozitivul"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Deblocați folosind amprenta"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeți blocare ecran"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Alegeți blocarea ecranului"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protejați telefonul"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Este posibil ca amprenta să fie mai puțin sigură decât un model, un cod PIN sau o parolă puternică. Setați un ecran de blocare de rezervă pentru a fi în siguranță."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească această tabletă fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest dispozitiv fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest telefon fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Alegeți metoda de rezervă de blocare a ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbați bloc. ecran."</string>
@@ -424,6 +436,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Nivel de securitate mediu spre ridicat"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Securitate ridicată"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Nu acum"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Blocarea actuală a ecranului"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Amprentă + model"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Amprentă + cod PIN"</string>
@@ -476,16 +489,15 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbați parola pentru deblocare"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parola trebuie să conțină minimum %d (de) caractere"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Codul PIN trebuie să aibă minimum %d cifre"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Atingeți Continuați când terminați"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuați"</string>
-    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parola trebuie să aibă mai puţin de <xliff:g id="NUMBER">%d</xliff:g> (de) caractere."</string>
-    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Codul PIN trebuie să aibă mai puţin de <xliff:g id="NUMBER">%d</xliff:g> (de) cifre."</string>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parola trebuie să aibă mai puțin de <xliff:g id="NUMBER">%d</xliff:g> (de) caractere."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Codul PIN trebuie să aibă mai puțin de <xliff:g id="NUMBER">%d</xliff:g> (de) cifre."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Codul PIN trebuie să conţină numai cifre de la 0 la 9."</string>
     <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"Administr. dispoz. nu permite utiliz. unui PIN recent."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Parola conţine un caracter nepermis."</string>
-    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parola trebuie să conţină cel puţin o literă."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parola trebuie să conţină cel puțin o literă."</string>
     <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parola trebuie să conţină minimum o cifră."</string>
-    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parola trebuie să conţină cel puţin un simbol."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parola trebuie să conţină cel puțin un simbol."</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="5677371623980347934">
       <item quantity="few">Parola trebuie să conțină cel puțin %d litere.</item>
       <item quantity="other">Parola trebuie să conțină cel puțin %d de litere.</item>
@@ -712,13 +724,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(neschimbate)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Selectați"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Au fost adăugate mai multe certificate)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Folosiți certificate de sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nu se furnizează"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nu se validează"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nu s-a specificat niciun certificat. Conexiunea nu va fi privată."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Trebuie să specificați un domeniu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduceți parola de rețea"</string>
@@ -782,8 +792,8 @@
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Deconectaţi?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Dacă vă deconectați, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> se va încheia."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectați, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> și cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string>
-    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulați invitaţia?"</string>
-    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriți să anulați invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulați invitația?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriți să anulați invitația de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminaţi acest grup?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi-Fi"</string>
@@ -896,8 +906,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Afișare Ambient"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Activează ecranul când ridicați dispozitivul sau când primiți notificări"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Măriți sau micșorați textul"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Activați blocarea cardului SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocare card SIM"</string>
@@ -1153,8 +1162,8 @@
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Setările pentru rețea au fost reinițializate"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"Resetați dispozitivul"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Resetarea configurării din fabrică"</string>
-    <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_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>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
@@ -1249,7 +1258,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Locație și căutare Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permiteți Google să utilizeze locația dvs. pt. îmbunătățirea rezultatelor căutării și a serviciilor"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Acces la locația dvs."</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicațiilor care v-au solicitat, permisiunea să utilizeze informațiile dvs. de localizare"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Acordați aplicațiilor care v-au solicitat, permisiunea să utilizeze informațiile dvs. de localizare"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Surse de locații"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Despre tabletă"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Despre telefon"</string>
@@ -1320,7 +1329,7 @@
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Schimbați modelul pentru deblocare"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Modul de desenare a unui model de deblocare"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Prea multe încercări incorecte. Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
-    <string name="activity_not_found" msgid="5551664692991605325">"Aplicaţia nu este instalată pe telefonul dvs."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplicația nu este instalată pe telefonul dvs."</string>
     <string name="lock_settings_profile_title" msgid="7819021341281339182">"Profil de serviciu"</string>
     <string name="lock_settings_profile_label" msgid="4423909470339292809">"Securitatea profilului de serviciu"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Blocarea ecranului în profilul de serviciu"</string>
@@ -1391,7 +1400,7 @@
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicațiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionați spațiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrați"</string>
-    <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeți opţiunile de filtrare"</string>
+    <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeți opțiunile de filtrare"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toate"</string>
     <string name="filter_apps_disabled" msgid="5364447573326472890">"Dezactivate"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descărcate"</string>
@@ -1411,7 +1420,7 @@
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Anulați"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
-    <string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplicaţia nu a fost găsită în lista de aplicații instalate."</string>
+    <string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplicația nu a fost găsită în lista de aplicații instalate."</string>
     <string name="clear_data_failed" msgid="7214074331627422248">"Nu s-au putut șterge datele aplicației."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Dezinstalaţi actualizările?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Toate actualizările aduse acestei aplicații de sistem Android vor fi dezinstalate."</string>
@@ -1429,7 +1438,7 @@
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Trimiteți SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"În curs de calculare..."</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"Nu s-a putut calcula mărimea pachetului."</string>
-    <string name="empty_list_msg" msgid="3552095537348807772">"Nu aveți instalată nicio aplicație terţă parte."</string>
+    <string name="empty_list_msg" msgid="3552095537348807772">"Nu aveți instalată nicio aplicație terță parte."</string>
     <string name="version_text" msgid="9189073826278676425">"versiunea <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mutați"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mutați pe tabletă"</string>
@@ -1438,14 +1447,14 @@
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mutați pe cardul SD"</string>
     <string name="moving" msgid="6431016143218876491">"Se deplasează"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"Nu există suficient spațiu de stocare."</string>
-    <string name="does_not_exist" msgid="1501243985586067053">"Aplicaţia nu există."</string>
-    <string name="app_forward_locked" msgid="6331564656683790866">"Aplicaţia este protejată la copiere."</string>
+    <string name="does_not_exist" msgid="1501243985586067053">"Aplicația nu există."</string>
+    <string name="app_forward_locked" msgid="6331564656683790866">"Aplicația este protejată la copiere."</string>
     <string name="invalid_location" msgid="4354595459063675191">"Locația de instalare nu este validă."</string>
     <string name="system_package" msgid="1352722848400644991">"Actualizările de sistem nu pot fi instalate pe suportul extern."</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"Opriți forţat?"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"Opriți forțat?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Dacă forţaţi oprirea unei aplicații, aceasta se poate comporta necorespunzător."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
-    <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplicaţia nu a putut fi mutată. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplicația nu a putut fi mutată. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Locație preferată de instalare"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locația preferată de instalare pentru noile aplicații"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
@@ -1486,7 +1495,7 @@
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Utilizată"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"În cache"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> de RAM"</string>
-    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Aplicaţia care rulează"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Aplicația care rulează"</string>
     <string name="no_services" msgid="7133900764462288263">"Nu există servicii active"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Servicii"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Procese"</string>
@@ -1601,21 +1610,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilitate"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Setări de accesibilitate"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Setări pentru vedere"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Puteți personaliza acest dispozitiv conform dorințelor dvs. Aceste funcții de accesibilitate pot fi modificate ulterior în Setări."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicii"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Cititor de ecran destinat în principal utilizatorilor nevăzători și cu deficiențe de vedere"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Afișaj"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtitrări"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gesturi pentru mărire"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Atingeți de 3 ori pentru a mări"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Ca să măriți și să micșorați imaginea, atingeți de 3 ori ecranul cu un singur deget.\n\nCând imaginea este mărită, puteți:\n"<ul>\n<li>"să derulați: trageți cu 2 sau mai multe degete pe ecran;"</li>\n<li>"să ajustați nivelul de zoom: ciupiți cu 2 sau mai multe degete pe ecran sau depărtați-le."</li></ul>\n\n"Pentru a mări temporar, atingeți de 3 ori și țineți apăsat la ultima atingere. În timp ce țineți apăsat, trageți pentru a mișca imaginea pe ecran. Ridicați degetul pentru a micșora la loc.\n\nNotă: gesturile pentru mărire funcționează oriunde, cu excepția tastaturii și a barei de navigare."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă de accesibilitate"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
@@ -1797,7 +1801,7 @@
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Capacitatea totală a bateriei"</string>
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Consum de energie calculat"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Consum de energie observat"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Opriți forţat"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Opriți forțat"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informații despre aplicație"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Setări aplicații"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Setări ecran"</string>
@@ -1955,15 +1959,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Faceți backup automat la datele dispozitivului (de exemplu, parolele Wi-Fi și istoricul apelurilor) și la datele aplicațiilor (de exemplu, setările și fișierele stocate de aplicații) de la distanță.\n\nCând activați backupul automat, datele dispozitivului și ale aplicațiilor sunt salvate periodic de la distanță. Datele unei aplicații pot fi orice date pe care le-a salvat aplicația (în funcție de setările dezvoltatorului), inclusiv date posibil sensibile, cum a fi persoanele de contact, mesajele și fotografiile."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setări de administrare a dispozitivului"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator de dispozitive"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Dezactivați"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Dezinstalați"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Dezactivați acest administrator al dispozitivului"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Dezinstalați aplicația"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Dezactivați și dezinstalați"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratori de dispozitive"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nu există niciun administrator de dispozitive disponibil"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Serviciu"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nu există agenți de încredere disponibili"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Activați administratorul de dispozitive?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activați"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Activați acest administrator al dispozitivului"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator de dispozitive"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Prin activarea acestui administrator, aplicația <xliff:g id="APP_NAME">%1$s</xliff:g> va putea executa următoarele:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Acest administrator este activ și permite aplicației <xliff:g id="APP_NAME">%1$s</xliff:g> să execute următoarele:"</string>
@@ -2125,7 +2130,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Modificările conturilor dvs. pe web vor fi copiate automat pe tabletă.\n\nDe asemenea, unele conturi pot să copieze automat pe web toate modificările pe care le efectuați pe tabletă. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ceea ce modificați în conturi pe web se va reflecta automat și pe telefon.\n\nUnele conturi pot să copieze automat pe web toate modificările de pe telefon. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Opriți sincronizarea automată?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Această acţiune va economisi date și durata bateriei, dar va trebui să sincronizați fiecare cont manual pentru a culege informațiile recente. În plus, nu veți primi notificări atunci când apar actualizări."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Această acțiune va economisi date și durata bateriei, dar va trebui să sincronizați fiecare cont manual pentru a culege informațiile recente. În plus, nu veți primi notificări atunci când apar actualizări."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de resetare a ciclului de utilizare"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data din fiecare lună:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setați"</string>
@@ -2263,8 +2268,8 @@
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"Eliminați utilizatorul?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Eliminați acest profil?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Elim. profilul serviciu?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"Veţi pierde spaţiul și datele de pe această tabletă. Nu puteți anula această acţiune."</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"Veţi pierde spaţiul și datele de pe acest telefon. Nu puteți anula această acţiune."</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"Veţi pierde spaţiul și datele de pe această tabletă. Nu puteți anula această acțiune."</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"Veţi pierde spaţiul și datele de pe acest telefon. Nu puteți anula această acțiune."</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"Toate aplicațiile și datele vor fi șterse."</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"În cazul în care continuați, toate aplicațiile și datele din acest profil vor fi șterse."</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"Toate aplicațiile și datele vor fi șterse."</string>
@@ -2284,7 +2289,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activați apelurile telefonice și SMS-urile?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Acest utilizator va avea acces la istoricul apelurilor și al SMS-urilor."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informații în caz de urgență"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Accesibile prin ecranul de blocare în tastatura de urgență a telefonului"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Accesibile oricui din tastatura numerică de urgență fără deblocarea telefonului"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permiteți aplicații și conținut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicații cu restricții"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Extindeți setările aplicației"</string>
@@ -2603,22 +2608,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Schimbați la „Numai alarme” până la <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Schimbați la „Întrerupe întotdeauna”"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blocați când ecranul este activat"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Împiedicați afișarea de scurtă durată sau într-o fereastră pop-up pe ecran a notificărilor dezactivate prin Nu deranja"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blocați când ecranul este dezactivat"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Nu permiteți notificărilor dezactivate prin Nu deranja să activeze ecranul sau lumina intermitentă de notificare"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Dezactivat"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Când ecranul este activat"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Când ecranul este dezactivat"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Când ecranul este activat sau dezactivat"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduceți codul PIN de administrator"</string>
@@ -2859,13 +2856,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Deschideți aplicația Cameră foto răsucind din încheietura mâinii de două ori"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Apăsați pornire de 2 ori pentru cameră"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Deschideți rapid camera foto fără să deblocați ecranul"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Dimensiunea afișării"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Măriți sau micșorați elementele de pe ecran"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densitate afișaj, zoom ecran, scară, scalare"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Măriți sau micșorați elementele de pe ecran. Este posibil ca unele aplicații de pe ecran să își schimbe poziția."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Previzualizați"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Micșorați"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Măriți"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 14f63d9..68aebda 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -76,8 +76,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Извлечь SD-карту"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Очистить USB-накопитель"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Очистить SD-карту"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Увеличение или уменьшение размера шрифта."</string>
     <string name="small_font" msgid="2295331917424072635">"Маленький"</string>
     <string name="medium_font" msgid="2068475425515133701">"Среднее"</string>
     <string name="large_font" msgid="599055175160971446">"Большой"</string>
@@ -336,10 +335,17 @@
     <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_message" msgid="4747510337049957778">"Чтобы разблокировать телефон, подтвердить покупку или войти в приложение, достаточно приложить палец к сканеру.\n\nСохраните на устройстве отпечатки пальцев тех, кому доверяете, и они тоже смогут это делать."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Обратите внимание: распознавание отпечатков пальцев дает менее надежную защиту, чем графический ключ или PIN-код."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Подробнее..."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Обратите внимание, что распознавание отпечатков пальцев дает менее надежную защиту, чем графический ключ или PIN-код. "<annotation id="url">"Подробнее…"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Отмена"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Продолжить"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Защита устройства не будет активирована. Если планшет потеряется, его украдут или с него сотрут все данные, им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Защита устройства не будет активирована. Если устройство будет потеряно или украдено либо все его данные будут удалены, его смогут использовать посторонние лица."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Защита устройства не будет активирована. Если телефон будет потерян или украден либо все его данные будут удалены, его смогут использовать посторонние лица."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Защита устройства не будет активирована. Если планшет потеряется или его украдут, им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Защита устройства не будет активирована. Если оно потеряется или его украдут, им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Защита устройства не будет активирована. Если телефон потеряется или его украдут, им смогут воспользоваться посторонние."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Все равно пропустить"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Найдите сканер"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Найдите сканер отпечатков пальцев на задней поверхности телефона."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"На этом рисунке показано, где находится сканер"</string>
@@ -373,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Максимальное количество отпечатков пальца, которые можно добавить: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Удалить отпечатки пальцев?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с помощью отпечатков пальцев."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -410,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Защитите устройство"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Как разблокировать устройство с помощью отпечатка пальца"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокировка экрана"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Выберите способ блокировки экрана"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Защитите телефон"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Распознавание отпечатков пальцев дает менее надежную защиту, чем графический ключ, PIN-код или пароль. Настройте дополнительную блокировку экрана."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Выберите дополнительный способ блокировки экрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокировка экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Изменение блок. экрана"</string>
@@ -426,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Уровень безопасности от среднего до высокого"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Высокий уровень защиты"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Не сейчас"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Текущий способ блокировки"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Отпечатки пальцев и графический ключ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Отпечатки пальцев и PIN-код"</string>
@@ -478,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль должен содержать не менее %d символов"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код должен содержать не менее %d цифр"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Когда закончите, нажмите \"Продолжить\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжить"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Пароль должен содержать не более <xliff:g id="NUMBER">%d</xliff:g> симв."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-код должен содержать не более <xliff:g id="NUMBER">%d</xliff:g> зн."</string>
@@ -720,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(без изменений)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Выберите"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Добавлено несколько сертификатов)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Использовать системные сертификаты"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не указывать"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не проверять"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертификат не указан. Будет установлено незащищенное соединение."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Укажите домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введите пароль для подключения к сети."</string>
@@ -904,8 +914,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Запрет спящего режима"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Включение дисплея, когда вы берете устройство в руки или получаете уведомление"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Увеличение или уменьшение размера шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настроить блокировку"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блокировка SIM-карты"</string>
@@ -948,7 +957,7 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Обновление системы"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Версия Android"</string>
-    <string name="security_patch" msgid="8438384045870296634">"Обновление системы безопасности"</string>
+    <string name="security_patch" msgid="8438384045870296634">"Последнее обновление системы безопасности"</string>
     <string name="model_number" msgid="3765737700545384794">"Модель"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Идентификатор оборудования"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Прошивка модуля связи"</string>
@@ -1610,21 +1619,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Спец. возможности"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки специальных возможностей"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки спец. возможностей"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Используйте специальные возможности для удобной работы с устройством. Эти параметры можно изменить в настройках."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Инструмент для озвучивания данных с экрана для людей с нарушениями зрения"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Экран"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Субтитры"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Жесты для увеличения"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Изменение масштаба тремя нажатиями"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Функция позволяет изменить масштаб тремя нажатиями на экран.\n\nДействия, доступные при увеличенном масштабе:\n"<ul>\n<li>"Прокрутка. Перемещайте несколько пальцев по экрану."</li>\n<li>"Настройка масштаба. Сведите или разведите пальцы на экране."</li></ul>\n\n"Для временного увеличения отдельных участков нажмите на экран три раза и перемещайте по нему палец. Чтобы вернуться к предыдущему масштабу, отпустите палец.\n\nПримечание. Жесты для увеличения не работают на клавиатуре и панели навигации."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Быстрое включение"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Вкл."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Выкл."</string>
@@ -1970,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Автоматически копируйте данные устройства (например, пароли сетей Wi-Fi и журнал звонков), а также сведения из приложений (например, настройки и файлы) в удаленное хранилище.\n\nПосле того как вы включите резервное копирование, информация будет периодически сохраняться в удаленном хранилище. Обратите внимание, что данные приложений могут включать конфиденциальную информацию: контакты, сообщения, фотографии и другие сведения, сохраненные приложением на устройстве согласно настройкам разработчика."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Настройки администрирования устройства"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор устройства"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Отключить"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Удалить"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Деактивировать администратора устройства"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Удалить приложение"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Отключить и удалить"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Администраторы устройства"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Нет доступных администраторов устройства"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Личный"</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="6246742476064507965">"Удаленное управление Android"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Активировать"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Активировать администратора устройства"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Администратор устройства"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" сможет выполнять следующие операции:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Администратор активирован и разрешает приложению <xliff:g id="APP_NAME">%1$s</xliff:g> выполнять следующие операции:"</string>
@@ -2299,7 +2304,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Включить звонки и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Этот пользователь получит доступ к журналу звонков и SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Сведения о чрезвычайных ситуациях"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Доступны на заблокированном экране в режиме экстренных вызовов"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Доступно всем при вызове экстренной службы без разблокировки телефона"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
@@ -2621,22 +2626,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активировать режим \"Только будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Режим \"Не беспокоить\" отключен."</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Блокировать при включенном экране"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Не показывать на экране уведомления, отключенные в режиме \"Не беспокоить\""</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Блокировать при отключенном экране"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Не включать экран и световой индикатор для уведомлений, отключенных в режиме \"Не беспокоить\""</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Отключено"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"При включенном экране"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"При отключенном экране"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"При включенном и отключенном экране"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Введите PIN-код администратора"</string>
@@ -2883,13 +2880,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Чтобы открыть приложение \"Камера\", дважды поверните запястье."</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Быстрый доступ к камере"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Открывать камеру двойным нажатием кнопки питания"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Масштаб изображения на экране"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Увеличение или уменьшение объектов на экране"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"разрешение экрана, масштаб, увеличение, уменьшение"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Увеличение или уменьшение объектов на экране. Эта настройка может изменить порядок значков приложений."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Просмотр"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Уменьшить"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Увеличить"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index abaa95d..358cdc6 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD කාඩ් පත ගලවන්න"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB ආචයනය මකන්න"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD කාඩ් පත මකන්න"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"තිරය මත පෙළ වඩාත් කුඩා හෝ විශාල කරන්න."</string>
     <string name="small_font" msgid="2295331917424072635">"කුඩා"</string>
     <string name="medium_font" msgid="2068475425515133701">"මධ්‍යම"</string>
     <string name="large_font" msgid="599055175160971446">"විශාල"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම් අනුමත කිරීමට, හෝ යෙදුම් වෙත පිරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න. \n\n ඕනෑම ඇඟිලි සලකුණකට මෙම දේවල් කිරීමට හැකිය - එනිසා ඔබ එක් කරන ඇඟිලි සලකුණු පිළිබඳ සැලකිලිමත් වන්න."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"සටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂිත බවෙන් අඩුය."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"තව දැන ගන්න"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"සටහන: ඔබගේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාව අඩු විය හැකිය. "<annotation id="url">"තව දැන ගන්න"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"අවලංගු කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"දිගටම කර ගෙන යන්න"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත්, සොරකම් කළහොත් හෝ අහිමි වුවහොත්, වෙනත් අය මෙම ටැබ්ලට් පරිගණකය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම උපාංගය නැති වුවහොත්, සොරකම් කළහොත් හෝ, ගෙන ගියහොත්, වෙනත් අය මෙම උපාංගය භාවිතා කිරීම නැවත්වීමට ඔබට නොහැකියි."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම දුරකථනය නැති වුවහොත්, සොරකම් කළහොත් හෝ, ගෙන ගියහොත්, වෙනත් අය මෙම දුරකථනය භාවිතා කිරීම නැවත්වීමට ඔබට නොහැකියි"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය මෙම ටැබ්ලට් පරිගණකය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම උපාංගය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය මෙම උපාංගය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"කෙසේ වෙතත් මග හරින්න"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"ආපසු යන්න"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"සංවේදකය සොයන්න"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය ස්ථානගත කරන්න."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"උපාංගයේ ඇඟිලි සලකුණු සංවේදකයේ පිහිටීම නිරූපණය"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"ඔබට ඇඟිලි සලකුණු <xliff:g id="COUNT">%d</xliff:g> දක්වා එකතු කළ හැකිය"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"සියලු ඇඟිලි සලකුණු ඉවත් කරන්නද?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"ඔබට ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ ඒවා සමගින් යෙදුම්වලට පිරීමට ඔබේ ඇඟිලි සලකුණු භාවිත කළ නොහැකි වනු ඇත."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ඔබගේ උපාංගය ආරක්ෂා කර ගන්න"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ඔබගේ ඇඟිලි සලකුණ සමගින් අනවහිර කරන්න"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"තිර අගුල තෝරාගන්න"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"තිර අගුල තෝරාගන්න"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ඔබගේ දුරකථනය ආරක්ෂා කර ගන්න"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ඇඟිලි සලකුණ ප්‍රබල රටාවකට, PIN අංකයකට හෝ මුරපදයකට වඩා ආරක්ෂිත බවෙන් අඩුය. ආරක්ෂාකාරී වීමට උපස්ථ අගුලු තිරයක් පිහිටුවන්න."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම ටැබ්ලට උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම දුරකථනය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ඔබේ උපස්ථ කිර අගුලු ක්‍රමය තෝරන්න"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"තිර අගුල"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"තිර අඟුල වෙනස් කරන්න"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"මධ්‍යම සිට ඉහළ ආරක්ෂාව"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"මුරපදය"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ඉහළ ආරක්ෂාව"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"දැන් නොවේ"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"වත්මන් තිර අගුල"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ඇඟිලි සලකුණ‍ + රටාව"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ඇඟිලි සලකුණ + PIN අංකය"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"අඟුළු හැරීමේ මුරපදය වෙනස් කරන්න"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"මුරපදය අඩුතරමේ අකුරු %d වත් විය යුතුය"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN එකෙහි අඩුම ගණනේ සංඛ්‍යාංක %d ක් වත් තිබිය යුතුය"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"නිම කළ විට දිගටම කරගෙන යන්න තට්ටු කරන්න"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"කරගෙන යන්න"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"මුරපදය අකුරු <xliff:g id="NUMBER">%d</xliff:g> කට වඩා අඩු විය යුතුය."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN එක අංක <xliff:g id="NUMBER">%d</xliff:g> වඩා අඩු විය යුතුය"</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(වෙනස් නොකළ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"කරුණාකර තෝරන්න"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(බහුවිධ සහතික එක් කරන ලදී)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"පද්ධති සහතික භාවිත කරන්න"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"නොසපයන්න"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"වලංගු නොකරන්න"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"සහතිකයක් දක්වා නැත. ඔබේ සබැඳුම පුද්ගලික නොවනු ඇත."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"වසමක් නියම කළ යුතුය."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ඇත"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS පවතී)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ඔබගේ ජාල මුරපදය ඇතුළත් කරන්න"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"ස්ථානික දර්ශනය"</string>
     <string name="doze_summary" msgid="7128970177894383698">"ඔබ උපාංගය අතට ගත් විට හෝ දැනුම් දීම් ලැබුණු විට තිරය අවදි කරන්න"</string>
     <string name="title_font_size" msgid="4405544325522105222">"අකුරු ප්‍රමාණය"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"පෙළ වඩාත් විශාල හෝ කුඩා කරන්න"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM කාඩ් පතෙහි අඟුළු සැකසුම්"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM කාඩ් පතෙහි අගුල සකසන්න"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM කාඩ් පතෙහි අඟුල"</string>
@@ -1592,21 +1601,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"ප්‍රවේශ්‍යතාව"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ළඟාවීමේ සැකසීම්"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"දෘශ්‍ය සැකසීම්"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"ඔබට ඔබේ අවශ්‍යතාවන්ට ගැළපෙන පරිදි මෙම උපාංගය අභිරුචිකරණය කළ හැකිය. මෙම ප්‍රවේශ්‍යතා විශේෂාංග සැකසීම්වල පසුව වෙනස් කළ හැකිය."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"සේවා"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"තිර කියවනය මූලික වශයෙන් අන්ධ සහ අඩු දෘශ්‍යතාව සහිත පුද්ගලයන් සඳහාය"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"පද්ධතිය"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"දර්ශනය"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"සිරස්තල"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"විශාලන අභිනය"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"විශාලනය කිරීමට 3 වරක් තට්ටු කරන්න"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"විශාලනය වැඩි හෝ අඩු කිරීමට එක් ඇඟිල්ලකින් තිරය 3 වරක් තට්ටු කරන්න.\n\nවිශාලනය වැඩි කර ඇති අතරතුර, ඔබට මෙය කළ හැකිය:\n"<ul>\n<li>"අනුචලනය කිරීම: තිරය හරහා ඇඟිලි 2ක් හෝ වැඩි ගණනක් අදින්න"</li>\n<li>"විශාලන මට්ටම සීරුමාරු කිරීම: ඇඟිලි 2ක් හෝ වැඩි ගණනක් එකට පින්ච් කරන්න නැතහොත් ඒවා දෙපසට විහිදුවන්න"</li></ul>\n\n"තාවකාලිකව විශාලනය කිරීමට, 3 වරක් තට්ටු කර අවසන් තට්ටු කිරීම අල්ලාගෙන සිටින්න. ඔබේ ඇඟිල්ල පහළට අල්ලාගෙන සිටින අතරතුර, තිරය වටා ගෙන යාමට අදින්න. නැවත විශාලනය අඩු කිරීමට ඔබේ ඇඟිල්ල ඔසවන්න.\n\nසටහන: යතුරුපුවරුව සහ සංචාලන තීරුව හැර සෑම තැනකම විශාලන අභිනය ක්‍රියා කරයි."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ළඟාවිය හැකි කෙටිමග"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"සක්‍රියයි"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"අක්‍රියයි"</string>
@@ -1940,15 +1944,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"දුරස්ථව උපාංග දත්ත (Wi-Fi මුරපද හා ඇමතුම් ඉතිහාසය වැනි) සහ යෙදුම් දත්ත (යෙදුම් මඟින් ගබඩා කරන සැකසීම් සහ ගොනු) ස්වයංක්‍රියව උපස්ථ කරයි.\n\nඔබ ස්වයංක්‍රියව උපස්ථ කිරීම ක්‍රියාත්මක කළ විට, උපාංග සහ යෙදුම් දත්ත කලින් කලට දුරස්ථව සුරකිනු ලැබේ. සම්බන්ධතා, පණිවුඩ, හා ඡායාරූප වැනි සංවේදී දත්ත ඇතුළුව යෙදුම් දත්ත ඕනෑම එකක් විය හැකි වේ (සංවර්ධක සැකසුම් මත පදනම්ව)."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"උපාංග පරිපාලන සැකසුම්"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"උපාංග පරිපාලක"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"අක්‍රිය කරන්න"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"අස්ථාපනය කරන්න"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"මෙම උපාංග පරිපාලක අක්‍රිය කරන්න"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"යෙදුම අස්ථාපනය කරන්න"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"අක්‍රිය කර අස්ථාපනය කරන්න"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"උපාංග පරිපාලකයින්"</string>
     <string name="no_device_admins" msgid="702695100241728775">"උපාංග පාලකයන් නොමැත"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"පෞද්ගලික"</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="6246742476064507965">"උපාංග පරිපාලක ක්‍රියාත්මක කරන්නද?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"සක්‍රිය කරන්න"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"මෙම උපාංග පරිපාලක සක්‍රිය කරන්න"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"උපාංග පාලක"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"මෙම පරිපාලකයා සක්‍රිය කිරීමෙන් <xliff:g id="APP_NAME">%1$s</xliff:g> යෙදුමට පහත ක්‍රියාවන් සිදුකිරීමට අවස්තාව ලබාදේ:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"මෙම පරිපාලකය ක්‍රියාකාරී වන අතර <xliff:g id="APP_NAME">%1$s</xliff:g> යෙදුම වෙත පහත මෙහෙයුම් කිරීමට අවසර ලබා දෙයි:"</string>
@@ -2269,7 +2274,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"දුරකථන ඇමතුම් සහ SMS ක්‍රියාත්මක කරන්න?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"මෙම පරිශීලකයා සමඟ ඇමතුම් සහ SMS ඉතිහාසය බෙදාගන්නා ලදි."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"හදිසි අවස්ථා තොරතුරු"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"හදිසි අවස්ථා ඩයල් කිරීමකදී අගුලු තිරය හරහා පිවිසීමට හැකිය"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"ඔබගේ දුරකථනය අගුලු හැරීමෙන් තොරව හදිසි ඩයල් කිරීම හරහා ඕනෑම කෙනෙකුට පිවිසීමට හැකිය"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"යෙදුම්වලට හා අන්තර්ගතයන්ට ඉඩ දෙන්න"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"සීමා කිරීම් සහිත යෙදුම්"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"යෙදුම සඳහා සැකසීම් දිගහරින්න"</string>
@@ -2585,22 +2590,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> පමණක් දක්වා ඇති සීනු වෙත මාරු වෙන්න"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"සෑම විටම බාධා කිරීම වෙත මාරු වෙන්න"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"තිරය ක්‍රියාත්මක විට අවහිර කරන්න"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"තිරය මත එබිකම් කිරීමෙන් හෝ හදිසියේ මතුවීමෙන් බාධා නොකරන්න මගින් නිහඬ කළ දැනුම්දීම් වළක්වන්න"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"තිරය ක්‍රියාවිරහිත විට අවහිර කරන්න"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"තිරය මත ක්‍රියාත්මක කිරීමෙන් හෝ දැනුම්දීම් එළිය ස්පන්දනය කිරීමෙන් බාධා නොකරන්න මගින් නිහඬ කළ දැනුම්දීම් වළක්වන්න"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ක්‍රියාවිරහිතයි"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"තිරය ක්‍රියාත්මක විට"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"තිරය ක්‍රියාවිරහිත විට"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"තිරය ක්‍රියාත්මක හෝ ක්‍රියාවිරහිත විට"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
     <string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්‍රතිපෝෂණ යවන්න"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"පරිපාලකයාගේ PIN එක ඇතුළ් කරන්න"</string>
@@ -2835,13 +2832,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ඔබේ මැණික් කටුව දෙවරක් කරකවා කැමරා යෙදුම විවෘත කරන්න"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"කැමරාව සඳහා බල බොත්තම දෙවරක් ඔබන්න"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ඔබගේ තිරය අගුලු හැරීමෙන් තොරව ඉක්මනින් කැමරාව විවෘත කරන්න"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"සංදර්ශක තරම"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"තිරය මත අයිතම වඩාත් විශාල හෝ කුඩා කරන්න"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"සංදර්ශක ඝනත්වය, තිර විශාලනය, පරිමාණය, පරිමාණ කිරීම"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"තිරය මත අයිතම වඩාත් කුඩා හෝ විශාල කරන්න. ඔබේ තිරයේ ඇති සමහර යෙදුම් ස්ථානය වෙනස් කළ හැකිය."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"පෙරදසුන"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"වඩා කුඩා කරන්න"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"වඩා විශාල කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a77779a..7a98bfd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -76,8 +76,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Odpojiť SD kartu"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Vymazať ukladací priestor USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Vymazať SD kartu"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Zväčšite alebo zmenšite text na obrazovke."</string>
     <string name="small_font" msgid="2295331917424072635">"Malé"</string>
     <string name="medium_font" msgid="2068475425515133701">"Stredné"</string>
     <string name="large_font" msgid="599055175160971446">"Veľké"</string>
@@ -336,10 +335,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odomknúť odtlačkom"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Ak chcete odomknúť telefón, autorizovať nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odtlačkov prstov. \n\n Tieto operácie budú môcť vykonávať všetky odtlačky pridané do telefónu, takže dávajte pozor, čie odtlačky pridáte."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Poznámka: Odtlačok môže byť menej bezpečný ako silný bezpečnostný vzor alebo kód PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Ďalšie informácie"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Poznámka: Odtlačok prsta môže byť menej bezpečný ako silný vzor alebo kód PIN. "<annotation id="url">"Ďalšie informácie"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Zrušiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovať"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty, krádeže alebo vymazania tabletu nebudete môcť ostatným zabrániť v jeho používaní."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty, krádeže alebo vymazania zariadenia nebudete môcť ostatným zabrániť v jeho používaní."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty, krádeže alebo vymazania telefónu nebudete môcť ostatným zabrániť v jeho používaní."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty alebo krádeže tohto tabletu nebudete môcť ostatným zabrániť v jeho používaní."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty alebo krádeže tohto zariadenia nebudete môcť ostatným zabrániť v jeho používaní."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty alebo krádeže tohto telefónu nebudete môcť ostatným zabrániť v jeho používaní."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Preskočiť"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Späť"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Nájdenie snímača"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Nájdite snímač odtlačkov prstov na zadnej strane telefónu."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrácia zariadenia a umiestnenia senzoru odtlačku prsta"</string>
@@ -373,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Môžete pridať ďalšie odtlačky (max. <xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstrániť všetky odtlačky prstov?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Pomocou odtlačkov prstov nebudete môcť odomknúť telefón, autorizovať nákupy ani sa prihlásiť do aplikácií."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Áno, odstrániť"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Pokračujte priložením prsta."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanie"</string>
@@ -410,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Chráňte svoje zariadenie"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Odomykanie pomocou odtlačku prsta"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zámka obrazovky"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Zvoľte zámku obrazovky"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Chráňte svoje telefón"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Odtlačok prsta môže byť menej bezpečný ako silný vzor, kód PIN alebo heslo. Zaistite svoju bezpečnosť – nastavte si záložnú uzamknutú obrazovku."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto tabletu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Zvoľte záložnú metódu zámky obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámka obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmeniť uzamknutie obrazovky"</string>
@@ -426,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Stredné až vysoké zabezpečenie"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečenie"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Teraz nie"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Aktuálna zámka obrazovky"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Odtlačok prsta + bezpečnostný vzor"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Odtlačok prsta + kód PIN"</string>
@@ -478,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí mať aspoň %d znaky"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Kód PIN musí mať najmenej %d číslice"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Po dokončení klepnite na tlačidlo Pokračovať"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovať"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> znakov."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Kód PIN musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> číslic."</string>
@@ -720,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nezmenené)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Vyberte"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Bolo pridaných viacero certifikátov)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Použiť certifikáty systému"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Neposkytovať"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Neoverovať"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nebol určený žiadny certifikát. Vaše pripojenie nebude súkromné."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Je potrebné zadať doménu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadajte heslo siete"</string>
@@ -904,8 +914,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ambientné zobrazenie"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Zobudiť obrazovku pri zodvihnutí zariadenia alebo prijatí upozornení"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Zväčšite alebo zmenšite text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky SIM karty"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavenia zámky SIM karty"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámka SIM karty"</string>
@@ -1610,21 +1619,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Dostupnosť"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavenia dostupnosti"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavenia viditeľnosti"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Zariadenie môžete prispôsobiť, aby zodpovedalo vašim potrebám. Tieto funkcie dostupnosti môžete neskôr zmeniť v Nastaveniach."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Čítačka obrazovky je určená hlavne pre nevidiacich a slabozrakých ľudí"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Obrazovka"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titulky"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gesto priblíženia"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Zobrazenie priblížite/oddialite trojitým klepnutím"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Zobrazenie priblížite a oddialite tak, že trikrát klepnete prstom na obrazovku.\n\nPočas priblíženia môžete:\n"<ul>\n<li>"Posúvať zobrazenie: Presúvajte dva alebo viac prstov po obrazovke."</li>\n<li>"Upraviť úroveň priblíženia: Stiahnite dva alebo viacero prstov alebo ich od seba odtiahnite."</li></ul>\n\n"Obsah môžete tiež dočasne priblížiť trojitým klepnutím a pridržaním prsta po poslednom klepnutí. Pridržaný prst môžete presúvať a pohybovať sa tak po obrazovke. Zdvihnutím prsta sa vrátite do pôvodného zobrazenia.\n\nPoznámka: Toto gesto priblíženia funguje všade okrem klávesnice a navigačného panela."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skratka dostupnosti"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Zapnuté"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vypnuté"</string>
@@ -1970,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automaticky vzdialene zálohujte údaje zariadenia (napr. heslá do sietí Wi-Fi a históriu hovorov) a údaje aplikácií (napr. nastavenia a súbory uložené aplikáciami). \n\nKeď zapnete automatické zálohovanie, údaje zariadenia a aplikácií sa budú pravidelne vzdialene ukladať. Údaje aplikácie môžu byť ľubovoľné informácie uložené aplikáciou (na základe nastavení vývojára) aj potenciálne citlivé údaje, ako sú kontakty, správy a fotky."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavenia správy zariadení"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Správca zariadení"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivovať"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Odinštalovať"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktivovať správu tohto zariadenia"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Odinštalovať aplikáciu"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktivovať a odinštalovať"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Správcovia zariadenia"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nie je k dispozícii žiadny správca nastavení"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobné"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Práca"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nie sú k dispozícii žiadne agenty dôvery"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivovať správcu zariadenia?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivovať"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktivovať správcu tohto zariadenia"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Správca zariadení"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktiváciou tohto správcu umožníte aplikácii <xliff:g id="APP_NAME">%1$s</xliff:g> vykonávať nasledujúce operácie:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Správca je aktívny a umožňuje aplikácii <xliff:g id="APP_NAME">%1$s</xliff:g> vykonávať nasledujúce operácie:"</string>
@@ -2299,7 +2304,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnúť telefonické hovory a správy SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S týmto používateľom sa bude zdieľať história hovorov a správ SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informácie pre prípad núdze"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Prístupné prostredníctvom uzamknutej obrazovky v núdzovom vytáčaní"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Voľne prístupné z tiesňového vytáčania bez nutnosti odomknúť telefón"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbaliť nastavenia aplikácie"</string>
@@ -2621,22 +2626,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Zmena na možnosť Iba budíky platná do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmena na možnosť Vždy prerušiť"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokovať, keď je obrazovka zapnutá"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zabrániť, aby sa upozornenia stlmené nastavením Nerušiť čiastočne alebo úplne zobrazovali na obrazovke"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokovať, keď je obrazovka vypnutá"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zabrániť, aby upozornenia stlmené nastavením Nerušiť spúšťali obrazovku alebo blikajúce svetlo upozornení"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Vypnuté"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Keď je obrazovka zapnutá"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Keď je obrazovka vypnutá"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Keď je obrazovka zapnutá alebo vypnutá"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú väzbu o zariadení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Zadajte číslo PIN správcu"</string>
@@ -2883,13 +2880,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvorte aplikáciu fotoaparátu tak, že dvakrát pokrútite zápästím"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Fotoaparát dvojitým stlačením vypínača"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Rýchlo otvorí fotoaparát bez odomknutia obrazovky"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Veľkosť zobrazenia"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Zväčšite alebo zmenšite položky na obrazovke"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"hustota obrazovky, priblíženie obrazovky, veľkosť, zmena veľkosti"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Zväčšite alebo zmenšite položky na obrazovke. Pozícia niektorých aplikácií na obrazovke sa môže zmeniť."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Ukážka"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Zmenšiť"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Zväčšiť"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5d1b05c..3baee5d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -335,10 +335,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odklepanje s prstnim odtisom"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Dotaknite se tipala za prstne odtise, če želite odkleniti telefon, odobriti nakupe ali se prijaviti v aplikacije. \n\n Pri dodajanju prstnih odtisov bodite previdni – vse to je mogoče početi s katerim koli dodanim prstnim odtisom."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Opomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Več o tem"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Opomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN. "<annotation id="url">"Več o tem"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Prekliči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Naprej"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Zaščitne funkcije naprave ne bodo aktivirane. V primeru izgube ali kraje tabličnega računalnika oziroma izbrisa vseh podatkov v njem ne boste mogli preprečiti drugim, da ga uporabljajo."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Zaščitne funkcije naprave ne bodo aktivirane. V primeru izgube ali kraje naprave oziroma izbrisa vseh podatkov v njej ne boste mogli preprečiti drugim, da jo uporabljajo."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Zaščitne funkcije naprave ne bodo aktivirane. V primeru izgube ali kraje telefona oziroma izbrisa vseh podatkov v njem ne boste mogli preprečiti drugim, da ga uporabljajo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcije za zaščito naprave ne bodo aktivirane. V primeru izgube ali kraje tabličnega računalnika drugim ne boste mogli preprečiti njegove uporabe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcije za zaščito naprave ne bodo aktivirane. V primeru izgube ali kraje naprave drugim ne boste mogli preprečiti njene uporabe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcije za zaščito naprave ne bodo aktivirane. V primeru izgube ali kraje telefona drugim ne boste mogli preprečiti njegove uporabe."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Vseeno preskoči"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Nazaj"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Iskanje tipala"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Poiščite tipalo prstnih odtisov na hrbtni strani telefona."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija z napravo in lokacijo tipala prstnih odtisov"</string>
@@ -372,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Dodate lahko do toliko prstnih odtisov: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstranitev vseh prstnih odtisov?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Za odklepanje telefona, odobritev nakupov ali prijavo v aplikacije ne boste mogli uporabljati prstnih odtisov."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, odstrani"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Uporabite prstni odtis, če želite nadaljevati."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
@@ -409,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaščitite napravo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Odklepanje s prstnim odtisom"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zaklep zaslona"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Izbira zaklepanja zaslona"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Zaščita telefona"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Prstni odtis bo morda manj varen kot zapleten vzorec, koda PIN ali geslo. Zaradi varnosti nastavite nadomestno zaklepanje zaslona."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega tabličnega računalnika brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vklopite zaščitne funkcije naprave, da drugim preprečite njeno uporabo brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega telefona brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izberite nadomestni način zaklepanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaklepanje zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Sprememba zakl. zasl."</string>
@@ -425,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Srednja do visoka varnost"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Geslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Visoka varnost"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ne zdaj"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Trenutno zaklepanje zaslona"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Prstni odtis in vzorec"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Prstni odtis in PIN"</string>
@@ -477,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Geslo mora biti vsaj %d-mestno"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Koda PIN mora biti vsaj %d-mestna"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Ko končate, se dotaknite »Naprej«"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Naprej"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Geslo mora imeti manj kot toliko znakov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora imeti manj kot toliko številk: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -719,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nespremenjeno)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Izberite"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Dodanih je bilo več potrdil)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Uporabi sistemska potrdila"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne posreduj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne potrdi"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ni navedenih potrdil. Povezava ne bo zasebna."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Določiti morate domeno."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Vnesite geslo za omrežje"</string>
@@ -1616,7 +1627,7 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Zaslon"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisi"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Poteza za povečavo"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Če želite povečati, se trikrat dotaknite."</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Če želite povečati, se trikrat dotaknite"</string>
     <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Če želite povečati ali pomanjšati, se zaslona trikrat dotaknite s prstom.\n\nKo je slika povečana, so na voljo te možnosti:\n"<ul>\n<li>"Drsenje – z dvema ali več prsti povlecite čez zaslon."</li>\n<li>"Prilagajanje ravni povečave – dva ali več prstov na zaslonu povlecite skupaj ali jih razmaknite."</li></ul>\n\n"Če želite začasno povečati, se trikrat dotaknite zaslona, vendar po tretjem dotiku ne dvignite prsta. Medtem ko se s prstom dotikate zaslona, ga povlecite, če se želite premikati po zaslonu. Ko želite spet zmanjšati povečavo, dvignite prst.\n\nOpomba: poteza za povečavo deluje povsod, razen na tipkovnici in v vrstici za krmarjenje."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bližnj. za ljudi s pos. potrebami"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Vklopljeno"</string>
@@ -1963,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Samodejno shranjevanje podatkov naprave (na primer gesel za Wi-Fi in zgodovine klicev) in podatkov aplikacij (na primer nastavitev in datotek, ki jih shranjujejo aplikacije) na daljavo.\n\nKo vklopite samodejno varnostno kopiranje, se podatki naprave in aplikacij redno shranjujejo na daljavo. Podatki aplikacij so lahko kateri koli podatki, ki jih je shranila aplikacija (na podlagi nastavitev razvijalca), vključno z morebitnimi občutljivimi podatki, kot so stiki, sporočila in fotografije."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavitve skrbništva naprave"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Skrbnik naprave"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Izklopi"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Odstrani"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiviraj tega skrbnika naprave"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Odstrani aplikacijo"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiviraj in odstrani"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Skrbniki naprave"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Na voljo ni nobenega skrbnika naprave"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osebno"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Delo"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Na voljo ni nobenega posrednika zaupanja"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ali želite omogočiti skrbnika naprave?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Vklopi"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktiviraj tega skrbnika naprave"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Skrbnik naprave"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Če omogočite tega skrbnika, bo aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> lahko izvedla te operacije:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Ta skrbnik je aktiven in dovoli aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g>, da izvaja naslednje operacije:"</string>
@@ -2292,7 +2304,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vklop telefonskih klicev in sporočil SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Zgodovina klicev in sporočil SMS bo dana v skupno rabo s tem uporabnikom."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacije o nujnem primeru"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Dostopno prek zaklenjenega zaslona v klicalniku za nujne primere"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Brez odklepanja telefona dostopno komur koli v klicalniku za nujne primere"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Omogočanje aplikacij in vsebine"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije z omejitvami"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Dodatne nastavitve za aplikacijo"</string>
@@ -2615,9 +2627,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Sprememba na samo alarme do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Sprememba na vedno prekini"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokiraj, ko je zaslon vklopljen"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Preprečevanje, da bi obvestila, utišana z načinom »ne moti«, prikazala hiter predogled ali se pojavila na zaslonu"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prepreči, da bi obvestila, utišana z načinom »ne moti«, prikazala hiter predogled ali se pojavila na zaslonu"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokiraj, ko je zaslon izklopljen"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Preprečevanje, da bi obvestila, utišana z načinom »ne moti«, vklopila zaslon ali povzročila utripanje obvestilne lučke"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prepreči, da bi obvestila, utišana z načinom »ne moti«, vklopila zaslon ali povzročila utripanje obvestilne lučke"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Izklopljeno"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Ko je zaslon vklopljen"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ko je zaslon izklopljen"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index c851969..a5f632d 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Shkyçe me gjurmën e gishtit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Thjesht prek te sensori i gjurmës së gishtit për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. \n\n Trego kujdes se gjurmët e kujt shton, pasi çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Shënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Mëso më shumë"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Shënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë. "<annotation id="url">"Mëso më shumë"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Vazhdo"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do të mund t\'i parandalosh të tjerët të përdorin këtë tablet nëse ai humb, të vidhet ose fshihet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë pajisje nëse nëse e humb atë ose nëse të vidhet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë telefon nëse e humb atë ose nëse të vidhet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë tablet nëse e humb atë ose nëse të vidhet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë pajisje nëse e humb atë ose nëse të vidhet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë telefon nëse e humb atë ose nëse të vidhet."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Kapërceje gjithsesi"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Kthehu prapa"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Gjej sensorin"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Gjej sensorin e gjurmës së gishtit në pjesën e pasme të telefonit."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrim me pajisjen dhe vendndodhjen e sensorit të gjurmës së gjishtit"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Mund të shtosh deri në <xliff:g id="COUNT">%d</xliff:g> gjurma të gishtave"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Të hiqen të gjitha gjurmët e gishtave?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Nuk do të jesh në gjendje të përdorësh gjurmët e gishtave për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar në aplikacione me to."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Po, hiqe"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Përdor gjurmën e gishtit për të vazhduar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkriptimi"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Mbroje pajisjen tënde"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Shkyçe me gjurmën e gishtit"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zgjidh kyçjen e ekranit"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Zgjidh kyçjen e ekranit"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Mbroje telefonin tënd"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv, një kod PIN ose një fjalëkalim i fortë. Konfiguro një ekran rezervë të kyçjes për të qenë i sigurt."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Parandalo që të tjerët ta përdorin këtë tablet pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Parandalo që të tjerët ta përdorin këtë pajisje pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Parandalo që të tjerët ta përdorin këtë telefon pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Zgjidh mënyrën rezervë të kyçjes së ekranit"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kyçja e ekranit"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ndrysho ekranin e kyçjes"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Siguri mesatare deri në të lartë"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Me fjalëkalim"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Siguri e lartë"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Jo tani"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Kyçja aktuale e ekranit"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Gjurma e gishtit + Motivi"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Gjurma e gishtit + Kodi PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ndrysho fjalk. shkyçjes"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Fjalëkalimi duhet të ketë të paktën %d karaktere"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Kodi PIN duhet të ketë të paktën %d shifra"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Trokit te \"Vazhdo\" kur të përfundosh"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Vazhdo"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Fjalëkalimi duhet të jetë më i vogël se <xliff:g id="NUMBER">%d</xliff:g> karaktere."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Kodi PIN duhet të jetë më pak se <xliff:g id="NUMBER">%d</xliff:g> shifra."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(i pandryshuar)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Zgjidh"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(U shtuan shumë certifikata)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Përdor certifikatat e sistemit"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Mos e ofro"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Mos e mirato"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nuk u specifikua asnjë certifikatë. Lidhja jote nuk do të jetë private."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Duhet të specifikohet një domen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Ofrohet WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Ofrohet WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Fut fjalëkalimin e rrjetit"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Rezervo automatikisht në largësi të dhënat e pajisjes (si p.sh. fjalëkalimet e Wi-Fi dhe historikun e telefonatave) dhe të dhënat e aplikacioneve (si p.sh. cilësimet dhe skedarët e ruajtur nga aplikacionet).\n\nKur aktivizon rezervimin automatik, të dhënat e pajisjes dhe të aplikacioneve ruhen periodikisht në largësi. Të dhënat e aplikacioneve mund të jenë çdo e dhënë që ka ruajtur një aplikacion (bazuar në cilësimet e zhvilluesit), duke përfshirë të dhëna ndoshta delikate si kontaktet, mesazhet dhe fotografitë."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Cilësimet e administrimit të pajisjes"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administratori i pajisjes"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Çaktivizo"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Çinstalo"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Çaktivizoje këtë administrator të pajisjes"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Çinstalo aplikacionin"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Çativizo dhe çinstalo"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratorët e pajisjes"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Nuk mundësohet asnjë administrator pajisjeje"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Punë"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nuk mundësohet asnjë agjent i besuar"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Të aktivizohet administratori i pajisjes?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivizo"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktivizo këtë administrator të pajisjes"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administratori i pajisjes"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Aktivizimi i këtij administratori do të lejojë që aplikacioni \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" të kryejë veprimet e mëposhtme:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Ky administrator është aktiv dhe lejon aplikacionin <xliff:g id="APP_NAME">%1$s</xliff:g> të kryejë operacionet vijuese:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Të aktivizohen telefonatat dhe SMS-të?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Historiku i telefonatave dhe SMS-ve do të ndahet me këtë përdorues."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informacioni i urgjencës"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"E qasshme përmes ekranit të kyçjes në formuesin e numrave në rast urgjence"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"E arritshme nga çdo person nga formuesi i numrit të urgjencës pa e shkyçur telefonin"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Lejo aplikacionet dhe përmbajtjen"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacionet me kufizime"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Zgjeroji cilësimet për aplikacionin"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4b57034..eddd5bd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -333,10 +333,17 @@
     <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_message" msgid="4747510337049957778">"Само додирните сензор за отисак прста да бисте откључали телефон, овластили куповине или се пријавили у апликације. \n\n Водите рачуна чије отиске прстију додајете – ове радње ће моћи да се обаве помоћу свих отисака прстију које додате."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Напомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Сазнајте више"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Напомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а. "<annotation id="url">" Сазнајте више"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Настави"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај таблет у случају губитка, крађе или брисања."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај уређај у случају губитка, крађе или брисања."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај телефон у случају губитка, крађе или брисања."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај таблет у случају губитка или крађе."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај уређај у случају губитка или крађе."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај телефон у случају губитка или крађе."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ипак прескочи"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Врати се"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Пронађите сензор"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"На полеђини уређаја пронађите сензор за отисак прста."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Илустрација са уређајем и локацијом сензора за отисак прста"</string>
@@ -370,6 +377,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Максималан број отисака прстију који можете да додате је <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Уклонити све отиске прстију?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Отиске прстију нећете моћи да користите за откључавање телефона, овлашћивање куповина или пријављивање у апликације помоћу њих."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -407,7 +416,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Заштитите уређај"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Откључајте помоћу отиска прста"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закључавање екрана"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Изаберите закључавање екрана"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Заштитите телефон"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а или лозинке. Подесите резервни метод за закључавање екрана да бисте били безбедни."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Спречите друге да користе овај таблет без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречите друге да користе овај уређај без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречите друге да користе овај телефон без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Изаберите резервни начин за закључавање екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Закључавање екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промена закључ. екрана"</string>
@@ -423,6 +436,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Средњи до високог нивоа безбедности"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Висок ниво безбедности"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Не сада"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Актуелно закључавање екрана"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Imprint + шаблон"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Imprint + PIN"</string>
@@ -475,7 +489,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Минимални број знакова који лозинка мора да садржи је %d"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Минимални број цифара у PIN-у је %d"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Додирните Настави када завршите"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Настави"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Лозинка мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> знак(ов)а."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> цифре(ара)."</string>
@@ -711,13 +724,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(непромењено)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Изаберите"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Додато је више сертификата)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Користи сертификате система"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не пружај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не проверавај"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Није наведен никакав сертификат. Веза неће бити приватна."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Морате да наведете домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Унесите лозинку за мрежу"</string>
@@ -1947,15 +1958,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Аутоматски правите резервне копије података уређаја (попут Wi-Fi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) даљински.\n\nКада укључите аутоматско прављење резервних копија, подаци уређаја и апликација се повремено чувају даљински. Подаци апликација могу да буду било који подаци које је апликација сачувала (на основу подешавања програмера), укључујући потенцијално осетљиве податке као што су контакти, поруке и слике."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Подешавања администрације уређаја"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор уређаја"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Деактивирај"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Деинсталирај"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Деактивирај овај администратор уређаја"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Деинсталирај апликацију"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Деактивирај и деинсталирај"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Администратори уређаја"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Нема доступних администратора уређаја"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Лични"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Посао"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Trust agents - Недоступно"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Желите ли да активирате администратор уређаја?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Активирај"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Активирај овај администратор уређаја"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Администратор уређаја"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Активирањем овог администратора омогућићете апликацији <xliff:g id="APP_NAME">%1$s</xliff:g> да обави следеће операције:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Овај администратор је активан и омогућава да апликација <xliff:g id="APP_NAME">%1$s</xliff:g> обави следеће операције:"</string>
@@ -2276,7 +2288,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Укључити телефонске позиве и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историја позива и SMS-ова ће се делити са овим корисником."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Информације о хитном случају"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Доступно преко закључаног екрана у апликацији за позиве у хитним случајевима"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Доступно свакоме у апликацији за позиве у хитним случајевима без откључавања телефона"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подешавања апликације"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7e34b6e..3b5a1a2 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Montera bort SD-kort"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Radera USB-lagring"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Radera SD-kort"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Gör texten på skärmen större eller mindre."</string>
     <string name="small_font" msgid="2295331917424072635">"Liten"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medium"</string>
     <string name="large_font" msgid="599055175160971446">"Stor"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås upp med fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Tryck bara på fingeravtryckssensorn om du vill låsa upp mobilen, auktorisera köp eller logga in i appar. \n\n Var försiktig med vems fingeravtryck du lägger till – alla som du lägger till fingeravtryck för kan göra dessa saker."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Obs! Fingeravtryck kan vara mindre säkra än en säkert lösenord eller en pinkod."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Läs mer"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Obs! Fingeravtryck kan vara mindre säkra än ett starkt grafiskt lösenord eller en pinkod. "<annotation id="url">"Läs mer"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsätt"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funktioner för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda surfplattan om du tappar den eller om den blir stulen eller rensad."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funktioner för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda enheten om du tappar den eller om den blir stulen eller rensad."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funktioner för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda mobilen om du tappar den eller om den blir stulen eller rensad."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funktionerna för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda surfplattan om du tappar den eller om den blir stulen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funktionerna för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda enheten om du tappar den eller om den blir stulen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funktionerna för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda mobilen om du tappar den eller om den blir stulen."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Hoppa över ändå"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Tillbaka"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Hitta sensorn"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Leta reda på fingeravtryckssensorn på baksidan av mobilen."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration med enheten och fingeravtryckssensorns plats"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Du kan lägga till upp till <xliff:g id="COUNT">%d</xliff:g> fingeravtryck"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vill du ta bort alla fingeravtryck?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Du kommer inte längre att kunna låsa upp mobilen, godkänna köp eller logga in i appar med hjälp av fingeravtryck."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, ta bort"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Fortsätt med hjälp av ditt fingeravtryck."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Skydda enheten"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Lås upp med ditt fingeravtryck"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Välj skärmlås"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Skydda mobilen"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Fingeravtryck kan vara mindre säkra än ett starkt grafiskt lösenord, en pinkod eller ett starkt lösenord. Konfigurera en låsskärm som reservlösning för säkerhets skull."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindra andra från att använda surfplattan utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindra andra från att använda enheten utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindra andra från att använda mobilen utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Välj en reservmetod för skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Byt skärmlås"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Medelhög till hög säkerhet"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lösenord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Hög säkerhet"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Inte nu"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Nuvarande skärmlås"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingeravtryck + grafiskt lösenord"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingeravtryck + pinkod"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Lösenordet måste innehålla minst %d tecken"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden måste innehålla minst %d siffror"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"När du är klar trycker du på Fortsätt"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsätt"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lösenordet får inte innehålla mer än  <xliff:g id="NUMBER">%d</xliff:g> tecken."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-koden får inte innehålla mer än <xliff:g id="NUMBER">%d</xliff:g> siffror."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(oförändrat)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Välj"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Flera certifikat har lagts till)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Använd systemcertifikat"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Tillhandahåll inte"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Validera inte"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Inget certifikat är specificerat. Anslutningen blir inte privat."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domän måste specificeras."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ange nätverkslösenordet"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Aktiv låsskärm"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Aktivera skärmen när du tar upp enheten eller får aviseringar"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Gör texten större eller mindre."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ställ in lås för SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lås för SIM-kort"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Tillgänglighet"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tillgänglighetsinställningar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Syninställningar"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Du kan anpassa enheten efter dina behov. Tillgänglighetsfunktionerna kan ändras senare under Inställningar."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjänster"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Skärmläsaren är främst avsedd för blinda eller personer med nedsatt syn"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Skärm"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Textning"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Förstorningsrörelse"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tryck tre gånger om du vill zooma"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Du zoomar in och ut genom att trycka med ett finger på skärmen tre gånger.\n\nNär du har zoomat in kan du:\n"<ul>\n<li>"Rulla: Dra med minst två fingrar över skärmen"</li>\n<li>"Justera zoomen: Nyp eller dra isär med minst två fingrar."</li></ul>\n\n"Om du vill zooma tillfälligt trycker du tre gånger och håller kvar fingret sista gången. Medan du håller fingret på skärmen flyttar du bilden genom att dra fingret över skärmen. Ta bort fingret när du vill zooma ut.\n\nObs! Förstoringsrörelser fungerar överallt utom på tangentbordet och navigeringsfältet."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Aktivera tillgänglighet snabbt"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"På"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Fjärrsäkerhetskopiera enhetsdata (t.ex. Wi-Fi-lösenord och samtalshistorik) och appdata (t.ex. inställningar och filer som har sparats i appar) automatiskt.\n\nNär du aktiverar automatisk säkerhetskopiering fjärrsparas enhets- och appdata då och då. Appdata kan vara all data som har sparats i en app (beroende på utvecklarinställningarna), inklusive data som kan vara känslig, till exempel kontakter, meddelanden och foton."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Inställningar för enhetsadministration"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhetsadministratör"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Inaktivera"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Avinstallera"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Inaktivera den här enhetsadministratören"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Avinstallera appen"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Inaktivera och avinstallera"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Enhetsadministratörer"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Det finns inga tillgängliga enhetsadministratörer"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personlig"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Arbete"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Det finns inga tillgängliga betrodda agenter"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Vill du aktivera enhetsadministratör?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktivera"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Aktivera den här enhetsadministratören"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Enhetsadministratör"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Om du aktiverar den här administratören kan appen <xliff:g id="APP_NAME">%1$s</xliff:g> utföra följande åtgärder:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Den här administratören är aktiv och tillåter att appen <xliff:g id="APP_NAME">%1$s</xliff:g> utför följande åtgärder:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vill du aktivera telefonsamtal och sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Samtals- och sms-historiken delas med den här användaren."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Krisinformation"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Tillgänglig via låsskärmen i nödsamtalsfunktionen"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Kan användas av alla via knappsatsen för nödsamtal utan att låsa upp mobilen"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillåt appar och innehåll"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Appar med begränsningar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utöka appens inställningar"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ändra till endast alarm fram till kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ändra till avbryt alltid"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blockera när skärmen är påslagen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Hindra att aviseringar visas på skärmen när du har aktiverat tysta aviseringar via Stör ej"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blockera när skärmen är avstängd"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Hindra att aviseringar slår på skärmen eller visar blinkande ljusaviseringar när du har aktiverat tysta aviseringar via Stör ej"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Inaktiverat"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"När skärmen är påslagen"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"När skärmen är avstängd"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"När skärmen är påslagen eller avstängd"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ange administratörspinkod"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Öppna kameran med två handledsvridningar"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Öppna kameran med två tryck på strömbr."</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Öppna kameran snabbt utan att låsa upp skärmen"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Visningsstorlek"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Gör objekt på skärmen större eller mindre"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"skärmdensitet, skärmzoom, skala, förstoring"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Gör objekten på skärmen större eller mindre. Vissa appar på skärmen kan byta plats."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Förhandsgranskning"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Förminska"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Förstora"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index cacda11..28a24ec 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -74,8 +74,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>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Kuongeza au kupunguza ukubwa wa maandishi kwenye skrini."</string>
     <string name="small_font" msgid="2295331917424072635">"Ndogo"</string>
     <string name="medium_font" msgid="2068475425515133701">"Wastani"</string>
     <string name="large_font" msgid="599055175160971446">"Kubwa"</string>
@@ -334,10 +333,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Fungua kwa kitambulisho"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Gusa tu kitambua alama ya kidole ili ufungue simu yako, uthibitishe ununuzi au uingie katika akaunti za programu. \n\n Kuwa makini unapoongeza alama za vidole kwa kuwa alama za vidole zitakazoongezwa zitaweza kuteleleza mambo haya yote."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Kumbuka: Kitambulisho chako kinaweza kuwa na usalama mdogo kuliko msimbo au PIN dhabiti."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Pata maelezo zaidi"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Kumbuka: Huenda alama yako ya kidole ikawa na kiwango cha chini cha usalama ikilinganishwa na mchoro au PIN. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ghairi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Endelea"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine kutumia kompyuta hii kibao iwapo itapotea, ikiibwa, au data iliyomo kwenye kompyuta kibao ikifutwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine wasitumie kifaa hiki iwapo kitapotea, kikiibwa au data iliyomo kwenye kifaa ikifutwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine wasitumie simu hii iwapo itapotea, ikiibwa au data iliyomo kwenye simu ikifutwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia kompyuta hii kibao iwapo itapotea au kuibwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea au kuibwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea au kuibwa."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ruka hivyo hivyo"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Rudi nyuma"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tafuta kihisi"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tafuta kihisi cha kitambulisho upande wa nyuma wa simu yako."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Mchoro unaooyesha mahali kihisi cha kitambulisho kilipo kwenye kifaa"</string>
@@ -371,6 +377,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Unaweza kuongeza hadi vitambulisho <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ungetaka kuondoa alama zako zote za vidole?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Hutaweza kutumia alama zako za vidole kufungua simu yako, kuidhinisha ununuzi, au kuingia katika akaunti ya programu."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ndiyo, ondoa"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Tumia kitambulisho chako ili uweze kuendelea."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Usimbaji fiche"</string>
@@ -408,7 +416,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Linda kifaa chako"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Fungua ukitumia alama ya kidole chako"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Mbinu ya kufunga skrini?"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Chagua mbinu ya kufunga skrini"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Linda simu yako"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Huenda alama ya kidole ikawa na kiwango cha chini cha usalama ikilinganishwa na mchoro au PIN dhabiti. Weka mbinu mbadala ya kufunga skrini ili uwe salama."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Wazuie watu wengine kutumia kompyuta kibao hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Wazuie watu wengine kutumia kifaa hiki bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Wazuie watu wengine kutumia simu hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Chagua njia mbadala ya kufunga skrini yako"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kufunga skrini"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"badilisha kufunga kwa skrini"</string>
@@ -424,6 +436,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Wastani hadi usalama wa juu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Usalama wa juu"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Siyo sasa"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Kifunga skrini cha sasa"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Alama ya kidole + Mchoro"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Alama ya kidole + PIN"</string>
@@ -478,7 +491,6 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
     <skip />
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Gonga Endelea utakapomaliza"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Endelea"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Nenosiri lazima liwe na vibambo chini ya <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Nenosiri lazima liwe chini ya tarakimu <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -708,13 +720,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(haijabadilishwa)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Tafadhali chagua"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Imeongeza vyeti vingi)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Tumia vyeti vya mfumo"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Usitoe"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Usithibitishe"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Hakuna cheti kilichobainishwa. Muunganisho wako hautakuwa wa faragha."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Lazima ubainishe kikoa."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Weka nenosiri la mtandao wako"</string>
@@ -892,8 +902,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Onyesho la vipengele vyote"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Ondoa skrini katika hali tuli unapopokea simu kwenye kifaa au kupokea arifa"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Kuongeza au kupunguza ukubwa wa maandishi"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mipangilio ya kuzima SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Weka mipangilio ya kufunga SIM kadi"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kufunga SIM kadi"</string>
@@ -1596,21 +1605,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Ufikiaji"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Mipangilio ya ufikiaji"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Mipangilio ya Mwonekano"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Unaweza kubadilisha mipangilio ya kifaa hiki kulingana na mahitaji yako. Vipengele hivi vya zana za walio na matatizo ya kuona au kusikia vinaweza kubadilishwa baadaye kwenye Mipangilio."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Huduma"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Kisoma skrini hasa kwa watu wenye upofu na wenye matatizo ya kuona"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Mfumo"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Onyesho"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Manukuu"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Ishara ya kupanua skrini"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gonga mara 3 ili ukuze"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Ili uvute karibu au kusogeza mbali, gonga skrini mara 3 kwa kidole kimoja.\n\nUkiwa umevuta karibu, unaweza:\n"<ul>\n<li>"Kusogeza: Buruta vidole 2 au zaidi katika skrini"</li>\n<li>"Kurekebisha kiwango cha kukuza: Bana vidole 2 au zaidi au uvitandaze"</li></ul>\n\n"Ili ukuze kwa muda, gonga mara 3 na ushikilie unapogonga mara ya mwisho. Huku ukiwa umeshikilia kwa kidole, buruta ili ukague sehemu mbalimbali kwenye skrini. Inua kidole chako ili usogeze nje tena.\n\nKumbuka: Ishara ya kupanua skrini hufanya kazi kila mahali isipokuwa kwenye kibodi na sehemu ya viungo muhimu."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikiaji"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Imewashwa"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Imezimwa"</string>
@@ -1944,15 +1948,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Hifadhi nakala ya data ya kifaa kiotomatiki (kama vile manenosiri ya Wi-Fi na rekodi ya simu zilizopigwa) na data ya programu (kama vile mipangilio na faili zilizohifadhiwa na programu) kwa mbali. \n\nUnapowasha kuhifadhi nakala kiotomatiki, data ya kifaa na programu huhifadhiwa mara kwa mara kiotomatiki kwa mbali. Data ya programu inaweza kuwa data yoyote ambayo programu imehifadhi (kulingana na mipangilio ya msanidi programu), ikiwa ni pamoja na data inayoweza kuwa nyeti kama vile anwani, ujumbe na picha."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mipangilio za usimamizi wa kifaa"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Kidhibiti cha kifaa"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Zima"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Ondoa"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Zima kipengele cha msimamizi wa kifaa hiki"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Ondoa programu"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Kuzima na Kuondoa"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Visimamizi vya kifaa"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Hakuna wasimamizi kifaa wanaopatikana"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Binafsi"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Kazini"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Hakuna madalali wa kuaminiwa wanaopatikana"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Kidhibiti cha kifaa kiwashwe?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Washa"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Washa kipengele cha msimamizi wa kifaa hiki"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Kidhibiti cha kifaa"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Kuwasha kisimamizi hiki kutaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya mambo yafuatayo:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Kidhibiti hiki kinatumika na kinaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya yafuatayo:"</string>
@@ -2273,7 +2278,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ungependa kuwasha SMS na kupiga simu?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Rekodi ya simu zilizopigwa na SMS zilizopokelewa itashirikiwa na mtumiaji huyu."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Maelezo ya dharura"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Inaweza kufikiwa kupitia skrini iliyofungwa katika kipiga simu ya dharura"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Inaweza kufikiwa na mtu yeyote aliye kwenye kipiga simu cha dharura bila kufungua simu yako"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ruhusu programu na maudhui"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Programu zilizo na vizuizi"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Panua mipangilio ya programu"</string>
@@ -2589,22 +2594,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Badilisha utumie kengele pekee hadi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Badilisha utumie hali ya katiza wakati wote"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Zuia wakati skrini imewashwa"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zuia arifa zilizozimwa sauti kwa kutumia kipengee cha Usinisumbue zisichungulie wala kuibuka kwenye skrini"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Zuia wakati skrini imezimwa"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zuia arifa zilizozimwa sauti kwa kutumia kipengele cha Usinisumbue zisiwashe skrini wala mwangaza wa arifa"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Imezimwa"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Wakati skrini imewashwa"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wakati skrini imezimwa"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wakati skrini imezimwa au imewashwa"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ingiza PIN ya msimamizi"</string>
@@ -2839,13 +2836,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Fungua programu ya kamera kwa kukunja kifundo cha mkono wako mara mbili"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Bonyeza kitufe cha kuwasha/kuzima mara mbili ili utumie kamera"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Fungua kamera kwa haraka bila kufungua skrini yako"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Ukubwa wa onyesho"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Kuongeza au kupunguza ukubwa wa vipengee kwenye skrini"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"onyesha uzito, kukuza skrini, kipimo, kupima"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Ongeza au upunguze ukubwa wa vipengee kwenye skrini yako. Baadhi ya programu kwenye skrini yako huenda zikabadilisha mahali zilipo."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Onyesho la kuchungulia"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Punguza"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Kuza"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index da6d197..13e4c4c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD கார்டை அகற்று"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB சேமிப்பிடத்தை அழி"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD கார்டை அழி"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"திரையில் காட்டப்படும் உரையைச் சிறிதாக்கும் அல்லது பெரிதாக்கும்."</string>
     <string name="small_font" msgid="2295331917424072635">"சிறிய"</string>
     <string name="medium_font" msgid="2068475425515133701">"நடுத்தரம்"</string>
     <string name="large_font" msgid="599055175160971446">"பெரிய"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"மொபைலைத் திறக்க, வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். \n\n சேர்க்கப்பட்ட எந்தக் கைரேகையைப் பயன்படுத்தியும் முன்னர் கூறிய செயல்களைச் செய்ய முடியும் என்பதால், யாருடைய கைரேகையைச் சேர்க்கிறீர்கள் என்பதில் கவனமாக இருக்கவும்."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"குறிப்பு: கைரேகையானது வலிமையான வடிவம் அல்லது பின்னை விட பாதுகாப்பு குறைந்தது."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"மேலும் அறிக"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"குறிப்பு: உங்கள் கைரேகையானது வலுவான வடிவம் அல்லது பின்னை விடப் பாதுகாப்பு குறைவானதாக இருக்கக்கூடும். "<annotation id="url">"மேலும் அறிக"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ரத்துசெய்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"தொடரவும்"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. டேப்லெட் தொலைந்துவிட்டாலோ, யாரேனும் திருடிவிட்டாலோ அல்லது அதில் உள்ள தரவை அழித்துவிட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. சாதனம் தொலைந்துவிட்டாலோ, யாரேனும் திருடிவிட்டாலோ அல்லது அதில் உள்ள தரவை அழித்துவிட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. ஃபோன் தொலைந்துவிட்டாலோ, யாரேனும் திருடிவிட்டாலோ அல்லது அதில் உள்ள தரவை அழித்துவிட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. டேப்லெட் தொலைந்துவிட்டாலோ, திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. சாதனம் தொலைந்துவிட்டாலோ, திருடப்பட்டாலோ பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. ஃபோன் தொலைந்துவிட்டாலோ, திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"பரவாயில்லை, தவிர்"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"முந்தையது"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"உணர்வியைக் கண்டறிக"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"உங்கள் ஃபோனின் பின்புறம் இருக்கும் கைரேகை உணர்வியைக் கண்டறியுங்கள்"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"சாதனத்தில் கைரேகை உணர்வி அமைந்துள்ள இடத்தின் விளக்கப்படம்"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> கைரேகைகள் வரை சேர்க்கலாம்"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"எல்லா கைரேகைகளையும் அகற்றவா?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"கைரேகைகளை அகற்றிவிட்டால், அவற்றைப் பயன்படுத்தி மொபைலைத் திறக்க முடியாது, வாங்குதல்களை அங்கீகரிக்க முடியாது அல்லது பயன்பாடுகளில் உள்நுழைய முடியாது."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"சாதனத்தைப் பாதுகாக்கவும்"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"கைரேகை மூலம் திறக்கலாம்"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"திரைப் பூட்டைத் தேர்வுசெய்யவும்"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"திரைப் பூட்டைத் தேர்வுசெய்யவும்"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ஃபோனைப் பாதுகாக்கவும்"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"உங்கள் கைரேகையானது வலுவான வடிவம், பின் அல்லது கடவுச்சொல்லை விடப் பாதுகாப்பு குறைவானதாக இருக்கக்கூடும். பாதுகாப்பாக இருக்க, மாற்றுப் பூட்டுத் திரையை அமைக்கவும்."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்த டேப்லெட்டைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் உங்கள் ஃபோனைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"மாற்றுத் திரைப் பூட்டு முறையைத் தேர்வுசெய்க"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"திரைப் பூட்டு"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"பூட்டுத் திரையை மாற்றவும்"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"மிதமானது முதல் அதிக பாதுகாப்பு"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"கடவுச்சொல்"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"அதிகப் பாதுகாப்பு"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"இப்போது வேண்டாம்"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"தற்போதைய திரைப் பூட்டு"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"கைரேகை + வடிவம்"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"கைரேகை + பின்"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"திறப்பதற்கான கடவுச்சொல்லை மாற்று"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"கடவுச்சொல்லில் கண்டிப்பாக குறைந்தது %d எழுத்துக்குறிகளாவது இருக்க வேண்டும்"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"பின்னில் குறைந்தது %d இலக்கங்கள் இருக்க வேண்டும்"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"முடிந்ததும், தொடரவும் என்பதைத் தட்டவும்"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"தொடர்க"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"கடவுச்சொல்லானது <xliff:g id="NUMBER">%d</xliff:g> எழுத்துக்குறிகளுக்கும் குறைவாகவே இருக்க வேண்டும்."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"பின் ஆனது <xliff:g id="NUMBER">%d</xliff:g> இலக்கங்களுக்கும் குறைவாகவே இருக்க வேண்டும்."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(மாற்றப்படவில்லை)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"தேர்ந்தெடுக்கவும்"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(பல சான்றிதழ்கள் சேர்க்கப்பட்டன)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"முறைமைச் சான்றிதழ்களைப் பயன்படுத்து"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"வழங்காதே"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"சரிபார்க்காதே"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"சான்றிதழ் எதுவும் குறிப்பிடப்படவில்லை. உங்கள் இணைப்பு தனிப்பட்டதாக இருக்காது."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"டொமைனைக் குறிப்பிட வேண்டும்."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS கிடைக்கிறது"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS கிடைக்கிறது)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"நெட்வொர்க் கடவுச்சொல்லை உள்ளிடவும்"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"சூழல்சார் திரை"</string>
     <string name="doze_summary" msgid="7128970177894383698">"சாதனத்தை எடுக்கும் போது அல்லது அறிவிப்புகளைப் பெறும் போது திரையை இயக்கு"</string>
     <string name="title_font_size" msgid="4405544325522105222">"எழுத்துரு அளவு"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"உரையைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"சிம் கார்டின் பூட்டை அமை"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"சிம் கார்டு பூட்டு"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"அணுகல்தன்மை"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"அணுகல்தன்மை அமைப்பு"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"காட்சி அமைப்புகள்"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"உங்கள் தேவைகளுக்கேற்ப இந்தச் சாதனத்தைத் தனிப்பயனாக்கலாம். இந்த அணுகல்தன்மை அம்சங்களை அமைப்புகளுக்குச் சென்று மாற்றலாம்."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"சேவைகள்"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"திரைப் படிப்பான் முக்கியமாக பார்வையற்றோர் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக வடிவமைக்கப்பட்டது"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"முறைமை"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"காட்சி"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"தலைப்புகள்"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"பெரிதாக்கும் வசதி"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"அளவை மாற்ற, 3 முறை தட்டவும்"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"ஒரு விரலைப் பயன்படுத்தி திரையை மூன்று முறை தட்டி அளவைச் சிறிதாக்கலாம் மற்றும் பெரிதாக்கலாம்.\n\nபெரிதாக்கியிருக்கும் போது, பின்வருவனவற்றைச் செய்யலாம்:\n"<ul>\n<li>"உருட்டல்: திரை முழுவதும் நகர்த்த இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் இழுக்கவும்"</li>\n<li>"அளவைச் சரிசெய்தல்: இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களை ஒன்றாகச் சேர்க்கவும் (சிறிதாக்க) அல்லது அவற்றை விரிக்கவும் (பெரிதாக்க)"</li></ul>\n\n"தற்காலிகமாகப் பெரிதாக்க, மூன்று முறை தட்டி, கடைசி முறை தட்டும் போது பிடித்திருக்கவும். விரலால் பிடித்துக்கொண்டே, திரை முழுவதும் நகர்த்த இழுக்கவும். பழைய அளவிற்கு மாற்ற, விரலை எடுக்கவும்.\n\nகுறிப்பு: விசைப்பலகை மற்றும் வழிசெலுத்தல் பட்டியைத் தவிர்த்து, பெரிதாக்கும் வசதி எல்லா இடங்களிலும் வேலை செய்யும்."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"அணுகல்தன்மைக் குறுக்குவழி"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"இயக்கத்தில்"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"முடக்கத்தில்"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள், அழைப்பு பதிவு போன்றவை) பயன்பாட்டுத் தரவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள், கோப்புகள் போன்றவை) தொலைநிலையில் தானாகக் காப்புப் பிரதி எடுக்கும்.\n\nதானியங்கு காப்புப் பிரதியை இயக்கும் போது, சாதனம் மற்றும் பயன்பாட்டுத் தரவானது குறிப்பிட்ட கால இடைவெளியில் தொலைநிலையில் சேமிக்கப்படும். பயன்பாட்டுத் தரவு என்பது, தொடர்புகள், செய்திகள், படங்கள் போன்ற மிகவும் முக்கிய தரவு உட்பட, பயன்பாடு சேமித்த (டெவெலப்பர் அமைப்புகளைப் பொறுத்து) எந்தத் தரவாகவும் இருக்கலாம்."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"சாதன நிர்வாகியின் அமைப்பு"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"சாதன நிர்வாகி"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"செயலற்றதாக்கு"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"நிறுவல் நீக்கு"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"இந்தச் சாதன நிர்வாகியை முடக்கு"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"பயன்பாட்டை நிறுவல் நீக்கு"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"முடக்கி, நிறுவல் நீக்கு"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"சாதனத்தின் நிர்வாகிகள்"</string>
     <string name="no_device_admins" msgid="702695100241728775">"சாதன நிர்வாகிகள் இல்லை"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"தனிப்பட்டவை"</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="6246742476064507965">"சாதன நிர்வாகியைச் செயல்படுத்தவா?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"செயல்படுத்து"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"இந்தச் சாதன நிர்வாகியை இயக்கு"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"சாதன நிர்வாகி"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"இந்த நிர்வாகியை இயக்குவது, பின்வரும் செயல்பாடுகளைச் செயல்படுத்த <xliff:g id="APP_NAME">%1$s</xliff:g> ஐ அனுமதிக்கும்:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"நிர்வாகி செயலில் உள்ளார், மேலும் பின்வரும் செயல்பாடுகளை மேற்கொள்ள <xliff:g id="APP_NAME">%1$s</xliff:g> பயன்பாட்டை அனுமதிக்கிறார்:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ஃபோன் அழைப்புகள் &amp; SMSஐ இயக்கவா?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"அழைப்பும் SMS வரலாறும் இவருடன் பகிரப்படும்."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"அவசரத் தகவல்"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"அவசர டயலரில் பூட்டுத் திரை மூலமாக அணுகலாம்"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"உங்கள் ஃபோனைத் திறக்காமலே அவசர டயலரிலிருந்து எவரும் அணுகலாம்"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"பயன்பாடுகளையும் உள்ளடக்கத்தையும் அனுமதி"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"வரையறைகளுடனான பயன்பாடுகள்"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"பயன்பாட்டிற்கான அமைப்புகளை விரிவுபடுத்து"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"எப்போதும் குறுக்கிடு என மாற்று"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"திரை இயக்கப்பட்டிருக்கும் போது தடு"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள், திரையில் குறுக்கிடுவதை அல்லது தோன்றுவதைத் தடு"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"திரை முடக்கப்பட்டிருக்கும் போது தடு"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதை அல்லது அறிவிப்பு ஒளி ஒளிர்வதைத் தடு"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"முடக்கத்தில்"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"திரை இயக்கப்பட்டிருக்கும் போது"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"திரை முடக்கப்பட்டிருக்கும் போது"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"திரை இயக்கத்தில் அல்லது முடக்கத்தில் உள்ள போது"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"நிர்வாகி பின்னை உள்ளிடவும்"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"உங்கள் மணிக்கட்டை இருமுறை திருப்புவதன் மூலம் கேமரா பயன்பாட்டைத் திறக்கலாம்"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"கேமராவிற்கு பவர் பட்டனை இருமுறை அழுத்துக"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"திரையைத் திறக்காமலேயே கேமராவை வேகமாகத் திறக்கும்"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"காட்சி அளவு"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"திரையில் உள்ளவற்றைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"திரை அடர்த்தி, ஸ்கிரீன் ஜும், அளவு, அளவிடல்"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"திரையில் உள்ளவற்றைச் சிறிதாக்கும் அல்லது பெரிதாக்கும். திரையில் உள்ள சில பயன்பாடுகளின் நிலை மாறக்கூடும்."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"மாதிரிக்காட்சி"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"சிறிதாக்கு"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"பெரிதாக்கு"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 73d8359..cf94d8e 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రామాణీకరించడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. \n\n మీరు ఎవరి వేలిముద్రలను జోడిస్తున్నారనే విషయంలో జాగ్రత్తగా ఉండండి - జోడించిన ఏ వేలిముద్రలు అయినా ఈ పనులను చేయగలుగుతాయి."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"గమనిక: మీ వేలిముద్ర దృఢమైన నమూనా లేదా PIN కంటే తక్కువ సురక్షితంగా ఉండవచ్చు."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"మరింత తెలుసుకోండి"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"గమనిక: మీ వేలిముద్ర శక్తివంతమైన నమూనా లేదా PIN కంటే తక్కువ సురక్షితంగా ఉండవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"రద్దు చేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"కొనసాగించు"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"పరికర సంరక్షణ లక్షణాలు సక్రియం చేయబడవు. మీరు ఈ టాబ్లెట్‌ను పోగొట్టుకున్న, దొంగిలించబడిన లేదా ఇందులోని డేటా తొలగించబడిన సందర్భాల్లో, దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ పరికరాన్ని పోగొట్టుకున్న, దొంగిలించబడిన లేదా ఇందులోని డేటా తొలగించబడిన సందర్భాల్లో, దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ ఫోన్‌ను పోగొట్టుకున్న, దొంగిలించబడిన లేదా ఇందులోని డేటా తొలగించబడిన సందర్భాల్లో, దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ టాబ్లెట్ పోగొట్టుకున్న లేదా దొంగిలించబడిన సందర్భాల్లో దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ పరికరం పోగొట్టుకున్న లేదా దొంగిలించబడిన సందర్భాల్లో దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ ఫోన్ పోగొట్టుకున్న లేదా దొంగిలించబడిన సందర్భాల్లో దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"ఏదేమైనా దాటవేయి"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"వెనుకకు వెళ్లు"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"సెన్సార్‌ని కనుగొనండి"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"మీ ఫోన్ వెనుకవైపున వేలిముద్ర సెన్సార్‌ని గుర్తించండి."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"పరికరం మరియు వేలిముద్ర సెన్సార్ స్థానంతో చిత్రపటం"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"మీరు గరిష్టంగా <xliff:g id="COUNT">%d</xliff:g> వేలిముద్రలను జోడించవచ్చు"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"అన్ని వేలిముద్రలు తీసివేయాలా?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"మీరు మీ ఫోన్ అన్‌లాక్ చేయడానికి, కొనుగోళ్లు ప్రామాణీకరించడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి మీ వేలిముద్రలను ఉపయోగించలేరు."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"మీ పరికరాన్ని సంరక్షిస్తుంది"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"మీ వేలిముద్రతో అన్‌లాక్ చేయండి"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"స్క్రీన్ లాక్‌ను ఎంచుకోండి"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"స్క్రీన్ లాక్‌ను ఎంచుకోండి"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"మీ ఫోన్‌ను రక్షించుకోండి"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"వేలిముద్ర శక్తివంతమైన నమూనా, PIN లేదా పాస్‌వర్డ్ కంటే తక్కువ సురక్షితంగా ఉండవచ్చు. సురక్షితంగా ఉండటానికి బ్యాకప్ లాక్ స్క్రీన్‌ను సెటప్ చేయండి."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ టాబ్లెట్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ పరికరాన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ ఫోన్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని ఎంచుకోండి"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"స్క్రీన్ లాక్"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"లాక్ స్క్రీన్ మార్చండి"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"మధ్యస్థం నుండి అధిక భద్రత"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"పాస్‌వర్డ్"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"అధిక భద్రత"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ఇప్పుడు కాదు"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"ప్రస్తుత స్క్రీన్ లాక్"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"వేలిముద్ర + నమూనా"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"వేలిముద్ర + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"అన్‌లాక్ పాస్‌వర్డ్‌ను మార్చు"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"పాస్‌వర్డ్ తప్పనిసరిగా కనీసం %d అక్షరాలు ఉండాలి"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"పిన్‌ తప్పనిసరిగా కనీసం %d అంకెలను కలిగి ఉండాలి"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"పూర్తయినప్పుడు కొనసాగించు నొక్కండి"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"కొనసాగించండి"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"పాస్‌వర్డ్ తప్పనిసరిగా <xliff:g id="NUMBER">%d</xliff:g> కంటే తక్కువ అక్షరాలను కలిగి ఉండాలి."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"పిన్‌ <xliff:g id="NUMBER">%d</xliff:g> కంటే తక్కువ అంకెలను కలిగి ఉండాలి."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(మారలేదు)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"దయచేసి ఎంచుకోండి"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(బహుళ ప్రమాణపత్రాలు జోడించబడ్డాయి)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"సిస్టమ్ ప్రమాణపత్రాలను ఉపయోగించు"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"అందించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ప్రామాణీకరించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ప్రమాణపత్రం ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"తప్పనిసరిగా డొమైన్‌ను పేర్కొనాలి."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS అందుబాటులో ఉంది"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"మీ నెట్‌వర్క్ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"పరికర డేటా (Wi-Fi పాస్‌వర్డ్‌లు మరియు కాల్ చరిత్ర వంటివి) మరియు అనువర్తన డేటాను (సెట్టింగ్‌లు మరియు అనువర్తనాల ద్వారా నిల్వ చేయబడిన ఫైల్‌లు వంటివి) స్వయంచాలకంగా రిమోట్ విధానంలో బ్యాకప్ చేస్తుంది.\n\nమీరు స్వీయ బ్యాకప్‌ను ఆన్ చేసినప్పుడు, పరికర మరియు అనువర్తన డేటా కాలానుగుణంగా రిమోట్ విధానంలో సేవ్ చేయబడుతుంది. పరిచయాలు, సందేశాలు మరియు ఫోటోల వంటి సున్నితమైన వ్యక్తిగత డేటాతో సహా అనువర్తనం సేవ్ చేసిన (డెవలపర్ సెట్టింగ్‌ల ఆధారంగా) ఎలాంటి డేటా అయినా అనువర్తన డేటాగా పరిగణించబడుతుంది."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"పరికర నిర్వహణ సెట్టింగ్‌లు"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"పరికర నిర్వాహకులు"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"నిష్క్రియం చేయి"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"అన్ఇన్‌స్టాల్ చేయి"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ఈ పరికర నిర్వాహకుని నిష్క్రియం చేయి"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"అనువర్తనాన్ని అన్‌ఇన్‌స్టాల్ చేయి"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"నిష్క్రియం చేసి, అన్‌ఇన్‌స్టాల్ చేయి"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"పరికర నిర్వాహకులు"</string>
     <string name="no_device_admins" msgid="702695100241728775">"అందుబాటులో ఉన్న పరికర నిర్వాహకులు లేరు"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"వ్యక్తిగతం"</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="6246742476064507965">"పరికర నిర్వాహకుని సక్రియం చేయాలా?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"సక్రియం చేయి"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"ఈ పరికర నిర్వాహకుని సక్రియం చేయి"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"పరికర నిర్వాహకులు"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"ఈ నిర్వాహికిని సక్రియం చేయడం వలన క్రింది చర్యలు అమలు చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> అనువర్తనం అనుమతించబడుతుంది:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ఈ నిర్వాహకులు సక్రియంగా ఉన్నారు మరియు క్రింది చర్యలు అమలు చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> అనువర్తనాన్ని అనుమతిస్తున్నారు:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ఫోన్ కాల్‌లు &amp; SMSను ఆన్ చేయాలా?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"కాల్ మరియు SMS చరిత్ర ఈ వినియోగదారుతో భాగస్వామ్యం చేయబడుతుంది."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"అత్యవసర సమాచారం"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"అత్యవసర డయలర్‌లో లాక్ స్క్రీన్ ద్వారా ప్రాప్యత చేయవచ్చు"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"అత్యవసర డయలర్ నుండి ఎవరైనా మీ ఫోన్‌ను అన్‌లాక్ చేయకుండానే ప్రాప్యత చేయగలుగుతారు"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"అనువర్తనాలు మరియు కంటెంట్‌ను అనుమతించండి"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"పరిమితులు గల అనువర్తనాలు"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"అనువర్తన సెట్టిం. విస్తరింపజేయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d40cfad..2b542fe 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"เพียงแตะเซ็นเซอร์ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอป \n\n ตรวจสอบให้ดีว่าคุณเพิ่มลายนิ้วมือของใคร ลายนิ้วมือใดก็ตามที่คุณเพิ่มจะสามารถใช้ทำสิ่งเหล่านี้ได้"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"หมายเหตุ: ลายนิ้วมือจะมีความปลอดภัยน้อยกว่ารูปแบบหรือ PIN ที่เดายาก"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"เรียนรู้เพิ่มเติม"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"หมายเหตุ: ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบหรือ PIN ที่เดายาก "<annotation id="url">"เรียนรู้เพิ่มเติม"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ยกเลิก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ต่อไป"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานแท็บเล็ตนี้ได้หากแท็บเล็ตสูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานอุปกรณ์เครื่องนี้ได้หากอุปกรณ์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานโทรศัพท์เครื่องนี้ได้หากโทรศัพท์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้แท็บเล็ตนี้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้อุปกรณ์นี้ได้หากอุปกรณ์สูญหายหรือถูกขโมย"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้โทรศัพท์นี้ได้หากโทรศัพท์สูญหายหรือถูกขโมย"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"ข้ามไปก่อน"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"ย้อนกลับ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ค้นหาเซ็นเซอร์"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ค้นหาเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ภาพประกอบที่มีตำแหน่งของอุปกรณ์และเซ็นเซอร์ลายนิ้วมือ"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"คุณสามารถเพิ่มลายนิ้วมือได้ถึง <xliff:g id="COUNT">%d</xliff:g> ลาย"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"นำลายนิ้วมือทั้งหมดออกใช่ไหม"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"คุณจะไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์ อนุญาตให้ซื้อ หรือลงชื่อเข้าใช้แอปต่างๆ ด้วยลายนิ้วมือได้"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ปกป้องอุปกรณ์ของคุณ"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ปลดล็อกด้วยลายนิ้วมือ"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"เลือกการล็อกหน้าจอ"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"เลือกการล็อกหน้าจอ"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"ปกป้องโทรศัพท์ของคุณ"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบ, PIN หรือรหัสผ่านที่เดายาก โปรดตั้งค่าล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"เปลี่ยนหน้าจอล็อก"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ความปลอดภัยระดับปานกลางถึงสูง"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"รหัสผ่าน"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ความปลอดภัยระดับสูง"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ข้ามไปก่อน"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"การล็อกหน้าจอปัจจุบัน"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ลายนิ้วมือ + รูปแบบ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ลายนิ้วมือ + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"รหัสผ่านจะต้องมีอักขระอย่างน้อย %d ตัว"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN ต้องมีตัวเลขอย่างน้อย %d หลัก"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"แตะ \"ต่อไป\" เมื่อทำเสร็จแล้ว"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ดำเนินการต่อ"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"รหัสผ่านต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> อักขระ"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN ต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> หลัก"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ไม่เปลี่ยน)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"โปรดเลือก"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(เพิ่มใบรับรองหลายใบแล้ว)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"ใช้ใบรับรองของระบบ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ไม่ต้องระบุ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ไม่ต้องตรวจสอบ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ไม่ได้ระบุใบรับรอง การเชื่อมต่อของคุณจะไม่เป็นส่วนตัว"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ต้องระบุโดเมน"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ใช้งานได้"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ป้อนรหัสผ่านเครือข่าย"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"สำรองข้อมูลในอุปกรณ์ (เช่น รหัสผ่าน Wi-Fi และประวัติการโทร) และข้อมูลแอป (เช่น การตั้งค่าและไฟล์ที่แอปจัดเก็บไว้) ลงใน Google ไดร์ฟจากระยะไกลโดยอัตโนมัติ\n\nเมื่อคุณเปิดเปิดการสำรองข้อมูลอัตโนมัติ ระบบจะบันทึกข้อมูลอุปกรณ์และข้อมูลแอปไปยังโฟลเดอร์ส่วนตัวใน Google ไดรฟ์เป็นระยะๆ ข้อมูลแอปอาจเป็นข้อมูลใดๆ ก็ตามที่แอปบันทึกไว้ (ตามการตั้งค่าของนักพัฒนาซอฟต์แวร์) ซึ่งรวมถึงข้อมูลที่อาจมีความละเอียดอ่อน เช่น รายชื่อติดต่อ ข้อความ และรูปภาพ"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"การตั้งค่าการควบคุมอุปกรณ์"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"โปรแกรมควบคุมอุปกรณ์"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"ปิดการใช้งาน"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"ถอนการติดตั้ง"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"ปิดใช้งานโปรแกรมควบคุมอุปกรณ์นี้"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ถอนการติดตั้งแอป"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"ปิดใช้งานและถอนการติดตั้ง"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"โปรแกรมควบคุมอุปกรณ์"</string>
     <string name="no_device_admins" msgid="702695100241728775">"ไม่มีโปรแกรมควบคุมอุปกรณ์"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ส่วนตัว"</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="6246742476064507965">"เปิดการใช้งานโปรแกรมควบคุมอุปกรณ์"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"เปิดการใช้งาน"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"เปิดใช้งานโปรแกรมควบคุมอุปกรณ์นี้"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"โปรแกรมควบคุมอุปกรณ์"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"การเปิดใช้งานโปรแกรมควบคุมนี้จะทำให้แอปพลิเคชัน <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่อไปนี้ได้:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"โปรแกรมควบคุมนี้ทำงานอยู่และอนุญาตให้แอปพลิเคชัน <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานดังต่อไปนี้:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"เปิดโทรศัพท์และ SMS ไหม"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ระบบจะแชร์ประวัติการโทรและ SMS กับผู้ใช้รายนี้"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ข้อมูลสำหรับกรณีฉุกเฉิน"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"เข้าถึงได้ผ่านหน้าจอล็อกในโปรแกรมโทรฉุกเฉิน"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"ทุกคนสามารถเข้าถึงได้จากโปรแกรมโทรฉุกเฉินโดยไม่ต้องปลดล็อกโทรศัพท์ของคุณ"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"อนุญาตแอปและเนื้อหา"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"แอปพลิเคชันที่มีข้อจำกัด"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ขยายการตั้งค่าของแอปพลิเคชัน"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3ea5a18..15bbe75 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"I-unlock sa fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Pindutin lang ang sensor para sa fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili o mag-sign in sa mga app. \n\n Pag-isipang mabuti kung kaninong mga fingerprint ang iyong idaragdag - magagawa ang mga bagay na ito ng anumang mga fingerprint na idaragdag."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Tandaan: Maaaring hindi gaanong secure ang iyong fingerprint kaysa sa isang malakas na pattern o PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Matuto nang higit pa"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Tandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa malakas na pattern o PIN. "<annotation id="url">"Matuto nang higit pa"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Kanselahin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Magpatuloy"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang iyong tablet kung mawala, manakaw o ma-wipe ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang device na ito kung mawala, manakaw o ma-wipe ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang teleponong ito kung mawala, manakaw o ma-wipe ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang iba pang mga tao na gamitin ang tablet na ito kung nawala o nanakaw ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang iba pang mga tao na gamitin ang device na ito kung nawala o nanakaw ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang iba pang mga tao na gamitin ang teleponong ito kung nawala o nanakaw ito."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Laktawan pa rin"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Bumalik"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Hanapin ang sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Hanapin ang fingerprint sensor sa likod ng iyong telepono."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Larawan kung saan ipinapakita ang lokasyon ng device at fingerprint sensor"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Maaari kang magdagdag ng hanggang <xliff:g id="COUNT">%d</xliff:g> (na) fingerprint"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alisin ang lahat ng fingerprint?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Hindi mo magagamit ang iyong mga fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili o mag-sign in sa mga app gamit ang mga iyon."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Oo, alisin"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Gamitin ang iyong fingerprint upang magpatuloy."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Pag-encrypt"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protektahan ang iyong device"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"I-unlock gamit ang iyong fingerprint"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pumili ng screen lock"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Pumili ng lock ng screen"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Protektahan phone mo"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa malakas na pattern, PIN o password. Mag-set up ng backup na lock screen upang maging ligtas."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Pigilan ang ibang taong magamit ang tablet na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang lock ng screen na gusto mong gamitin."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Pigilan ang ibang taong magamit ang device na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang lock ng screen na gusto mong gamitin."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Pigilan ang ibang taong magamit ang teleponong ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang lock ng screen na gusto mong gamitin."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Piliin ang iyong backup na paraan ng pag-lock ng screen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"I-screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Baguhin ang lock ng screen"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Katamtaman hanggang mataas na seguridad"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mataas na seguridad"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Huwag ngayon"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Kasalukuyang lock ng screen"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Fingerprint + Pattern"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Fingerprint + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Dapat hindi bababa sa %d (na) character ang password"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Ang PIN ay hindi dapat bababa sa %d (na) digit"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"I-tap ang Magpatuloy kapag tapos na"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Dapat mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) character ang password."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Ang PIN ay dapat na mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) digit."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(di-nabago)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Mangyaring pumili"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Nagdagdag ng maraming certificate)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Gamitin ang mga certificate ng system"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Huwag ibigay"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Huwag patotohanan"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Walang natukoy na certificate. Hindi magiging pribado ang iyong koneksyon."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Dapat tumukoy ng domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ilagay ang iyong password sa network"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Awtomatikong i-back up ang data ng device (tulad ng mga password sa Wi-Fi at history ng tawag) at data ng app (tulad ng mga setting at mga file na inimbak ng mga app) nang malayuan.\n\nKapag i-on mo ang awtomatikong pag-backup, pana-panahong sine-save nang malayuan ang data ng device at app. Ang data ng app ay maaaring anumang data na na-save ng app (batay sa mga setting ng developer), kabilang ang potensyal na sensitibong data tulad ng mga contact, mensahe at larawan."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mga setting ng administration ng device"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator ng device"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"I-deactivate"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"I-uninstall"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"I-deactivate ang administrator ng device na ito"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"I-uninstall ang app"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"I-deactivate at I-uninstall"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrator ng device"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Walang mga available na administrator ng device"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Trabaho"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Walang available na mga trust agent"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"I-activate ang device administrator?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"I-activate"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"I-activate ang administrator ng device na ito"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator ng device"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Bibigyang-daan ng pag-activate sa administrator na ito ang app na <xliff:g id="APP_NAME">%1$s</xliff:g> upang isagawa ang sumusunod na mga pagpapatakbo:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Aktibo ang administrator na ito at pinapayagan ang app na <xliff:g id="APP_NAME">%1$s</xliff:g> upang isagawa ang sumusunod na mga pagpapatakbo:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"I-on ang mga pagtawag sa telepono at SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Ibabahagi sa user na ito ang history ng pagtawag at SMS."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Impormasyong pang-emergency"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Naa-access sa pamamagitan ng lock screen sa emergency dialer"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Maa-access ng sinuman mula sa emergency dialer nang hindi ina-unlock ang iyong telepono"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Payagan ang apps at nilalaman"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Mga application na may mga paghihigpit"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Palawakin ang mga setting para sa application"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 45cd72d..5c0fd1f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD kartının bağlantısını kes"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB belleği sil"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD kartı sil"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Ekrandaki metni daha küçük veya daha büyük yapın."</string>
     <string name="small_font" msgid="2295331917424072635">"Küçük"</string>
     <string name="medium_font" msgid="2068475425515133701">"Ortam"</string>
     <string name="large_font" msgid="599055175160971446">"Büyük"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Parmak iziyle kilit açma"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Telefonunuzun kilidini açmak, satın alma işlemleri için yetki vermek veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterlidir. \n\n Parmak izlerini eklediğiniz kişiler konusunda dikkatli olun. Parmak izi eklenen kişiler bu işlemlerin hepsini yapabilir."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Not: Parmak iziniz güçlü bir desen veya PIN kadar güvenli olmayabilir."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Daha fazla bilgi edinin"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Not: Parmak iziniz güvenirliği, güçlü bir desene veya PIN\'e göre daha düşük olabilir. "<annotation id="url">"Daha fazla bilgi edinin"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"İptal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Devam"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda, çalındığında ya da silindiğinde bu tabletin başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda, çalındığında ya da silindiğinde bu cihazın başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda, çalındığında ya da silindiğinde bu telefonun başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda veya çalındığında bu tabletin başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda veya çalındığında bu cihazın başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda veya çalındığında bu telefonun başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Yine de atla"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Geri git"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensörü bulun"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefonunuzun arkasındaki parmak izi sensörünü bulun."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Cihaz ve parmak izi sensörünün yerini gösteren çizim"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> adede kadar parmak izi ekleyebilirsiniz"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Tüm parmak izleri kaldırılsın mı?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izlerinizi kullanamayacaksınız."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Evet, kaldır"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Devam etmek için parmak izinizi kullanın."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifreleme"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Cihazınızı koruyun"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Parmak izinizle kilit açma"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidini seçin"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Ekran kilidini seçin"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefonunuzu koruyun"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Parmak izinizin güvenirliği, güçlü bir desene veya PIN\' göre daha düşük olabilir. Güvende olmak için bir yedek kilit ekranı ayarlayın."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu tableti kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu cihazı kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu telefonu kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Yedek ekran kilitleme yönteminizi seçin"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekrn kilidini değştr"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Orta-yüksek düzey güvenlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Şifre"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yüksek düzey güvenlik"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Şimdi değil"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Geçerli ekran kilidi"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Parmak İzi + Desen"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Parmak İzi + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Şifre en az %d karakter olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN en az %d basamaklı olmalıdır"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"İşlem tamamlandığında Devam Et düğmesine hafifçe dokunun"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Şifre <xliff:g id="NUMBER">%d</xliff:g> karakterden kısa olmalıdır."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN en çok <xliff:g id="NUMBER">%d</xliff:g> basamaklı olmalıdır."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(değişmedi)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Lütfen seçin"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Birden fazla sertifika eklendi)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Sistem sertifikalarını kullan"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Sağlama"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Doğrulama"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifika belirtilmedi. Bağlantınız gizli olmayacak."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Alan adı belirtilmelidir."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ağ şifrenizi girin"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Ortam ekranı"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Cihazı elime aldığımda veya bildirim geldiğinde ekranı uyandır"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Metni daha büyük veya daha küçük yapın"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM kart kilidini ayarla"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kart kilidi"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Erişilebilirlik"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Erişebilirlik ayarları"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görüş Ayarları"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı gereksinimlerinize uygun şekilde özelleştirebilirsiniz. Bu erişilebilirlik özellikleri daha sonra Ayarlar\'dan değiştirilebilir."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Hizmetler"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Ekran okuyucu, asıl olarak gözleri görmeyen veya az gören kullanıcılar içindir"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Ekran"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Altyazılar"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Büyütme hareketi"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Yakınlaştırmak için 3 defa hafifçe dokunun"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Yakınlaştırmak ve uzaklaştırmak için ekrana bir parmağınızla 3 kez hafifçe dokunun.\n\nYakınlaştırdığınızda şunları yapabilirsiniz:\n"<ul>\n<li>"Kaydırma: 2 veya daha fazla parmağınızı ekranda sürükleyin"</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: 2 veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın"</li></ul>\n\n"Geçici olarak yakınlaştırmak için 3 defa hafifçe dokunun ve son hafifçe dokunmada parmağınızı basılı tutun. Ekranda hareket etmek için parmağınızı basılı tutarken sürükleyin. Tekrar uzaklaştırmak için parmağınızı kaldırın.\n\nNot: Büyütme hareketi, klavye ve gezinme çubuğu hariç her yerde çalışır."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Açık"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Kapalı"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Cihaz verilerini (Kablosuz ağ şifreleri ve çağrı geçmişi gibi) ve uygulama verilerini (uygulamalar tarafından depolanan ayarlar ve dosyalar gibi) uzaktan otomatik olarak yedekleyin.\n\nOtomatik yedeklemeyi açtığınızda, cihaz ve uygulama verileri periyodik olarak uzaktan kaydedilir. Uygulama verileri, bir uygulamanın kaydettiği (geliştirici ayarlarına göre), kişiler, iletiler ve fotoğraflar gibi hassas olabilecek verileri de içeren her türlü veri olabilir."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Aygıt yönetimi ayarları"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Cihaz yöneticisi"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Etkinliğini Kaldır"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Yüklemeyi kaldır"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Bu cihaz yöneticisini devre dışı bırak"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Uygulamanın yüklemesini kaldır"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Devre Dışı Bırak ve Yüklemeyi Kaldır"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Cihaz yöneticileri"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Uygun cihaz yöneticisi yok"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Kişisel"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"İş"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Kullanılabilir güven aracısı yok"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Cihaz yöneticisi etkinleştirilsin mi?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Etkinleştir"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Bu cihaz yöneticisini etkinleştir"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Cihaz yöneticisi"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Bu yöneticinin etkinleştirilmesi, <xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasının şu işlemleri gerçekleştirilmesine izin verir:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Bu yönetici etkin ve <xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasının şu işlemleri gerçekleştirmesine izin veriyor:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon çağrıları ve SMS açılsın mı?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Çağrı ve SMS geçmişi bu kullanıcıyla paylaşılacak."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Acil durum bilgisi"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Acil durum numara çeviricisinde kilit ekranından erişilebilir"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Telefonunuzun kilidi açılmadan acil durum numara çeviricisinden herkes tarafından erişilebilir"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Uygulamalara ve içeriğe izin ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Kısıtlamalı uygulamalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Uygulama ayarlarını genişlet"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Yalnızca şu saate kadar alarmlara geç: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Her zaman kes seçeneğine değiştir"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Ekran açıkken engelle"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Rahatsız Etmeyin ayarıyla sessize alınan bildirimlerin ekranda kısaca belirmesini veya ekranda açılmasını engelle"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Ekran kapalıyken engelle"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Rahatsız Etmeyin ayarıyla sessize alınan bildirimlerin ekranı açmasını veya bildirim ışığını yakıp söndürmesini engelle"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Kapalı"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Ekran açıkken"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran kapalıyken"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran kapalıyken veya açıkken"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Yönetici PIN\'ini girin"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Bileğinizi iki kez bükerek kamera uygulamasını açın"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera için güç düğmesine iki kez basın"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ekranınızı kilitlemeden kamerayı hızlıca açın"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Görüntü boyutu"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Ekrandaki öğeleri daha büyük veya daha küçük yapın"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ekran yoğunluğu, ekran yakınlaştırma, ölçek, ölçekleme"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Ekrandaki öğeleri daha küçük veya daha büyük yapın. Ekrandaki bazı uygulamaların konumu değişebilir."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Önizleme"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Küçült"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Büyüt"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 28ea882..f2134ca 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -76,8 +76,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Відключ. карту SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Очистити носій USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Очист. карту SD"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Збільшуйте або зменшуйте текст на екрані."</string>
     <string name="small_font" msgid="2295331917424072635">"Малий"</string>
     <string name="medium_font" msgid="2068475425515133701">"Середній"</string>
     <string name="large_font" msgid="599055175160971446">"Великий"</string>
@@ -336,10 +335,17 @@
     <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_message" msgid="4747510337049957778">"Щоб розблокувати телефон, дозволити покупку або ввійти в додаток, просто торкніться сканера відбитків пальців. \n\n Це можна зробити за допомогою будь-якого відбитка, доданого на телефон. Тож будьте обачні."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Примітка. Відбиток пальця може бути менш надійним, ніж ключ чи PIN-код."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Докладніше"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Примітка. Відбиток пальця може бути менш надійним, ніж ключ чи PIN-код. "<annotation id="url">"Докладніше"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Скасувати"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Далі"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функції захисту пристрою не буде активовано. Інші люди зможуть користуватися цим планшетом, якщо його буде загублено, викрадено чи очищено."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде втрачено, викрадено чи очищено."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде втрачено, викрадено чи очищено."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим планшетом, якщо його буде загублено чи викрадено."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде загублено чи викрадено."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде загублено чи викрадено."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Пропустити"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайдіть датчик"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Знайдіть датчик цифрових відбитків на задній панелі телефона."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Розташування датчика цифрових відбитків на пристрої"</string>
@@ -373,6 +379,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Можна додати максимум стільки відбитків: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Видалити всі відбитки пальців?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Ви не зможете розблоковувати телефон, дозволяти покупки чи входити в додатки за допомогою відбитків пальців."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -410,7 +418,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Захистіть свій пристрій"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Як розблоковувати пристрій відбитком пальця"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокування екрана"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Виберіть спосіб розблокування екрана"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Захистіть свій телефон"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Відбиток пальця може бути менш надійним, ніж ключ, PIN-код чи пароль. Налаштуйте резервне блокування екрана, щоб надійно захистити пристрій."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Активуйте функції захисту планшета, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Активуйте функції захисту пристрою, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Активуйте функції захисту телефона, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Виберіть резервний спосіб блокування екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокування екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змінити блокув. екрана"</string>
@@ -426,6 +438,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Рівень захисту від середнього до високого"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Високий рівень захисту"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Не зараз"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Поточне блокування екрана"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Відбиток пальця + ключ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Відбиток пальця + PIN-код"</string>
@@ -478,7 +491,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль має складатися з мінімум %d символів"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код має складатися принаймні зі стількох цифр: %d"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Коли закінчите, торкніться опції \"Продовжити\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продовжити"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Максимальна кількість символів у паролі: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Максимальна кількість цифр у PIN-коді: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -720,13 +732,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(без змін)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Виберіть"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(додано кілька сертифікатів)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Використовувати сертифікати системи"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не надавати"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не перевіряти"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертифікат не вказано. З’єднання не буде конфіденційним."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Укажіть домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введіть пароль своєї мережі"</string>
@@ -904,8 +914,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Активація екрана"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Активувати екран, коли користувач бере пристрій або коли надходять сповіщення"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Збільшуйте або зменшуйте текст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налашт. блокув. SIM-карти"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Налаштувати блокування"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блокування SIM-карти"</string>
@@ -1610,21 +1619,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Спеціальні можливості"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налаштування доступності"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Параметри, пов’язані із зором"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Служби"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Програма зчитування з екрана для людей, які не бачать або мають слабкий зір"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Екран"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Субтитри"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Жест збільшення"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Тричі торкніться, щоб збільшити"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Щоб збільшити або зменшити вміст, тричі торкніться екрана одним пальцем.\n\nЗбільшений вміст можна:\n"<ul>\n<li>"прокручувати – проведіть принаймні двома пальцями по екрану;"</li>\n<li>"масштабувати – стисніть або розведіть принаймні два пальці."</li></ul>\n\n"Щоб тимчасово збільшити елемент, тричі торкніться й утримуйте його. Не відпускаючи, пересувайте палець, щоб переміщатися по екрану. Підніміть палець, щоб знову зменшити елемент.\n\nПримітка. Жест збільшення працює всюди, крім клавіатури та панелі навігації."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Ярлик доступності"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Увімкнути"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Вимк."</string>
@@ -1970,15 +1974,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Автоматично завантажуйте дані з пристроїв (як-от паролі Wi-Fi та історію дзвінків) і додатків (як-от налаштування та збережені файли). Це можна робити віддалено.\n\nКоли ви вмикаєте автозавантаження, дані з пристроїв і додатків віддалено зберігаються через певні проміжки часу. Дані додатків – це будь-яка інформація, яку вони зберігають (залежно від налаштувань розробника), зокрема такі конфіденційні дані, як контакти, повідомлення та фотографії."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налашт-ня адміністрації пристрою"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Адміністратор пристрою"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Деактивувати"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Видалити"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Вимкнути адміністратор пристрою"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Видалити додаток"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Вимкнути та видалити"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Адміністратори пристрою"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Немає доступн. адміністраторів мережі"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Особисте"</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="6246742476064507965">"Віддалене керування пристроєм"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Активувати"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Увімкнути адміністратор пристрою"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Адміністратор пристрою"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Активація цього адміністратора дозволить додатку <xliff:g id="APP_NAME">%1$s</xliff:g> виконувати такі дії:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Цей адміністратор активний і дозволяє додатку <xliff:g id="APP_NAME">%1$s</xliff:g> виконувати такі операції:"</string>
@@ -2299,7 +2304,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Увімкнути телефонні дзвінки й SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Цей користувач матиме доступ до історії дзвінків і SMS"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Інформація про екстрену ситуацію"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Доступно під час екстреного набору номера на заблокованому екрані"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Будь-хто зможе набирати екстрений номер, не розблоковуючи телефон"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи для програм і вмісту"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Програми з обмеженнями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Розгорнути налаштув. програм"</string>
@@ -2621,22 +2626,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активувати режим \"Лише будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Вибрати опцію \"Завжди надсилати\""</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Блокувати, коли екран увімкнено"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Не виводити на екран сповіщення, для яких вибрано режим \"Не турбувати\""</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Блокувати, коли екран вимкнено"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Заборонити сповіщенням, для яких вибрано режим \"Не турбувати\", вмикати екран і світловий індикатор"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Вимкнено"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Коли екран увімкнено"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Коли екран вимкнено"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Коли екран увімкнено або вимкнено"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ввести PIN-код адміністратора"</string>
@@ -2883,13 +2880,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Додаток Камера відкриється, якщо двічі покрутити зап’ястям"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера: двічі натиснути кнопку живлення"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Швидко запускайте камеру, не розблоковуючи екран"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Розмір елементів"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Збільшуйте або зменшуйте елементи на екрані"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"щільність дисплея, масштаб екрана, масштабувати, масштабування"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Збільшуйте або зменшуйте всі елементи на екрані. Деякі додатки можуть переміститися."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Переглянути"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Зменшити"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Збільшити"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 8028646..96e8863 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"‏SD کارڈ ان ماؤنٹ کریں"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"‏USB اسٹوریج کو حذف کریں"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"‏SD کارڈ حذف کریں"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"اسکرین پر موجود متن کو چھوٹا یا بڑا کریں۔"</string>
     <string name="small_font" msgid="2295331917424072635">"چھوٹا"</string>
     <string name="medium_font" msgid="2068475425515133701">"متوسط"</string>
     <string name="large_font" msgid="599055175160971446">"بڑا"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"اپنا فون غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے بس فنگر پرنٹ سنسر کو ٹچ کریں۔\n\n لہذا کسی کے فنگر پرنٹس شامل کرتے وقت احتیاط برتیں - شامل کردہ کسی بھی فنگر پرنٹ سے یہ کام کئے جا سکتے ہیں۔"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"‏نوٹ: ایک طاقتور پیٹرن یا PIN کی نسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"مزید جانیں"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"‏نوٹ: ایک طاقتور پیٹرن یا PIN کی نسبت آپ کی فنگر پرنٹ شاید کم محفوظ ہو۔ "<annotation id="url">"مزید جانیں"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"منسوخ کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"جاری رکھیں"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب، چوری یا صاف کر دیے جانے کی صورت میں آپ دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب، چوری یا صاف کر دیے جانے کی صورت میں آپ دوسروں کو یہ آلہ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب، چوری یا صاف کر دیے جانے کی صورت میں آپ دوسروں کو یہ فون استعمال کرنے سے نہیں روک سکیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب یا چوری ہو جانے کی صورت میں آپ دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب یا چوری ہو جانے کی صورت میں آپ دوسروں کو یہ آلہ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب یا چوری ہو جانے کی صورت میں آپ دوسروں کو یہ فون استعمال کرنے سے نہیں روک سکیں گے۔"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"بہرحال نظر انداز کریں"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"پیچھے جائیں"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"سینسر تلاش کریں"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"اپنے فون کی پشت پر فنگر پرنٹ سینسر کا پتا لگائیں۔"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"آلہ اور فنگر پرنٹ سینسر کے مقام کا خاکہ"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"آپ <xliff:g id="COUNT">%d</xliff:g> تک فنگر پرنٹس کا اضافہ کر سکتے ہیں"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"تمام فنگر پرنٹس ہٹائیں؟"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"آپ اپنے فون کیلئے کو غیر مقفل کرنے، خریداریوں کی اجازت دینے، ایپس میں سائن ان ہونے کیلئے اپنے فنگر پرنٹس استعمال نہیں کر پائیں گے۔"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"اپنے آلہ کا تحفظ کریں"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"اپنے فنگر پرنٹ کے ساتھ غیر مقفل کریں"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"اسکرین لاک منتخب کریں"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"اسکرین قفل منتخب کریں"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"اپنے فون کا تحفظ کریں"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"‏ایک طاقتور پیٹرن، PIN یا پاسورڈ کی نسبت فنگر پرنٹ شاید کم محفوظ ہو۔ محفوظ رہنے کیلئے ایک بیک اپ مقفل اسکرین سیٹ اپ کریں۔"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ آلہ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ فون استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"اسکرین مقفل کرنے کا اپنا بیک اپ طریقہ کار منتخب کریں"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"اسکرین لاک"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"لاک اسکرین کو تبدیل کریں"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"اوسط سے ہائی سیکیورٹی"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"پاس ورڈ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ہائی سیکیورٹی"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ابھی نہیں"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"موجودہ اسکرین لاک"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"انگلی کا نشان + پیٹرن"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"‏انگلی کا نشان + PIN"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"غیر مقفل کرنے کا پاس ورڈ تبدیل کریں"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"‏پاس ورڈ کم از کم %d حروف کا ہونا چاہیے"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"‏PIN میں کم از کم ‎%d ہندسے ہونے ضروری ہیں"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"مکمل ہو جانے پر جاری رکھیں کو تھپتھپائیں"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"جاری رکھیں"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"پاس ورڈ میں <xliff:g id="NUMBER">%d</xliff:g> سے کم حروف ہونے ضروری ہیں۔"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"‏PIN میں <xliff:g id="NUMBER">%d</xliff:g> سے کم ہندسے ہونے ضروری ہیں۔"</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(غیر تبدیل شدہ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"براہ مہربانی منتخب کریں"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(ایک سے زیادہ سرٹیفکیٹ شامل ہو گئے)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"سسٹم سرٹیفکیٹس استعمال کریں"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"فراہم نہ کریں"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"توثیق نہ کریں"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"کوئی سرٹیفیکیٹ متعین نہیں کیا گیا۔ آپ کا کنکشن نجی نہیں ہو گا۔"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"کوئی ڈومین مختص کرنا لازمی ہے۔"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS دستیاب ہے"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS دستیاب ہے)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"اپنا نیٹ ورک پاس ورڈ درج کریں"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"ایمبی اینٹ ڈسپلے"</string>
     <string name="doze_summary" msgid="7128970177894383698">"آلہ کو اٹھانے یا اطلاعات موصول ہونے پر اسکرین کو آن کریں"</string>
     <string name="title_font_size" msgid="4405544325522105222">"فونٹ سائز"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"متن کو چھوٹا یا بڑا کریں"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏SIM کارڈ لاک کی ترتیبات"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"‏SIM کارڈ لاک کو ترتیب دیں"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"‏SIM کارڈ لاک"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibility"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"‏Accessibility ترتیبات"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"بصارتی ترتیبات"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"‏آپ اس آلہ کو اپنی ضروریات کے مطابق حسب ضرورت بنا سکتے ہیں۔ یہ accessibility خصوصیات بعد میں ترتیبات میں تبدیل ہو سکتی ہیں۔"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"سروسز"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"سکرین قاری بنیادی طور پر اندھے پن اور کم بصارت والے لوگوں کیلئے ہے"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"سسٹم"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"ڈسپلے"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"کیپشنز"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"میگنیفکیشن اشارے"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"زوم کرنے کیلئے 3 بار تھپتھپائیں"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"زوم ان اور آؤٹ کرنے کیلئے اسکرین کو 3 بار ایک انگلی سے تھپتھپائیں۔\n\nزوم ان ہونے پر آپ یہ کر سکتے ہیں: \n"<ul>\n<li>"سکرول: پوری اسکرین پر 2 یا مزید انگلیاں گھسیٹیں"</li>\n<li>"زوم کی سطح کو ایڈجسٹ کریں: 2 یا مزید انگلیوں کو ایک ساتھ سکیڑیں یا انہیں ایک دوسرے سے دور پھئلائیں"</li></ul>\n\n"عارضی طور پر زوم کرنے کیلئے، 3 بار تھپتھپائیں اور آخری تھپتھپاہٹ پر پکڑے رکھیں۔ اپنی انگلی کو نیچے دبائے ہوئے، اسکرین پر گھمانے کیلئے گھسیٹیں۔ واپس زوم آؤٹ کرنے کیلئے انگلی اٹھا لیں۔\n\nنوٹ: میگنیفیکیشن کا اشارہ کی بورڈ اور نیویگیشن بار کے علاوہ ہر جگہ کام کرتا ہے۔"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"‏Accessibility کا شارٹ کٹ"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"آن"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"آف"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"‏خودکار طریقے سے دور سے آلہ کے ڈیٹا (جیسے کہ Wi-Fi پاس ورڈز اور کال کی سرگزشت) اور ایپ ڈیٹا (جیسے کہ ایپس کی جانب سے اسٹور کردہ ترتیبات اور فائلز) کا بیک اپ لیں۔\n\nجب آپ خودکار بیک اپ آن کرتے ہیں تو آلہ اور ایپ کا ڈیٹا وقفہ وقفہ پر دور سے محفوظ کیا جاتا ہے۔ ممکنہ طور پر حساس ڈیٹا مثلاً رابطے، پیغامات اور تصاویر سمیت ایپ ڈیٹا کوئی بھی ایسا ڈیٹا ہو سکتا ہے جسے کسی ایپ نے (ڈیولپر ترتیبات کی بنیاد پر) محفوظ کیا ہو۔"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"آلہ کے نظم و نسق کی ترتیبات"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"آلہ کا منتظم"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"غیر فعال کریں"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"اَن انسٹال کریں"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"اس آلہ کے منتظم کو غیر فعال کریں"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ایپ کو اَن انسٹال کریں"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"غیر فعال اور ان انسٹال کریں"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"آلہ کے منتظمین"</string>
     <string name="no_device_admins" msgid="702695100241728775">"آلہ کا کوئی منتظم دستیاب نہيں ہے"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ذاتی"</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="6246742476064507965">"آلہ کا منتظم فعال کریں؟"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"فعال کریں"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"اس آلہ کے منتظم کو فعال کریں"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"آلہ کا منتظم"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"اس منتظم کو فعال کرنے سے <xliff:g id="APP_NAME">%1$s</xliff:g> ایپ کو مندرجہ ذيل اعمال انجام دینے کی اجازت مل جائے گی:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"یہ منتظم فعال ہے اور <xliff:g id="APP_NAME">%1$s</xliff:g> ایپ کو مندرجہ ذیل اعمال انجام دینے کی اجازت دیتا ہے:"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"‏فون کالز اور SMS آن کریں؟"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"‏کال اور SMS کی سرگزشت کا اس صارف کے ساتھ اشتراک کیا جائے گا۔"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ہنگامی معلومات"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"ہنگامی ڈائلر میں مقفل اسکرین کے ذریعے قابل رسائی"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"آپ کا فون غیر مقفل کیے بغیر ہنگامی ڈائلر سے کسی کیلئے بھی قابل رسائی ہے"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ایپس اور مواد کی اجازت دیں"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"پابندیوں والی ایپلیکیشنز"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ایپ کیلئے ترتیبات پھیلائیں"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> تک کیلئے صرف الارمز میں تبدیل کریں"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ہمیشہ مداخلت کریں میں تبدیل کریں"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"جب اسکرین آن ہو تو مسدود کریں"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\'ڈسٹرب نہ کریں\' کی جانب سے خاموش کردہ اطلاعات کو اسکرین پر جھانکنے یا ظاہر ہونے سے روکیں"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"جب اسکرین آف ہو تو مسدود کریں"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\'ڈسٹرب نہ کریں\' کی جانب سے خاموش کردہ اطلاعات کو اسکرین آن کرنے یا اطلاعی روشنی جھپکنے سے روکیں۔"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"آف"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"جب اسکرین آن ہو"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"جب اسکرین آف ہو"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"جب اسکرین آن یا آف ہو"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"‏منتظم کا PIN درج کریں"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"اپنی کلائی کو دو بار مروڑ کر کیمرا ایپ کھولیں"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"کیمرا کیلئے پاور بٹن دو بار دبائیں"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"اپنی اسکرین غیر مقفل کئے بغیر تیزی سے کیمرا کھولیں"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"ڈسپلے کا سائز"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"اسکرین پر موجود آئٹمز کو چھوٹا یا بڑا کریں"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ڈسپلے کثافت، اسکرین زوم، اسکیل، اسکیل کرنا"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"اسکرین پر موجود آئٹمز کو چھوٹا یا بڑا کریں۔ آپ کی اسکرین پر موجود کچھ اہپس پوزیشن تبدیل کر سکتی ہیں۔"</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"پیش منظر"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"چھوٹا کریں"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"بڑا کریں"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 5814239..4fa1aab 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD kartani uzish"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB xotirani tozalash"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD-kartani tozalash"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"Ekrandagi matnni kichiklashtiring yoki kattalashtiring."</string>
     <string name="small_font" msgid="2295331917424072635">"Kichik"</string>
     <string name="medium_font" msgid="2068475425515133701">"O‘rtacha"</string>
     <string name="large_font" msgid="599055175160971446">"Katta"</string>
@@ -332,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Barmoq izi skaneri"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Telefonni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. \n\n Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun ehtiyot bo‘lib foydalaning."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Eslatma: Barmoq izining himoya darajasi chizmali kalit yoki PIN-kodnikidek emas."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Batafsil ma’lumot"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Eslatma: Barmoq izining himoya darajasi chizmali kalit yoki PIN kodnikidek emas. "<annotation id="url">"Batafsil ma’lumot"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Bekor qilish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davom etish"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Qurilmani himoyalash funksiyalari faollashmaydi. Agar planshetingiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Qurilmani himoyalash funksiyalari faollashtirilmaydi. Agar qurilmangiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Qurilmani himoyalash funksiyalari faollashtirilmaydi. Agar telefoningiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Qurilmani himoyalash funksiyasi faollashmaydi. Agar planshetingiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Qurilmani himoyalash funksiyasi faollashmaydi. Agar qurilmangiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Qurilmani himoyalash funksiyasi faollashmaydi. Agar telefoningiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"OK"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Orqaga"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Skanerni toping"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefoningiz orqasidagi barmoq izi skanerini toping."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ushbu rasmda barmoq izi skaneri qayerda joylashgani ko‘rsatilgan"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Ko’pi bilan <xliff:g id="COUNT">%d</xliff:g> ta barmoq izi qo’shish mumkin"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Barmoq izlari olib tashlansinmi?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchhun barmoq izingizdan foydalana olmay qolasiz."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ha, olib tashlansin"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Davom etish uchun barmoq izingizdan foydalaning."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Shifrlash"</string>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Qurilmangizni himoyalang"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Barmoq izi bilan qulfni oching"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran qulfini tanlang"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Ekran qulfini tanlang"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Telefoningizni himoyalang"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Barmoq izining himoya darajasi murakkab chizmali kalit, PIN kod yoki parolga qaraganda uchalik xavfsiz emas. Xavfsizlikni ta’minlash uchun zaxira ekran qulfini sozlang."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu planshetdan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu qurilmadan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu telefondan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Ekran qulfi uchun muqobil usulni tanlang"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran qulfi"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekran qulfini o‘zgartirish"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"O‘rtachadan yuqoriga darajasidagi xavfsizlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parol"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yuqori darajadagi xavfsizlik"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Hozir emas"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Joriy ekran qulfi"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Barmoq izi + chizmali kalit"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Barmoq izi + PIN kod"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Qulfni ochish parolini o‘zgartirish"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parol kamida %d ta belgidan iborat bo‘lishi lozim"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-kod kamida %d ta raqamdan iborat bo‘lishi lozim"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Tayyor bo‘lgach, “Davom etish” tugmasini bosing"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Davom etish"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parol <xliff:g id="NUMBER">%d</xliff:g> belgidan qisqaroq bo‘lishi lozim."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN kodi <xliff:g id="NUMBER">%d</xliff:g> raqamdan qisqaroq bo‘lishi lozim."</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(o‘zgartirilmagan)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Tanlang"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Bir nechta sertifikatlar qo‘shildi)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Tizim sertifikatlaridan foydalanish"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Taklif etilmasin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Tasdiqlanmasin"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Birorta ham sertifikat ko‘rsatilmagan. Aloqangiz ochiq bo‘ladi."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domenni ko‘rsating."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS mavjud"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Tarmoqqa ulanish uchun parolni kiriting"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Tashqi ekran"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Qurilmani qo‘limga olsam yoki bildirishnoma kelsa, ekran uyqu rejimidan chiqarilsin"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Matnni kichiklashtiring yoki kattalashtiring"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kartaga qulf o‘rnatish"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kartani qulflash"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Maxsus imkoniyatlar"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Qulayliklar sozlamalari"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ko‘rish sozlamalari"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"Bu qurilmani o‘zingizga moslab olishingiz mumkin. Mazkur qulayliklar xususiyatlarini keyinchalik “Sozlamalar” orqali o‘zgartirish mumkin."</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Xizmatlar"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"Ko‘r va ko‘rish qobiliyati past odamlar uchun ekrandan o‘qish vositasi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Tizim"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Ekran"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Taglavhalar"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Kattalashtirish imo-ishoralari"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Kattalashtirish uchun 3 marta bosing"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"Kattalashtirish va kichiklashtirish uchun ekranni bitta barmoq bilan 3 marta bosing.\n\nKattalashtirilganda quyidagilarni bajarish mumkin:\n"<ul>\n<li>"Siljitish: bir nechta barmogingiz bilan suring"</li>\n<li>"Miqyos sozlamalari: Ekranga barmoqlaringizni tekkizib, ularni jipslashtiring yoki ajrating"</li></ul>\n\n"Vaqtinchalik kattalashtirish uchun ekranni 3 marta bosib, so‘nggisini ushlab turing. Bosib turgan holda ekran bo‘ylab suring. O‘z holatiga qaytarish uchun barmoqni qo‘yib yuboring.\n\nEslatma: Kattalashtirish imo-ishoralari navigatsiya paneli va klaviaturadan boshqa barcha joyda ishlaydi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Tezkor ishga tushirish"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Yoniq"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"O‘chiq"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Qurilmadagi ma’lumotlar (m-n, Wi-Fi parollari va qo‘ng‘iroqlar tarixi) va ilova ma’lumotlarining (m-n, sozlamalar va ilovalar tomonidan saqlangan fayllar) zaxira nusxasini avtomatik tarzda masofadan turib saqlang.\n\nAgar avtomatik zaxiralash funksiyasi yoqilsa, qurilma va ilova ma’lumotlarining zaxira nusxasi vaqti-vaqti bilan masofadan turib saqlab turiladi. Ilova ma’lumotlariga biror ilova tomonidan saqlangan har qanday ma’lumot (dasturchi sozlamalariga qarab), jumladan, kontakt, xabar va rasmlar kabi shaxsiy ma’lumotlar ham kiradi."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Qurilmani boshqarish sozlamalari"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Qurilma administratori"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"O‘chirib qo‘yish"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"O‘chirish"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Qurilma administratorini faolsizlashtirish"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Ilovani o‘chirish"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Faolsizlashtirish va o‘chirib tashlash"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Qurilma administratorlari"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Qurilma administratorlari mavjud emas"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Shaxsiy"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Ish"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Ishonchli agentlar mavjud emas"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Qurilma administratori faollashtirilsinmi?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Faollashtirish"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Qurilma administratorini faollashtirish"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Qurilma administratori"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"“<xliff:g id="APP_NAME">%1$s</xliff:g>” ilovasi quyidagi amallarni bajarishi mumkin:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Administrator faol va u <xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga quyidagilarni bajarish uchun ruxsat bergan:"</string>
@@ -1992,7 +1997,7 @@
     <string name="sync_failed" msgid="1696499856374109647">"Sinxronlanmadi"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinxronlash faol"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"Sinxronlash"</string>
-    <string name="sync_is_failing" msgid="1591561768344128377">"Hozirgi paytda sinx-lashda muammolar sezilmoqda. Ish xolati tez orada tiklanadi"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Ayni paytda sinxronizatsiyada xatolik mavjud. U tez orada ishlaydi."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Hisob qo‘shish"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"Ishchi profil hali mavjud emas"</string>
     <string name="work_mode_label" msgid="5794470908668593961">"Ish rejimi"</string>
@@ -2005,8 +2010,8 @@
     <string name="sync_automatically" msgid="1682730255435062059">"Sinxronlash"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinxronlash yoqilgan"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sinxronlash o‘chiq"</string>
-    <string name="sync_error" msgid="5060969083117872149">"Sinx-lashda xatolik"</string>
-    <string name="last_synced" msgid="4242919465367022234">"So‘nggi sinxronlanish: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Sinxronizatsiyada xato"</string>
+    <string name="last_synced" msgid="4242919465367022234">"So‘nggi sinxronizatsiya: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Sinxronlanmoqda…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Sozlamalarni zahiralash"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Mening sozlamalarimni zahiralash"</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefon qo‘ng‘iroqlari va SMS yoqilsinmi?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Qo‘ng‘iroq va SMS xabarlar tarixi ushbu foydalanuvchiga ham ko‘rinadi."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Favqulodda holatlar haqida ma’lumot"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Favqulodda tergichda ekran qulfi orqali foydalanish mumkin"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Telefonni qulfdan chiqarmasdan turib favqulodda raqam tergichdan hamma foydalanishi mumkin"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Ilovalar va kontentga ruxsat berish"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Cheklovlar o‘rnatilgan ilovalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ilovalar uchun sozlamalarni kengaytirish"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ushbu vaqtgacha faqat uyg‘otkich signallari yoniq qolsin: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Har doim bezovta qilinaversin"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Ekran yoniq bo‘lganda bloklash"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"“Bezovta qilinmasin” rejimi orqali bildirishnomalar o‘chirib qo‘yilganda ular ekranda qalqib chiqmasin"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Ekran o‘chiq bo‘lganda bloklash"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"“Bezovta qilinmasin” rejimi orqali bildirishnomalar o‘chirib qo‘yilganda ekran va bildirishnomalar uchun yoritkichli indikator yoqilmasin"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"O‘chiq"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Agar ekran yoniq bo‘lsa"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Agar ekran o‘chiq bo‘lsa"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Agar ekran yoniq yoki o‘chiq bo‘lsa"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida fikr-mulohaza"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administrator PIN kodini kiriting"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera ilovasini ochish uchun bilagingizni ikki marta buking"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Quvvat tugmasini ikki marta bosish bilan kamerani ochish"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ekran qulfini ochmasdan kamerani tezroq ishga tushirish"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Ekran o‘lchami"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Ekrandagi elementlarni kichiklashtiring yoki kattalashtiring"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ekran, zichlik, ekran, ko‘lam, miqyos, oshirish"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Ekrandagi elementlarni kichiklashtiring yoki kattalashtiring. Bosh ekrandagi bir qancha ilovalar joylashuvi o‘zgarishi mumkin."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Oldindan ko‘rish"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Kichiklashtirish"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Kattalashtirish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 074367a..7670909 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Mở khóa bằng vân tay"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Chỉ cần chạm vào cảm biến vân tay để mở khóa điện thoại của bạn, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. \n\n Hãy thận trọng với vân tay của người mà bạn thêm - mọi vân tay đã thêm đều có thể thực hiện những việc này."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Lưu ý: Vân tay của bạn kém an toàn hơn so với việc dùng hình hoặc mã PIN mạnh."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Tìm hiểu thêm"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Lưu ý: Vân tay của bạn có thể kém an toàn hơn so với hình hoặc mã PIN khó đoán. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Hủy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tiếp tục"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này nếu máy bị mất, bị đánh cặp hoặc bị xóa sạch."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng thiết bị này nếu thiết bị bị mất, đánh cắp hoặc xóa sạch."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng điện thoại này nếu điện thoại bị mất, đánh cắp hoặc xóa sạch."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này trong trường hợp máy tính bảng bị mất hoặc bị đánh cắp."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn những người khác sử dụng thiết bị này trong trường hợp thiết bị bị mất hoặc bị đánh cắp."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn những người khác sử dụng điện thoại này trong trường hợp điện thoại bị mất hoặc bị đánh cắp."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Vẫn bỏ qua"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Quay lại"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tìm cảm biến"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tìm cảm biến vân tay trên mặt sau điện thoại của bạn."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Hình minh họa với vị trí cảm biến vân tay và thiết bị"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Bạn có thể thêm tối đa <xliff:g id="COUNT">%d</xliff:g> tệp tham chiếu"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Xóa tất cả dấu vân tay?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Bạn sẽ không thể sử dụng dấu vân tay để mở khóa điện thoại của mình, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng bằng dấu vân tay đó."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Có, xóa"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Sử dụng dấu vân tay của bạn để tiếp tục."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Mã hóa"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Bảo vệ thiết bị của bạn"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Mở khóa bằng vân tay của bạn"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chọn khóa màn hình"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Chọn khóa màn hình"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Bảo vệ điện thoại của bạn"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Vân tay có thể kém an toàn hơn so với hình, mã PIN hoặc mật khẩu khó đoán. Thiết lập màn hình khóa dự phòng để đảm bảo an toàn."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Ngăn người khác sử dụng máy tính bảng này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Chọn phương pháp khóa màn hình sao lưu của bạn"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Khóa màn hình"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Thay đổi màn hình khóa"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Mức độ bảo mật từ trung bình đến cao"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mật khẩu"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Mức độ bảo mật cao"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Để sau"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Khóa màn hình hiện tại"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Vân tay + Hình mở khóa"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Vân tay + Mã PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Mật khẩu phải có ít nhất %d ký tự"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Mã PIN phải có ít nhất %d chữ số"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Nhấn Tiếp tục khi hoàn tất"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tiếp tục"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Mật khẩu phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> ký tự."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Mã pin phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> chữ số."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(không thay đổi)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Vui lòng chọn"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Đã thêm nhiều chứng chỉ)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Sử dụng chứng chỉ hệ thống"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Không cung cấp"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Không xác thực"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Không có chứng chỉ nào được chỉ định. Kết nối của bạn sẽ không phải là riêng tư."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Phải chỉ định một miền."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Nhập mật khẩu mạng của bạn"</string>
@@ -1931,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Tự động sao lưu từ xa dữ liệu của thiết bị (chẳng hạn như mật khẩu Wi-Fi và lịch sử cuộc gọi) cũng như dữ liệu ứng dụng (chẳng hạn như các cài đặt và các tệp được ứng dụng lưu trữ).\n\nKhi bạn bật tính năng sao lưu tự động, dữ liệu ứng dụng và thiết bị được lưu từ xa theo định kỳ. Dữ liệu ứng dụng có thể là bất kỳ dữ liệu nào mà ứng dụng đã lưu (dựa trên cài đặt của nhà phát triển), bao gồm dữ liệu nhạy cảm có thể có như danh bạ, tin nhắn và ảnh."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Quản lý thiết bị"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Quản trị viên thiết bị"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Hủy kích hoạt"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Gỡ cài đặt"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Hủy kích hoạt quản trị viên thiết bị này"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Gỡ cài đặt ứng dụng"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Hủy kích hoạt và gỡ cài đặt"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Quản trị viên thiết bị"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Không có quản trị viên thiết bị"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Cá nhân"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Cơ quan"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Không có tác nhân đáng tin cậy nào"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Kích hoạt quản trị viên thiết bị?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Kích hoạt"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Kích hoạt quản trị viên thiết bị này"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Quản trị viên thiết bị"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Kích hoạt ứng dụng quản trị này sẽ cho phép ứng dụng <xliff:g id="APP_NAME">%1$s</xliff:g> thực hiện các thao tác dưới đây:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Ứng dụng quản trị này hoạt động và cho phép ứng dụng <xliff:g id="APP_NAME">%1$s</xliff:g> thực hiện các tác vụ sau:"</string>
@@ -2260,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Bạn muốn bật cuộc gọi điện thoại và SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Nhật ký cuộc gọi và tin nhắn SMS sẽ được chia sẻ với người dùng này."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Thông tin khẩn cấp"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Có thể truy cập qua màn hình khóa trong trình quay số khẩn cấp"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Bất cứ ai từ trình quay số khẩn cấp đều có thể truy cập được mà không cần mở khóa điện thoại của bạn"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Cho phép ứng dụng và nội dung"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Ứng dụng có hạn chế"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Mở rộng cài đặt cho ứng dụng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f7ea6c6..b0eef63 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -74,8 +74,7 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"卸载SD卡"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"格式化USB存储设备"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"格式化SD卡"</string>
-    <!-- no translation found for font_size_summary (1690992332887488183) -->
-    <skip />
+    <string name="font_size_summary" msgid="1690992332887488183">"缩小或放大屏幕上的文字。"</string>
     <string name="small_font" msgid="2295331917424072635">"小"</string>
     <string name="medium_font" msgid="2068475425515133701">"中"</string>
     <string name="large_font" msgid="599055175160971446">"大"</string>
@@ -332,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"只需触摸指纹传感器即可解锁您的手机，对购买交易进行授权或登录应用。\n\n添加的任何指纹都能够用来执行上述操作，因此请务必谨慎添加指纹。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"请注意：指纹识别的安全性不及安全系数高的图案或 PIN 码。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"了解详情"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"请注意：指纹识别的安全性可能不及安全系数高的图案或 PIN 码。"<annotation id="url">"了解详情"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"继续"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"系统将不会启用设备保护功能。如果您的平板电脑丢失、被盗，或者其中的数据遭到清空，您将无法防止他人使用此平板电脑。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"系统将不会启用设备保护功能。如果您的设备丢失、被盗，或者其中的数据遭到清空，您将无法防止他人使用此设备。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"系统将不会启用设备保护功能。如果您的手机丢失、被盗，或者其中的数据遭到清空，您将无法防止他人使用此手机。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"系统将不会启用设备保护功能。如果您的平板电脑丢失或被盗，您将无法防止他人使用此平板电脑。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"系统将不会启用设备保护功能。如果您的设备丢失或被盗，您将无法防止他人使用此设备。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"系统将不会启用设备保护功能。如果您的手机丢失或被盗，您将无法防止他人使用此手机。"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"仍然跳过"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"寻找传感器"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"您可以在手机背面找到指纹传感器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"关于设备和指纹传感器位置的图示说明"</string>
@@ -369,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"您最多可以添加 <xliff:g id="COUNT">%d</xliff:g> 个指纹"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"要移除所有指纹吗？"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"您将无法使用指纹来解锁手机、授权购买交易或登录应用。"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -406,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"保护您的设备"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"使用指纹解锁"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"选择屏幕锁定方式"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"为手机启用保护功能"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"指纹识别的安全性可能不及安全系数高的图案、PIN 码或密码。请设置备用屏幕锁定方式以确保安全。"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"启用设备保护功能可防止他人在未经您允许的情况下使用此平板电脑。请选择您要使用的屏幕锁定方式。"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"启用设备保护功能可防止他人在未经您允许的情况下使用此设备。请选择您要使用的屏幕锁定方式。"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"启用设备保护功能可防止他人在未经您允许的情况下使用此手机。请选择您要使用的屏幕锁定方式。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"选择您的备用屏幕锁定方式"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定方式"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改屏幕锁定方式"</string>
@@ -422,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高安全性"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"以后再说"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"当前屏幕锁定设置"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"指纹 + 图案"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"指纹 + PIN 码"</string>
@@ -474,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"密码至少应包含%d个字符"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN码至少应为%d位"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"完成后请点按“继续”"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密码必须少于<xliff:g id="NUMBER">%d</xliff:g>个字符。"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN码必须少于<xliff:g id="NUMBER">%d</xliff:g>位数。"</string>
@@ -704,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"（未更改）"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"请选择"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"（已添加多份证书）"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"使用系统证书"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"不验证"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"未指定任何证书。您的网络连接将不是私密连接。"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"必须指定网域。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"请输入您的网络密码"</string>
@@ -888,8 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"主动显示"</string>
     <string name="doze_summary" msgid="7128970177894383698">"拿起设备或收到通知时唤醒屏幕"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
-    <!-- no translation found for short_summary_font_size (6819778801232989076) -->
-    <skip />
+    <string name="short_summary_font_size" msgid="6819778801232989076">"放大或缩小文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM卡锁定设置"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置SIM卡锁定方式"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM卡锁定方式"</string>
@@ -1590,21 +1599,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"无障碍"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"无障碍设置"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"视力设置"</string>
-    <!-- no translation found for vision_settings_description (5679491180156408260) -->
-    <skip />
+    <string name="vision_settings_description" msgid="5679491180156408260">"您可以根据自己的需求对此设备进行自定义。以后，您可以在“设置”中更改这些无障碍功能设置。"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"服务"</string>
     <string name="talkback_title" msgid="7912059827205988080">"话语提示"</string>
-    <!-- no translation found for talkback_summary (8331244650729024963) -->
-    <skip />
+    <string name="talkback_summary" msgid="8331244650729024963">"屏幕阅读器主要适用于盲人和视力障碍人士"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"显示"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (9002237235486714636) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_short_summary (3411979839172752057) -->
-    <skip />
-    <!-- no translation found for accessibility_screen_magnification_summary (8274106658579514922) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"放大手势"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"点按三次即可缩放"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"使用单指在屏幕上点按三次即可进行缩放。\n\n放大后，您可以：\n"<ul>\n<li>"滚动：在屏幕上拖动双指或多指"</li>\n<li>"调整缩放级别：向内合拢或向外张开双指或多指"</li></ul>\n\n"要暂时性地放大，请点按三次并在最后一次点按时按住不放。按住手指时，拖动手指即可在屏幕上四处移动。松开手指即可缩小回之前的状态。\n\n请注意：放大手势功能适用于除键盘和导航栏以外的所有地方。"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"无障碍快捷方式"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"开启"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"关闭"</string>
@@ -1938,15 +1942,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"自动远程备份设备数据（例如 WLAN 密码和通话记录）和应用数据（例如应用存储的设置和文件）。\n\n启用自动备份功能后，系统会定期远程保存设备和应用数据。应用数据可以是应用根据开发者设置保存的任何数据，包括可能比较敏感的数据（例如通讯录、邮件和照片）。"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"设备管理设置"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"设备管理器"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"取消激活"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"卸载"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"取消激活此设备管理员"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"卸载应用"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"停用并卸载"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"设备管理器"</string>
     <string name="no_device_admins" msgid="702695100241728775">"没有可供显示的设备管理器"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"个人"</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="6246742476064507965">"要激活设备管理器吗？"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"激活"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"激活此设备管理员"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"设备管理器"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"激活此管理器可允许应用“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
     <string name="device_admin_status" msgid="4252975713178851910">"此管理器已激活，允许应用“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
@@ -2267,7 +2272,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"要开启通话和短信功能吗？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"将与此用户共享通话记录和短信记录。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"紧急信息"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"显示在锁定屏幕的紧急呼救拨号器中"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"任何人都可在紧急呼救拨号器中看到此信息，无需先将手机解锁"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
@@ -2583,22 +2588,14 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"更改为仅限闹钟（到<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>）"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"更改为一律允许打扰"</string>
-    <!-- no translation found for zen_mode_screen_on (7712038508173845101) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_summary (6444425984146305149) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off (5026854939192419879) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_summary (6490932947651798094) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_visual_interruptions (2851308980832487411) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_on_visual_interruptions (7373348148129140528) -->
-    <skip />
-    <!-- no translation found for zen_mode_screen_off_visual_interruptions (4850792880144382633) -->
-    <skip />
-    <!-- no translation found for zen_mode_no_visual_interruptions (8742776003822778472) -->
-    <skip />
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"屏幕开启时屏蔽"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"禁止在“请勿打扰”模式下被静音的通知在屏幕上短暂显示或弹出"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"屏幕关闭时屏蔽"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"禁止在“请勿打扰”模式下被静音的通知开启屏幕或让通知指示灯亮起"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"关闭"</string>
+    <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"屏幕开启时"</string>
+    <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"屏幕关闭时"</string>
+    <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"屏幕开启或关闭时"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
     <string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"输入管理员PIN码"</string>
@@ -2833,13 +2830,10 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"扭转手腕两次即可打开相机应用"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"按电源按钮两次即可打开相机"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"在不解锁屏幕的情况下快速打开相机"</string>
-    <!-- no translation found for screen_zoom_title (5233515303733473927) -->
-    <skip />
-    <!-- no translation found for screen_zoom_short_summary (7291960817349834688) -->
-    <skip />
+    <string name="screen_zoom_title" msgid="5233515303733473927">"显示大小"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"放大或缩小屏幕上的内容"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"显示密度, 屏幕缩放, 比例, 调整比例"</string>
-    <!-- no translation found for screen_zoom_summary (6445488991799015407) -->
-    <skip />
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"缩小或放大屏幕上的内容。屏幕上部分应用的位置可能会有变动。"</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"预览"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"缩小"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"放大"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0eac7be..09a469c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"只需輕觸指紋感應器，即可將手機解鎖、授權購物或登入應用程式。\n\n所有已加入手機的指紋均可執行這些操作，因此，加入指紋時必須加倍小心。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"注意：相比圖案或 PIN，指紋的安全性較低。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"瞭解詳情"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"請注意：相比高強度的上鎖圖案或 PIN，指紋識別的安全性較低。"<annotation id="url">"瞭解詳情"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"繼續"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"裝置保護功能將不會啟用。如果這部平板電腦遺失、被盜或被清空，您將無法阻止他人使用平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"裝置保護功能將不會啟用。如果這部裝置遺失、被盜或被清空，您將無法阻止他人使用裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"裝置保護功能將不會啟用。如果這部手機遺失、被盜或被清空，您將無法阻止他人使用手機。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"裝置保護功能將不會啟用。如果這部平板電腦遺失或被盜，您將無法阻止他人使用平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"裝置保護功能將不會啟用。如果這部裝置遺失或被盜，您將無法阻止他人使用裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"裝置保護功能將不會啟用。如果這部手機遺失或被盜，您將無法阻止他人使用手機。"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"仍要略過"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"尋找感應器"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"在您的手機背面可以找到指紋感應器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"裝置和指紋感應器位置圖示"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"你可以加入最多 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"確定移除所有指紋？"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"您將無法使用指紋為手機解鎖、授權購物或登入應用程式。"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"保護您的裝置"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"以指紋解鎖"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"選擇螢幕鎖定方式"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"保護您的手機"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"相比高強度的上鎖圖案、PIN 或密碼，指紋識別的安全性較低。請額外設定上鎖畫面以策安全。"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此平板電腦。請選擇您想使用的螢幕鎖定功能。"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此裝置。請選擇您想使用的螢幕鎖定功能。"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此手機。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"選擇您的後備螢幕鎖定方式"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改螢幕鎖定"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中至高等安全性設定"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密碼"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高等安全性設定"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"暫時不要"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"目前的螢幕鎖定"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"指紋 + 上鎖圖案"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"指紋 + PIN"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"密碼必須包含至少 %d 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN 碼不可少於 %d 位數"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"完成時請輕按 [繼續]"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密碼必須少於 <xliff:g id="NUMBER">%d</xliff:g> 個字元。"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 碼必須少於 <xliff:g id="NUMBER">%d</xliff:g> 個數字。"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"請選取"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(已新增多個憑證)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"使用系統憑證"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"不驗證"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"您未指定任何憑證，因此將無法設定私人連線。"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"必須指定網域。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"有 WPS 可供使用"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (有 WPS 可供使用)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網絡密碼"</string>
@@ -887,7 +898,7 @@
     <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
     <string name="doze_summary" msgid="7128970177894383698">"當您拿起裝置或收到通知時，喚醒螢幕"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
-    <string name="short_summary_font_size" msgid="6819778801232989076">"縮小或放大文字"</string>
+    <string name="short_summary_font_size" msgid="6819778801232989076">"放大或縮小文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"設定 SIM 卡鎖定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡鎖定"</string>
@@ -1589,16 +1600,16 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"無障礙設定"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"無障礙設定"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覺輔助設定"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"您可以根據個人需求自訂這個裝置，而您日後可以前往 [設定] 變更這些協助工具功能。"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"您可以按自己的需要自訂此裝置，稍後亦可在 [設定] 中變更這些無障礙功能。"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"服務"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"這是一種螢幕閱讀器，主要適用於視障和低視能人士"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"螢幕閱讀器主要為失明及低視力人士而設"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"顯示"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
-    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"放大畫面手勢"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"輕按三下即可縮放畫面"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"使用單指在螢幕上輕按三下即可縮放畫面。\n\n在放大畫面中，您可以執行下列操作：\n"<ul>\n<li>"捲動：使用兩指或多指在畫面上拖曳"</li>\n<li>"調整縮放等級：使用兩指或多指往內撥或往外撥"</li></ul>\n\n"如要暫時放大畫面，只要在螢幕上輕按三下並按住即可。按住時，使用手指拖曳可瀏覽畫面的不同部分。放開手指則可讓畫面恢復原先的狀態。\n\n注意：除了鍵盤與導覽列部分以外，其他地方均適用放大畫面手勢。"</string>
+    <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"放大手勢"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"輕按 3 次即可縮放畫面"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8274106658579514922">"用一隻手指在螢幕上輕按 3 次，即可縮放畫面。\n\n放大時，您可以：\n"<ul>\n<li>"捲動：用 2 隻或更多手指在螢幕上拖曳"</li>\n<li>"調整縮放等級：用 2 隻或更多手指向內收合或向外張開"</li></ul>\n\n"暫時放大：輕按 3 次並在最後一次按住。按住時，在螢幕上拖曳並移動手指即可放大。放開手指即可縮回原本大小。\n\n請注意：畫面上任何地方均可使用放大手勢 (鍵盤和導覽列除外)。"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"無障礙功能捷徑"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"開啟"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"關閉"</string>
@@ -1936,15 +1947,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"自動遙距備份裝置資料 (例如 Wi-Fi 密碼和通話記錄) 和應用程式資料 (例如由應用程式儲存的設定和檔案)。\n\n啟用自動備份功能後，裝置和應用程式資料會定時以遙距方式儲存。應用程式資料可以是由應用程式儲存的任何資料 (視乎開發設定而定)，包括可能視為敏感的資料，如通訊錄、訊息及相片。"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"裝置管理設定"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"裝置管理員"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"撤銷"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"解除安裝"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"停用此裝置管理員"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"解除安裝應用程式"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"停用並解除安裝"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"裝置管理員"</string>
     <string name="no_device_admins" msgid="702695100241728775">"沒有可用的裝置管理員"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"個人"</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="6246742476064507965">"啟動裝置管理員？"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"啟用"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"啟用此裝置管理員"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"裝置管理員"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"啟用此管理員將允許 <xliff:g id="APP_NAME">%1$s</xliff:g> 應用程式執行以下操作："</string>
     <string name="device_admin_status" msgid="4252975713178851910">"這個管理員正在作業中，且允許 <xliff:g id="APP_NAME">%1$s</xliff:g> 應用程式執行以下操作："</string>
@@ -2265,7 +2277,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"要開啟手機通話和短訊嗎？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"將與這位使用者共用通話和短訊記錄。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急資料"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"可透過上鎖畫面在緊急撥號器存取緊急資料"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"任何人都能透過緊急撥號器存取，無需先將手機解鎖"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受到限制的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
@@ -2582,9 +2594,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"響 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>前改為只允許鬧鐘"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為永遠允許干擾"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"螢幕開啟時封鎖"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"禁止「零打擾」模式設為靜音的通知在螢幕上短暫顯示或彈出"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"防止已透過「請勿騷擾」模式設為靜音的通知在螢幕上出現或彈出"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"螢幕關閉時封鎖"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"禁止「零打擾」模式設為靜音的通知開啟螢幕或使用指示燈號"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"防止已透過「請勿騷擾」模式設為靜音的通知開啟螢幕或令通知燈閃爍"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"關閉"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"螢幕開啟時"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"螢幕關閉時"</string>
@@ -2824,9 +2836,9 @@
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"按開關按鈕兩次即可開啟相機"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"快速開啟相機，無需解鎖螢幕"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"顯示大小"</string>
-    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"縮小或放大畫面上的項目"</string>
+    <string name="screen_zoom_short_summary" msgid="7291960817349834688">"放大或縮小畫面上的項目"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"顯示密度, 螢幕縮放, 比例, 按比例"</string>
-    <string name="screen_zoom_summary" msgid="6445488991799015407">"縮小或放大畫面上的項目。縮放完成後，畫面上某些應用程式的位置可能會有變動。"</string>
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"縮小或放大畫面上的項目。畫面上的部分應用程式可能會移位。"</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"預覽"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"縮小"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"放大"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2c192d4..3d5b3f7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -331,10 +331,17 @@
     <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_message" msgid="4747510337049957778">"輕觸指紋感應器即可將手機解鎖、授權購物交易或登入應用程式。\n\n您在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"瞭解詳情"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"<annotation id="url">"瞭解詳情"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"繼續"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，或是當中資料遭到清空，您將無法防止他人使用這台平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，或是當中資料遭到清空，您將無法防止他人使用這個裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，或是當中資料遭到清空，您將無法防止他人使用這支手機。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，您將無法防止他人使用這台平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，您將無法防止他人使用這個裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，您將無法防止他人使用這支手機。"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"略過"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"找出感應器"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"指紋感應器位於手機背面。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"裝置指紋感應器位置插圖"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"您最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"要移除所有指紋嗎？"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"您將無法使用指紋將手機解鎖、授權購物交易或登入應用程式。"</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <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>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"保護您的裝置"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"以指紋解鎖"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"選擇螢幕鎖定方式"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"保護您的手機"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"使用複雜的圖形、PIN 碼或密碼會比感應指紋來得安全。請額外設定螢幕鎖定方式以確保安全。"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這台平板電腦。請選擇您要使用的螢幕鎖定方式。"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這個裝置。請選擇您要使用的螢幕鎖定方式。"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這支手機。請選擇您要使用的螢幕鎖定方式。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"選擇您的備用螢幕鎖定方法"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"變更鎖定畫面"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性設定"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密碼"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高等安全性設定"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"暫時不要"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"目前的螢幕鎖定"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"指紋 + 解鎖圖形"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"指紋 + PIN 碼"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"密碼必須有至少 %d 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN 碼最少要有 %d 位數字"</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"完成時請輕按 [繼續]"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密碼必須少於 <xliff:g id="NUMBER">%d</xliff:g> 個字元。"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 最多只能有 <xliff:g id="NUMBER">%d</xliff:g> 個數字。"</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"請選取"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(已新增多個憑證)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"使用系統憑證"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"不進行驗證"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"您未指定任何憑證，因此無法為您設定私人連線。"</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"必須指定網域。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網路密碼"</string>
@@ -1935,15 +1946,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"在遠端自動備份裝置資料 (例如 Wi-Fi 密碼和通話紀錄) 以及應用程式資料 (例如應用程式所儲存的設定和檔案)。\n\n啟用自動備份功能後，系統會定期將裝置和應用程式資料儲存到遠端。應用程式資料泛指應用程式依據開發人員設定所儲存的任何資料，包括聯絡人、訊息和相片等可能具敏感性的資料。"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"裝置管理設定"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"裝置管理員"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"撤銷"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"解除安裝"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"停用這位裝置管理員"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"解除安裝應用程式"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"停用並解除安裝"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"裝置管理員"</string>
     <string name="no_device_admins" msgid="702695100241728775">"沒有可用的裝置管理員"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"個人"</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="6246742476064507965">"啟動裝置管理員？"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"啟用"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"啟用這位裝置管理員"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"裝置管理員"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"啟用這個管理員將允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式執行以下作業："</string>
     <string name="device_admin_status" msgid="4252975713178851910">"這個管理員正在作業中，且允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式執行以下作業："</string>
@@ -2264,7 +2276,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"開啟通話和簡訊功能？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話和簡訊紀錄將與這位使用者共用。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急資訊"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"可透過鎖定畫面的緊急撥號器存取"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"任何人都能透過緊急撥號器存取，不必先將手機解鎖"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限的應用程式"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5a5054d..df6ee31 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -331,10 +331,17 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Vula ngezigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="4747510337049957778">"Vele uthinte inzwa yezigxivizo zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, ungene ngemvume kuzinhlelo zokusebenza. \n\n Qaphela ukuthi wengeza izigxivizo zikabani - noma iziphi izigxivizo zeminwe zizokwazi ukwenza lezo zinto."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Yazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma iphinikhodi."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Funda kabanzi"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="1650783655974801525">"Yazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma iphinkhodi. "<annotation id="url">"Funda kabanzi"</annotation></string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Khansela"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Qhubeka"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le thebulethi uma lilahleka, lintshontshwa noma lisulwa"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Izici zokuvikela kwedivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le divayisi uma ngabe ilahleka, intshontshwa noma isulwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le foni uma ilahleka, intshontshwa noma isulwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le thebulethi uma ilahleka noma intshontshwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le divayisi uma ilahleka noma intshontshwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le foni uma ilahleka noma intshontshwa."</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Yeqa noma kunjalo"</string>
+    <string name="go_back_button_label" msgid="4745265266186209467">"Buyela emuva"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Thola inzwa"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Beka inzwa yezigxivizo zeminwe emuva kwefoni yakho."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ukuvezwa ngedivayisi ngendawo yenzwa yezigxivizo zeminwe"</string>
@@ -368,6 +375,8 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Ungangeza izigxivizo zeminwe ezingafika kwezingu-<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Susa zonke izigxivizo zeminwe?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Ngeke uze ukwazi ukusebenzisa izigxivizo zakho zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza ngazo."</string>
+    <!-- no translation found for fingerprint_last_delete_message_profile_challenge (8840100810725902159) -->
+    <skip />
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Yebo, susa"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Sebenzisa izigxivizo zakho zeminwe ukuze uqhubeke."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Ukubethelwa"</string>
@@ -405,7 +414,11 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Vikela idivayisi yakho"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Vula izigxivizo zakho zeminwe"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Khetha isivali sesikrini"</string>
-    <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Khetha ukukhiya isikrini"</string>
+    <string name="setup_lock_settings_picker_title" msgid="1572244299605153324">"Vikela ifoni yakho"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"Izigxivizo zeminwe zingavikeleka kancane kunephethini eqinile, iphinikhodi noma iphasiwedi. Setha isikri"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vimbela abanye kusukela ekusebenziseni le thebulethi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukusisebenzisa."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vimbela abanye kusukela ekusebenziseni le divayisi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vimbela abanye kusukela ekusebenziseni le foni ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Khetha indlela yokukhiya isikrini yakho yokwenza isipele"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Isikrini sivaliwe."</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Shintsha ukuvala isikrini"</string>
@@ -421,6 +434,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Ukuphepha okuphakathi nendawo kuya kokuphezulu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Iphasiwedi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Ukuphepha okuphezulu"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Hhayi manje"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Ukukhiya isikrini kwamanje"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Izigxivizo zeminwe + Iphethini"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Izigxivizo zeminwe + Iphinikhodi"</string>
@@ -473,7 +487,6 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Iphasiwedi kumele okungenani ibe nezinhlamvu ezingu-%d"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Iphinikhodi kumele okungenani ibe amadijithi angu-%d."</string>
-    <string name="lockpassword_press_continue" msgid="5382729689134968005">"Thepha oTap Continue when done"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Qhubeka"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Iphasiwedi kumele ibe ngaphansi ngezinhlamvu ezingu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"I-PIN kumele ibe ngaphansi ngamadijithi angu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -703,13 +716,11 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(akushintshiwe)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"Sicela ukhethe"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(Kungezwe izitifiketi eziningi)"</string>
-    <!-- no translation found for wifi_use_system_certs (5270879895056893783) -->
-    <skip />
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"Sebenzisa izitifiketi zesistimu"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Unganikezeli"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ungaqinisekisi"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Asikho isitifiketi esicacisiwe. Ukuxhumeka kwakho ngeke kube yimfihlo."</string>
-    <!-- no translation found for wifi_no_domain_warning (5223011964091727376) -->
-    <skip />
+    <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Kumele icacise isizinda."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Faka iphasiwedi yakho yenethiwekhi"</string>
@@ -1938,15 +1949,16 @@
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Yenza isipele ngokuzenzakalela idatha yedivayisi (efana namaphasiwedi we-Wi-Fi nomlando wokushaya) nedatha yohlelo lokusebenza (efana nezilungiselelo namafayela agcinwe yizinhlelo zokusebenza) ngokulawula kude.\n\nUma uvula isipele ngokuzenzakalela, idivayisi nedatha yohlelo lokusebenza ilondolozwa ngesikhathi ezithile ngesilawuli kude. Idatha yohlelo lokusebenza ingaba yinoma iyiphi idatha elondolozwe wuhlelo lokusebenza (kususelwa kuzilungiselelo zonjiniyela), efaka idatha enekhono lokuzwela njengoxhumana nabo, imilayezo, nezithombe."</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Izilungiselelo zomphathi wedivaysi"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Umphathi wedivaysi"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Ungenzi kusebenze"</string>
-    <string name="uninstall_device_admin" msgid="2019687470475335309">"Khipha"</string>
+    <string name="remove_device_admin" msgid="7736174723276745230">"Yenza kungasebenzi lo mlawuli wale divayisi"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"Khipha uhlelo lokusebenza"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Yenza kungasebenzi uphinde ukhiphe"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Abaphathi bedivaysi"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Abekho abaphathi bedivaysi abatholakalayo"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Okomuntu siqu"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Umsebenzi"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Abekho abenzeli bethemba abatholakalayo"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Yenza umphathi wedivaysi asebenze"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Yenza kusebenze"</string>
+    <string name="add_device_admin" msgid="1349673618141610506">"Yenza kusebenze umlawuli wale divayisi"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Umphathi wedivaysi"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Ukwenza lo mphathi asebenze kuzovumela uhlelo lokusebenza <xliff:g id="APP_NAME">%1$s</xliff:g> ukwenza imisebenzi elandelayo:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Lo mphathi uyasebenza futhi uvumela uhlelo lokusebenza <xliff:g id="APP_NAME">%1$s</xliff:g> ukwenza imisebenzi elandelayo."</string>
@@ -2267,7 +2279,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vula amakholi wefoni ne-SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Umlando wekholi ne-SMS uzokwabiwa nalo msebenzisi."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Ulwazi lwesimo esiphuthumayo"</string>
-    <string name="emergency_info_subtitle" msgid="1301492666470489605">"Iyafinyeleleka ngokukhiya isikrini kokokudayila kwesimo esiphuthumayo"</string>
+    <string name="emergency_info_subtitle" msgid="5588995926340277372">"Ifinyeleleka kunoma ubani kusukela kokokudayela okuphuthumayo ngaphandle kokuvula ifoni yakho"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Izinhlelo zokusebenza ezinomkhawulo"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Nweba izilungiselelo zohlelo lokusebenza"</string>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d94ff13..c6dd246 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -106,6 +106,16 @@
         <attr name="currentPageIndicatorColor" format="color" />
     </declare-styleable>
 
+    <!-- For ConversationMessageView -->
+    <declare-styleable name="ConversationMessageView">
+        <attr name="incoming" format="boolean" />
+        <attr name="messageText" format="reference" />
+        <attr name="timestampText" format="reference" />
+        <attr name="iconText" format="reference" />
+        <attr name="iconTextColor" format="reference|color" />
+        <attr name="iconBackgroundColor" format="reference|color" />
+    </declare-styleable>
+
     <attr name="switchBarTheme" format="reference" />
     <attr name="switchBarMarginStart" format="dimension" />
     <attr name="switchBarMarginEnd" format="dimension" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 90884c9..f27b693 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -111,7 +111,20 @@
     <color name="material_blue_500">#4285F4</color>
     <color name="material_blue_700">#3367D6</color>
 
+    <color name="message_text_incoming">#ffffffff</color>
+    <color name="message_text_outgoing">#ff323232</color>
+    <color name="timestamp_text_outgoing">#99323232</color>
+    <color name="timestamp_text_incoming">#99ffffff</color>
+    <color name="message_bubble_incoming">#689f38</color>
+    <color name="message_bubble_outgoing">#ffffffff</color>
+    <color name="conversation_background">#eeeeee</color>
+    <color name="message_icon_background_incoming">#689f38</color>
+    <color name="message_icon_text_incoming">#ffffffff</color>
+    <color name="message_icon_background_outgoing">#4285f4</color>
+    <color name="message_icon_text_outgoing">#ffffffff</color>
+
+    <color name="seek_bar_preference_preview_text">#fff</color>
     <!-- Black at 80% opacity -->
-    <color name="seek_bar_preference_preview_border_tint">#CC000000</color>
+    <color name="seek_bar_preference_preview_border_tint">#cc000000</color>
 
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 14aac55..53dd515 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -258,6 +258,18 @@
     <!-- Display, Screen zoom -->
     <dimen name="screen_zoom_preview_height">240dp</dimen>
     <dimen name="screen_zoom_preview_app_icon_width">88dp</dimen>
+    <dimen name="conversation_message_list_padding">10dp</dimen>
+    <dimen name="conversation_message_contact_icon_size">42dp</dimen>
+    <dimen name="conversation_message_contact_icon_text_size">32sp</dimen>
+    <dimen name="conversation_message_text_size">16sp</dimen>
+    <dimen name="conversation_status_text_size">12sp</dimen>
+    <dimen name="conversation_bubble_width_snap">20dp</dimen>
+    <dimen name="message_bubble_arrow_width">9dp</dimen>
+    <dimen name="message_padding_default">18dp</dimen>
+    <dimen name="message_text_left_right_padding">14dp</dimen>
+    <dimen name="message_text_top_padding">10dp</dimen>
+    <dimen name="message_text_bottom_padding">12dp</dimen>
+    <dimen name="message_metadata_top_padding">4dp</dimen>
 
     <!-- Accessibility Settings -->
     <dimen name="accessibility_layout_margin_start_end">24dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0e7ca62..a0a0c97 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -835,6 +835,7 @@
 
     <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
     <string name="fingerprint_last_delete_message">You won\'t be able to use your fingerprints to unlock your phone, authorize purchases, or sign in to apps with them.</string>
+    <string name="fingerprint_last_delete_message_profile_challenge">You won\'t be able to use your fingerprints to unlock your work profile, authorize purchases, or sign in to work apps.</string>
 
     <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
     <string name="fingerprint_last_delete_confirm">Yes, remove</string>
@@ -1129,15 +1130,27 @@
     <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
     <string name="unlock_change_lock_password_title">Change unlock password</string>
 
+    <!-- Message shown when the user incorrectly enters their lock and it counts towards the max attempts before wiping the work profile. -->
+    <string name="lock_profile_wipe_attempts">Try again. Attempt <xliff:g id="current_attempts">%1$d</xliff:g> of <xliff:g id="total_attempts">%2$d</xliff:g>.</string>
+    <!-- Title of a dialog shown when the user only has one attempt left to provide the lock before the work profile is wiped. -->
+    <string name="lock_profile_wipe_warning_title">Last try</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the work pattern before the work profile is wiped. -->
+    <string name="lock_profile_wipe_warning_content_pattern">If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device.</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the work PIN before the work profile is wiped. -->
+    <string name="lock_profile_wipe_warning_content_pin">If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device.</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the work password before the work profile is wiped. -->
+    <string name="lock_profile_wipe_warning_content_password">If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device.</string>
+    <!-- Content of the dialog shown when the user has failed to provide the work lock too many times and the work profile is wiped. -->
+    <string name="lock_profile_wipe_content">Too many incorrect attempts. Your work profile and associated data will be removed from this device.</string>
+    <!-- Button label to dismiss the dialog telling the user the work profile has been wiped. [CHAR LIMIT=40] -->
+    <string name="lock_profile_wipe_dismiss">Dismiss</string>
+
     <!-- Hint shown in dialog screen when password is too short -->
     <string name="lockpassword_password_too_short">Password must be at least %d characters</string>
     <!-- Hint shown in dialog screen when PIN is too short -->
     <string name="lockpassword_pin_too_short">PIN must be at least %d digits</string>
 
     <!-- Hint shown after minimum password criteria is met -->
-    <string name="lockpassword_press_continue">Tap Continue when done</string>
-
-    <!-- Hint shown after minimum password criteria is met -->
     <string name="lockpassword_continue_label">Continue</string>
 
     <!-- Error shown in popup when password is too long -->
@@ -2259,7 +2272,7 @@
     <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
     <string name="storage_settings" >Storage</string>
     <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
-    <string name="storage_usb_settings" >Storage &amp; USB</string>
+    <string name="storage_usb_settings" >Storage</string>
     <!-- Storage settings screen title -->
     <string name="storage_settings_title">Storage settings</string>
     <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
@@ -3135,13 +3148,13 @@
     <!-- Security & location settings screen, title when changing or confirming the work profile lock -->
     <string name="lock_settings_profile_screen_lock_title">Work profile screen lock</string>
     <!-- Security & location settings screen, setting option name to unify work and personal locks -->
-    <string name="lock_settings_profile_unification_title">Use same screenlock</string>
+    <string name="lock_settings_profile_unification_title">Use same screen lock</string>
     <!-- Security & location settings screen, setting option explanation to unify work and personal locks -->
     <string name="lock_settings_profile_unification_summary">Change primary profile to match work profile</string>
     <!-- Security & location settings screen, title of the dialog asking if the user wants to unify work and personal locks -->
-    <string name="lock_settings_profile_unification_dialog_title">Use the same screenlock?</string>
+    <string name="lock_settings_profile_unification_dialog_title">Use the same screen lock?</string>
     <!-- Security & location settings screen, explanation in the dialog asking if the user wants to unify work and personal locks -->
-    <string name="lock_settings_profile_unification_dialog_body">You can use this lock for your device but it will include all screenlock related policies set by your IT admin on the work profile.\nDo you want to use the same screen lock for your device?</string>
+    <string name="lock_settings_profile_unification_dialog_body">You can use this lock for your device but it will include all screen lock related policies set by your IT admin on the work profile.\nDo you want to use the same screen lock for your device?</string>
     <!-- Security & location settings screen, summary of the item that changes your work profile lock when it is unified with the personal lock -->
     <string name="lock_settings_profile_unified_summary">Same as your device lock</string>
 
@@ -3392,6 +3405,8 @@
     <string name="app_forward_locked">App is copy-protected.</string>
     <string name="invalid_location">Install location isn\u2019t valid.</string>
     <string name="system_package">System updates can\u2019t be installed on external media.</string>
+    <!-- Error message shown when trying to move device administrators to external disks, such as SD card [CHAR_LIMIT=none] -->
+    <string name="move_error_device_admin">Device Administrator can\u2019t be installed on external media.</string>
 
     <string name="force_stop_dlg_title">Force stop?</string>
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
@@ -4443,6 +4458,11 @@
         behalf.  It comes from the <xliff:g id="voice_input_service_app_name">%s</xliff:g>
         application.  Enable the use of this service?</string>
 
+    <!-- On main TTS Settings screen, in default settings section, reset speech rate for synthesized voice to 1x speech rate.-->
+    <string name="tts_reset_speech_rate_title">Reset speech rate</string>
+    <!-- On main TTS Settings screen, summary for reset speech rate for synthesized voice -->
+    <string name="tts_reset_speech_rate_summary">Reset the speed at which the text is spoken to normal.</string>
+
     <!-- Power Control Widget -->
     <string name="gadget_title">Power control</string>
     <string name="gadget_toggle_wifi">Updating Wi\u2011Fi setting</string>
@@ -5748,6 +5768,9 @@
     <!-- Sound: Dashboard summary. [CHAR LIMIT=100] -->
     <string name="sound_settings_summary">Ringer volume at <xliff:g id="percentage" example="2">%1$s</xliff:g></string>
 
+    <!-- Sound: Dashboard summary example used in Setup Wizard preview screen. [CHAR LIMIT=100] -->
+    <string name="sound_settings_example_summary">Ringer volume at 80%</string>
+
     <!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->
     <string name="media_volume_option_title">Media volume</string>
 
@@ -5903,12 +5926,6 @@
     <!-- Notification Settings: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
     <string name="app_notifications_title">Notifications</string>
 
-    <!-- Sound & notification > Notification section: Title for the option managing notifications per topic. [CHAR LIMIT=30] -->
-    <string name="topic_notifications_title">Topic notifications</string>
-
-    <!-- [CHAR LIMIT=100] Notification topic list header -->
-    <string name="notification_topic_categories">Categories</string>
-
     <!-- [CHAR LIMIT=100] Notification importance slider title -->
     <string name="notification_importance_title">Importance</string>
 
@@ -6096,6 +6113,12 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
     <string name="zen_mode_schedule_rule_days_all">Every day</string>
 
+    <!-- [CHAR LIMIT=60] Zen mode settings: Downtime rule setting -->
+    <string name="zen_mode_schedule_alarm_title">Alarm can override end time</string>
+
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Downtime rule setting -->
+    <string name="zen_mode_schedule_alarm_summary">Stop at the end time or next alarm, whichever comes first</string>
+
     <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
     <string name="summary_divider_text">,\u0020</string>
 
@@ -6378,9 +6401,7 @@
    <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
    <string name="notifications_enabled">Normal</string>
    <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
-   <string name="notifications_disabled">Fully Blocked</string>
-   <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
-   <string name="notifications_partially_disabled">Partially Blocked</string>
+   <string name="notifications_disabled">Blocked</string>
    <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
    <string name="notifications_two_items"><xliff:g id="notif_state" example="Priority">%1$s</xliff:g> / <xliff:g id="notif_state" example="Priority">%2$s</xliff:g></string>
    <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
@@ -6883,6 +6904,27 @@
          density in raw pixels per inch rather than using a relative description. [CHAR LIMIT=24] -->
     <string name="screen_zoom_summary_custom">Custom (<xliff:g id="densityDpi" example="160">%d</xliff:g>)</string>
 
+    <!-- Name Initial shown in the conversation message icon. [CHAR LIMIT=1] -->
+    <string name="screen_zoom_conversation_icon_alex">A</string>
+    <!-- Name Initial shown in the conversation message icon. [CHAR LIMIT=1] -->
+    <string name="screen_zoom_conversation_icon_pete">P</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_1">Hi Pete!</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_2">Hey, want to grab coffee and catch up today?</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_3">Sounds great. I know of a good place not too far from here.</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_4">Perfect!</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_1">Tue 6:00PM</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_2">Tue 6:01PM</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_3">Tue 6:02PM</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_4">Tue 6:03PM</string>
+
     <!-- Button to show all top-level settings items [CHAR LIMIT=20] -->
     <string name="see_all">See all</string>
     <!-- Button to show less top-level settings items [CHAR LIMIT=20] -->
@@ -6896,6 +6938,8 @@
 
     <!-- Summary of apps [CHAR LIMIT=NONE] -->
     <string name="apps_summary"><xliff:g id="count" example="24">%1$d</xliff:g> apps installed</string>
+    <!-- Example summary of apps used in Setup Wizard preview screen [CHAR LIMIT=NONE] -->
+    <string name="apps_summary_example">24 apps installed</string>
 
     <!-- Summary of storage usage [CHAR LIMIT=NONE] -->
     <string name="storage_summary"><xliff:g id="size1" example="8GB">%1$s</xliff:g> of <xliff:g id="size2" example="32GB">%2$s</xliff:g> used</string>
@@ -6929,17 +6973,17 @@
 
     <!-- TODO: Update these strings with the finalized ones. -->
     <!-- Title for dialog displayed when user clicks on a setting locked by an admin [CHAR LIMIT=30] -->
-    <string name="disabled_by_policy_title">Disabled by policy</string>
+    <string name="disabled_by_policy_title">Action not allowed</string>
     <!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
-    <string name="default_admin_support_msg">Disabled by your organisation\'s administrator.\nContact them to learn more.</string>
+    <string name="default_admin_support_msg">This action is disabled. Contact your organisation\'s administrator to learn more.</string>
     <!-- Shown in dialog to allow user to see more information about the device admin [CHAR LIMIT=30] -->
     <string name="admin_support_more_info">More details</string>
     <!-- Shown in admin details page to warn user about policies the admin can set in a work profile. [CHAR LIMIT=NONE] -->
-    <string name="admin_profile_owner_message">Your administrator has the ability to monitor and manage settings, corporate access, apps, permissions, and data associated with the profile, including network activity and your device\'s location information.</string>
+    <string name="admin_profile_owner_message">Your administrator can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity, and the device\'s location information.</string>
     <!-- Shown in admin details page to warn user about policies the admin can set on a user. [CHAR LIMIT=NONE] -->
-    <string name="admin_profile_owner_user_message">Your administrator has the ability to monitor and manage settings, corporate access, apps, permissions, and data associated with this user, including network activity and your device\'s location information.</string>
+    <string name="admin_profile_owner_user_message">Your administrator can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity, and the device\'s location information.</string>
     <!-- Shown in admin details page to warn user about policies the admin can set on a device. [CHAR LIMIT=NONE] -->
-    <string name="admin_device_owner_message">Your administrator has the ability to monitor and manage settings, corporate access, apps, permissions, and data associated with this device, including network activity and your device\'s location information.</string>
+    <string name="admin_device_owner_message">Your administrator can monitor and manage apps and data associated with this device, including settings, permissions, corporate access, network activity, and the device\'s location information.</string>
 
     <!-- Turn off a conditional state of the device (e.g. airplane mode, or hotspot) [CHAR LIMIT=30] -->
     <string name="condition_turn_off">Turn off</string>
@@ -7001,6 +7045,9 @@
     <!-- Toast message letting the user know the color temperature setting is not immediate -->
     <string name="color_temperature_toast">To apply color change, turn off screen</string>
 
+    <!-- Name of the setting to disable the automatic update -->
+    <string name="ota_disable_automatic_update">Automatic system updates</string>
+
     <!-- Label for category for data usage [CHAR LIMIT=30] -->
     <string name="usage">Usage</string>
 
@@ -7116,4 +7163,19 @@
     <!-- Title for suggestion adding more fingerprints [CHAR LIMIT=30] -->
     <string name="suggestion_additional_fingerprints">Additional Fingerprints</string>
 
+    <!-- Summary of battery saver when on [CHAR LIMIT=NONE] -->
+    <string name="battery_saver_on_summary">On / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string>
+
+    <!-- Summary of battery saver when off [CHAR LIMIT=NONE] -->
+    <string name="battery_saver_off_summary">Off / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string>
+
+    <!-- [CHAR_LIMIT=NONE] Battery saver: Description for automatic entry option: Never -->
+    <string name="battery_saver_desc_turn_on_auto_never">Never turn on automatically</string>
+
+    <!-- [CHAR_LIMIT=NONE] Battery saver: Description for automatic entry option: pct% battery -->
+    <string name="battery_saver_desc_turn_on_auto_pct">Turn on automatically at %1$s battery</string>
+
+    <!-- [CHAR_LIMIT=NONE] Label for when app is ignoring battery optimizations -->
+    <string name="not_battery_optimizing">Not using battery optimization</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a74d70b..70b5005 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -101,6 +101,10 @@
         <item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>
     </style>
 
+    <style name="EditTextPreference" parent="@*android:style/Preference.Material.DialogPreference.EditTextPreference">
+        <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
+    </style>
+
     <style name="PreferenceHeaderPanelSinglePane">
         <item name="android:layout_marginStart">0dp</item>
         <item name="android:layout_marginEnd">0dp</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 30c372b..a439322 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -102,12 +102,15 @@
 
     <style name="PreferenceTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="@android:preferenceStyle">@style/Preference</item>
+        <item name="@android:editTextPreferenceStyle">@style/EditTextPreference</item>
         <item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
         <item name="@android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
         <item name="apnPreferenceStyle">@style/ApnPreference</item>
     </style>
 
     <style name="PreferenceTheme.SetupWizard">
+        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
         <item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
     </style>
 
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index b98c6b2..1a2584a 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -18,7 +18,6 @@
         android:title="@string/app_notifications_title"
         android:key="app_notification_settings">
 
-    <!-- Apps without topics -->
     <!-- Importance -->
     <com.android.settingslib.RestrictedPreference
             android:key="importance_title"
@@ -47,17 +46,4 @@
             android:summary="@string/app_notification_override_dnd_summary"
             android:order="6" />
 
-    <!-- Apps with topics -->
-    <!-- Block -->
-    <com.android.settingslib.RestrictedSwitchPreference
-            android:key="block"
-            android:title="@string/app_notification_block_title"
-            android:summary="@string/app_notification_block_summary"
-            android:order="7" />
-
-    <PreferenceCategory
-            android:key="categories"
-            android:title="@string/notification_topic_categories"
-            android:order="8" />
-
 </PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 3b3dafe..53ac1bb 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -85,10 +85,19 @@
         android:summary="%s" />
 
     <SwitchPreference
+        android:key="enable_webview_multiprocess"
+        android:title="@string/enable_webview_multiprocess"
+        android:summary="@string/enable_webview_multiprocess_desc" />
+
+    <SwitchPreference
         android:key="color_temperature"
         android:title="@string/color_temperature"
         android:summary="@string/color_temperature_desc" />
 
+    <SwitchPreference
+        android:key="ota_disable_automatic_update"
+        android:title="@string/ota_disable_automatic_update" />
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 
@@ -163,11 +172,6 @@
             android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
 
        <SwitchPreference
-            android:key="legacy_dhcp_client"
-            android:title="@string/legacy_dhcp_client"
-            android:summary="@string/legacy_dhcp_client_summary"/>
-
-       <SwitchPreference
             android:key="mobile_data_always_on"
             android:title="@string/mobile_data_always_on"
             android:summary="@string/mobile_data_always_on_summary"/>
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 3f39d47..1ae0a44 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -19,6 +19,10 @@
         android:title="@string/power_usage_summary_title"
         settings:keywords="@string/keywords_battery">
 
+        <com.android.settings.fuelgauge.BatterySaverPreference
+            android:title="@string/battery_saver"
+            android:fragment="com.android.settings.fuelgauge.BatterySaverSettings" />
+
         <com.android.settings.fuelgauge.BatteryHistoryPreference
             android:key="battery_history" />
 
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 6a6b548..8c66fe1 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -55,6 +55,7 @@
         android:key="network_reset"
         android:title="@string/reset_network_title"
         settings:keywords="@string/keywords_network_reset"
+        settings:userRestriction="no_network_reset"
         settings:useAdminDisabledSummary="true"
         android:fragment="com.android.settings.ResetNetwork" />
 
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index 071406b..b980f0a 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -31,6 +31,11 @@
             android:defaultValue="50"
             android:max="600" />
 
+        <Preference android:key="reset_speech_rate"
+            android:persistent="false"
+            android:title="@string/tts_reset_speech_rate_title"
+            android:summary="@string/tts_reset_speech_rate_summary" />
+
         <Preference android:key="tts_play_example"
             android:persistent="false"
             android:title="@string/tts_play_example_title"
diff --git a/res/xml/user_details_settings.xml b/res/xml/user_details_settings.xml
index 9bcc194..44ec064 100644
--- a/res/xml/user_details_settings.xml
+++ b/res/xml/user_details_settings.xml
@@ -23,6 +23,7 @@
     <com.android.settingslib.RestrictedPreference
             android:key="remove_user"
             android:title="@string/user_remove_user"
+            settings:userRestriction="no_remove_user"
             settings:useAdminDisabledSummary="true" />
 
 </PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 5944b3e..8d20f31 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -35,9 +35,9 @@
                 android:key="add_users_when_locked"
                 android:title="@string/user_add_on_lockscreen_menu"
                 android:summary="@string/user_add_on_lockscreen_menu_summary" />
-        <Preference
-            android:key="emergency_info"
-            android:title="@string/emergency_info_title"
-            android:summary="@string/emergency_info_subtitle"/>
     </PreferenceCategory>
+    <Preference
+        android:key="emergency_info"
+        android:title="@string/emergency_info_title"
+        android:summary="@string/emergency_info_subtitle"/>
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_schedule_rule_settings.xml b/res/xml/zen_mode_schedule_rule_settings.xml
index 80a9d66..6224ce1 100644
--- a/res/xml/zen_mode_schedule_rule_settings.xml
+++ b/res/xml/zen_mode_schedule_rule_settings.xml
@@ -32,6 +32,13 @@
 
     <!-- Start time/End time added and removed here! :-) -->
 
+    <!-- Exit DND mode with alarm -->
+    <SwitchPreference
+        android:key="exit_at_alarm"
+        android:title="@string/zen_mode_schedule_alarm_title"
+        android:summary="@string/zen_mode_schedule_alarm_summary"
+        android:order="99" />
+
     <!-- Zen mode -->
     <DropDownPreference
             android:key="zen_mode"
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index c0b6e00..102d6cc 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -21,7 +21,6 @@
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
@@ -40,15 +39,13 @@
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public class ApnEditor extends InstrumentedPreferenceActivity
-        implements SharedPreferences.OnSharedPreferenceChangeListener,
-                    Preference.OnPreferenceChangeListener {
+        implements Preference.OnPreferenceChangeListener {
 
     private final static String TAG = ApnEditor.class.getSimpleName();
 
@@ -250,6 +247,10 @@
 
         mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
 
+        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
+            getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
+        }
+
         fillUi();
     }
 
@@ -261,14 +262,10 @@
     @Override
     public void onResume() {
         super.onResume();
-        getPreferenceScreen().getSharedPreferences()
-                .registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
     public void onPause() {
-        getPreferenceScreen().getSharedPreferences()
-                .unregisterOnSharedPreferenceChangeListener(this);
         super.onPause();
     }
 
@@ -487,7 +484,7 @@
                 int index = Integer.parseInt((String) newValue);
                 mAuthType.setValueIndex(index);
 
-                String []values = mRes.getStringArray(R.array.apn_auth_entries);
+                String[] values = mRes.getStringArray(R.array.apn_auth_entries);
                 mAuthType.setSummary(values[index]);
             } catch (NumberFormatException e) {
                 return false;
@@ -521,6 +518,13 @@
             mMvnoType.setValue((String) newValue);
             mMvnoType.setSummary(mvno);
         }
+        if (preference.equals(mPassword)) {
+            preference.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
+        } else if (preference.equals(mCarrierEnabled) || preference.equals(mBearerMulti)) {
+            // do nothing
+        } else {
+            preference.setSummary(checkNull(newValue != null ? String.valueOf(newValue) : null));
+        }
 
         return true;
     }
@@ -765,16 +769,4 @@
         }
     }
 
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        Preference pref = findPreference(key);
-        if (pref != null) {
-            if (pref.equals(mPassword)){
-                pref.setSummary(starify(sharedPreferences.getString(key, "")));
-            } else if (pref.equals(mCarrierEnabled) || pref.equals(mBearerMulti)) {
-                // do nothing
-            } else {
-                pref.setSummary(checkNull(sharedPreferences.getString(key, "")));
-            }
-        }
-    }
 }
diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java
index c145381..6f83fbc 100644
--- a/src/com/android/settings/BandMode.java
+++ b/src/com/android/settings/BandMode.java
@@ -38,13 +38,27 @@
     private static final int EVENT_BAND_SCAN_COMPLETED = 100;
     private static final int EVENT_BAND_SELECTION_DONE = 200;
 
+    //Directly maps to RIL_RadioBandMode from ril.h
     private static final String[] BAND_NAMES = new String[] {
             "Automatic",
-            "EURO Band",
-            "USA Band",
-            "JAPAN Band",
-            "AUS Band",
-            "AUS2 Band"
+            "Europe",
+            "United States",
+            "Japan",
+            "Australia",
+            "Australia 2",
+            "Cellular 800",
+            "PCS",
+            "Class 3 (JTACS)",
+            "Class 4 (Korea-PCS)",
+            "Class 5",
+            "Class 6 (IMT2000)",
+            "Class 7 (700Mhz-Upper)",
+            "Class 8 (1800Mhz-Upper)",
+            "Class 9 (900Mhz)",
+            "Class 10 (800Mhz-Secondary)",
+            "Class 11 (Europe PAMR 400Mhz)",
+            "Class 15 (US-AWS)",
+            "Class 16 (US-2500Mhz)"
     };
 
     private ListView mBandList;
@@ -141,10 +155,16 @@
 
         if (result.result != null) {
             int bands[] = (int[])result.result;
+
+            if(bands.length == 0) {
+                Log.wtf(LOG_TAG, "No Supported Band Modes");
+                return;
+            }
+
             int size = bands[0];
 
             if (size > 0) {
-                for (int i=1; i<size; i++) {
+                for (int i=1; i<=size; i++) {
                     item = new BandListItem(bands[i]);
                     mBandListAdapter.add(item);
                     if (DBG) log("Add " + item.toString());
@@ -155,7 +175,7 @@
 
         if (addBandSuccess == false) {
             if (DBG) log("Error in query, add default list");
-            for (int i=0; i<Phone.BM_BOUNDARY; i++) {
+            for (int i=0; i<Phone.BM_NUM_BAND_MODES; i++) {
                 item = new BandListItem(i);
                 mBandListAdapter.add(item);
                 if (DBG) log("Add default " + item.toString());
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 2a8de8b..1376176 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -616,7 +616,7 @@
                         mHeaderText.setText(error);
                         setNextEnabled(false);
                     } else {
-                        mHeaderText.setText(R.string.lockpassword_press_continue);
+                        mHeaderText.setText(null);
                         setNextEnabled(true);
                     }
                 }
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index 40e3103..ad1d2eb 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -20,10 +20,13 @@
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.app.ActivityOptions;
+import android.app.AlertDialog;
 import android.app.IActivityManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.trust.TrustManager;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.graphics.Point;
@@ -31,7 +34,9 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,6 +45,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.fingerprint.FingerprintUiHelper;
 
 /**
@@ -65,6 +71,9 @@
     protected Button mCancelButton;
     protected ImageView mFingerprintIcon;
     protected int mEffectiveUserId;
+    protected LockPatternUtils mLockPatternUtils;
+    protected TextView mErrorTextView;
+    protected final Handler mHandler = new Handler();
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -74,6 +83,7 @@
         // Only take this argument into account if it belongs to the current profile.
         Intent intent = getActivity().getIntent();
         mEffectiveUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
+        mLockPatternUtils = new LockPatternUtils(getActivity());
     }
 
     @Override
@@ -109,6 +119,10 @@
         if (mAllowFpAuthentication) {
             mFingerprintHelper.startListening();
         }
+        if (isProfileChallenge()) {
+            updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
+                    mEffectiveUserId));
+        }
     }
 
     protected void setAccessibilityTitle(CharSequence suplementalText) {
@@ -200,4 +214,87 @@
                     screenSize.y));
         }
     }
+
+    protected boolean isProfileChallenge() {
+        return UserHandle.myUserId() != mEffectiveUserId;
+    }
+
+    protected void reportSuccessfullAttempt() {
+        if (isProfileChallenge()) {
+            mLockPatternUtils.reportSuccessfulPasswordAttempt(mEffectiveUserId);
+        }
+    }
+
+    protected void reportFailedAttempt() {
+        if (isProfileChallenge()) {
+            // + 1 for this attempt.
+            updateErrorMessage(
+                    mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1);
+            mLockPatternUtils.reportFailedPasswordAttempt(mEffectiveUserId);
+        }
+    }
+
+    protected void updateErrorMessage(int numAttempts) {
+        final int maxAttempts =
+                mLockPatternUtils.getMaximumFailedPasswordsForWipe(mEffectiveUserId);
+        if (maxAttempts > 0 && numAttempts > 0) {
+            int remainingAttempts = maxAttempts - numAttempts;
+            if (remainingAttempts == 1) {
+                // Last try
+                final String title = getActivity().getString(
+                        R.string.lock_profile_wipe_warning_title);
+                final String message = getActivity().getString(getLastTryErrorMessage());
+                showDialog(title, message, android.R.string.ok, false /* dismiss */);
+            } else if (remainingAttempts <= 0) {
+                // Profile is wiped
+                final String message = getActivity().getString(R.string.lock_profile_wipe_content);
+                showDialog(null, message, R.string.lock_profile_wipe_dismiss, true /* dismiss */);
+            }
+            if (mErrorTextView != null) {
+                final String message = getActivity().getString(R.string.lock_profile_wipe_attempts,
+                        numAttempts, maxAttempts);
+                showError(message, 0);
+            }
+        }
+    }
+
+    protected abstract int getLastTryErrorMessage();
+
+    private final Runnable mResetErrorRunnable = new Runnable() {
+        @Override
+        public void run() {
+            mErrorTextView.setText("");
+        }
+    };
+
+    protected void showError(CharSequence msg, long timeout) {
+        mErrorTextView.setText(msg);
+        onShowError();
+        mHandler.removeCallbacks(mResetErrorRunnable);
+        if (timeout != 0) {
+            mHandler.postDelayed(mResetErrorRunnable, timeout);
+        }
+    }
+
+    protected abstract void onShowError();
+
+    protected void showError(int msg, long timeout) {
+        showError(getText(msg), timeout);
+    }
+
+    private void showDialog(String title, String message, int buttonString, final boolean dismiss) {
+        final AlertDialog dialog = new AlertDialog.Builder(getActivity())
+            .setTitle(title)
+            .setMessage(message)
+            .setPositiveButton(buttonString, new OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (dismiss) {
+                        getActivity().finish();
+                    }
+                }
+            })
+            .create();
+        dialog.show();
+    }
 }
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 8f83221..c69bb89 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -20,11 +20,9 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentSender;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.os.Handler;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
@@ -84,14 +82,11 @@
         private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
         private TextView mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
-        private LockPatternUtils mLockPatternUtils;
         private AsyncTask<?, ?, ?> mPendingLockCheck;
         private CredentialCheckResultTracker mCredentialCheckResultTracker;
         private boolean mDisappearing = false;
         private TextView mHeaderTextView;
         private TextView mDetailsTextView;
-        private TextView mErrorTextView;
-        private Handler mHandler = new Handler();
         private CountDownTimer mCountdownTimer;
         private boolean mIsAlpha;
         private InputMethodManager mImm;
@@ -108,7 +103,6 @@
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            mLockPatternUtils = new LockPatternUtils(getActivity());
         }
 
         @Override
@@ -194,6 +188,12 @@
         }
 
         @Override
+        protected int getLastTryErrorMessage() {
+            return mIsAlpha ? R.string.lock_profile_wipe_warning_content_password
+                    : R.string.lock_profile_wipe_warning_content_pin;
+        }
+
+        @Override
         public void prepareEnterAnimation() {
             super.prepareEnterAnimation();
             mHeaderTextView.setAlpha(0f);
@@ -406,9 +406,12 @@
         }
 
         private void onPasswordChecked(boolean matched, Intent intent, int timeoutMs,
-                int effectiveUserId) {
+                int effectiveUserId, boolean newResult) {
             mPasswordEntryInputDisabler.setInputEnabled(true);
             if (matched) {
+                if (newResult) {
+                    reportSuccessfullAttempt();
+                }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
             } else {
@@ -417,15 +420,23 @@
                             effectiveUserId, timeoutMs);
                     handleAttemptLockout(deadline);
                 } else {
-                    showError(getErrorMessage());
+                    showError(getErrorMessage(), ERROR_MESSAGE_TIMEOUT);
+                }
+                if (newResult) {
+                    reportFailedAttempt();
                 }
             }
         }
 
         @Override
         public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
-                int effectiveUserId) {
-            onPasswordChecked(matched, intent, timeoutMs, effectiveUserId);
+                int effectiveUserId, boolean newResult) {
+            onPasswordChecked(matched, intent, timeoutMs, effectiveUserId, newResult);
+        }
+
+        @Override
+        protected void onShowError() {
+            mPasswordEntry.setText(null);
         }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
@@ -447,6 +458,10 @@
                 public void onFinish() {
                     resetState();
                     mErrorTextView.setText("");
+                    if (isProfileChallenge()) {
+                        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
+                                mEffectiveUserId));
+                    }
                 }
             }.start();
         }
@@ -464,29 +479,6 @@
             }
         }
 
-        private void showError(int msg) {
-            showError(msg, ERROR_MESSAGE_TIMEOUT);
-        }
-
-        private final Runnable mResetErrorRunnable = new Runnable() {
-            public void run() {
-                mErrorTextView.setText("");
-            }
-        };
-
-        private void showError(CharSequence msg, long timeout) {
-            mErrorTextView.setText(msg);
-            mPasswordEntry.setText(null);
-            mHandler.removeCallbacks(mResetErrorRunnable);
-            if (timeout != 0) {
-                mHandler.postDelayed(mResetErrorRunnable, timeout);
-            }
-        }
-
-        private void showError(int msg, long timeout) {
-            showError(getText(msg), timeout);
-        }
-
         // {@link OnEditorActionListener} methods.
         public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
             // Check if this was the result of hitting the enter or "done" key
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index d4b0902..dbe9ebe 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.IntentSender;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -85,7 +84,6 @@
         private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
 
         private LockPatternView mLockPatternView;
-        private LockPatternUtils mLockPatternUtils;
         private AsyncTask<?, ?, ?> mPendingLockCheck;
         private CredentialCheckResultTracker mCredentialCheckResultTracker;
         private boolean mDisappearing = false;
@@ -93,7 +91,6 @@
 
         private TextView mHeaderTextView;
         private TextView mDetailsTextView;
-        private TextView mErrorTextView;
         private View mLeftSpacerLandscape;
         private View mRightSpacerLandscape;
 
@@ -112,7 +109,6 @@
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            mLockPatternUtils = new LockPatternUtils(getActivity());
         }
 
         @Override
@@ -221,6 +217,10 @@
         }
 
         @Override
+        protected void onShowError() {
+        }
+
+        @Override
         public void prepareEnterAnimation() {
             super.prepareEnterAnimation();
             mHeaderTextView.setAlpha(0f);
@@ -284,6 +284,10 @@
                                 R.string.lockpassword_confirm_your_pattern_generic_profile);
                     }
                     mErrorTextView.setText("");
+                    if (isProfileChallenge()) {
+                        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
+                                mEffectiveUserId));
+                    }
 
                     mLockPatternView.setEnabled(true);
                     mLockPatternView.enableInput();
@@ -470,9 +474,12 @@
         };
 
         private void onPatternChecked(boolean matched, Intent intent, int timeoutMs,
-                int effectiveUserId) {
+                int effectiveUserId, boolean newResult) {
             mLockPatternView.setEnabled(true);
             if (matched) {
+                if (newResult) {
+                    reportSuccessfullAttempt();
+                }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
             } else {
@@ -484,13 +491,21 @@
                     updateStage(Stage.NeedToUnlockWrong);
                     postClearPatternRunnable();
                 }
+                if (newResult) {
+                    reportFailedAttempt();
+                }
             }
         }
 
         @Override
         public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
-                int effectiveUserId) {
-            onPatternChecked(matched, intent, timeoutMs, effectiveUserId);
+                int effectiveUserId, boolean newResult) {
+            onPatternChecked(matched, intent, timeoutMs, effectiveUserId, newResult);
+        }
+
+        @Override
+        protected int getLastTryErrorMessage() {
+            return R.string.lock_profile_wipe_warning_content_pattern;
         }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
diff --git a/src/com/android/settings/CredentialCheckResultTracker.java b/src/com/android/settings/CredentialCheckResultTracker.java
index 5c55073..179a93c 100644
--- a/src/com/android/settings/CredentialCheckResultTracker.java
+++ b/src/com/android/settings/CredentialCheckResultTracker.java
@@ -47,7 +47,7 @@
         mListener = listener;
         if (mListener != null && mHasResult) {
             mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
-                    mResultEffectiveUserId);
+                    mResultEffectiveUserId, false /* newResult */);
         }
     }
 
@@ -60,7 +60,7 @@
         mHasResult = true;
         if (mListener != null) {
             mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
-                    mResultEffectiveUserId);
+                    mResultEffectiveUserId, true /* newResult */);
         }
     }
 
@@ -74,6 +74,6 @@
 
     interface Listener {
         public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
-                int effectiveUserId);
+                int effectiveUserId, boolean newResult);
     }
 }
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index a67ef72..90c1d38 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -19,9 +19,10 @@
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.Dialog;
 import android.app.TimePickerDialog;
-import android.app.admin.DevicePolicyManager;
+import android.app.TimePickerDialog.OnTimeSetListener;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -33,10 +34,10 @@
 import android.provider.Settings.SettingNotFoundException;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.text.format.DateFormat;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
-
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settingslib.RestrictedLockUtils;
@@ -49,8 +50,7 @@
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 public class DateTimeSettings extends SettingsPreferenceFragment
-        implements OnSharedPreferenceChangeListener,
-                TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
+        implements OnTimeSetListener, OnDateSetListener, OnPreferenceChangeListener {
 
     private static final String HOURS_12 = "12";
     private static final String HOURS_24 = "24";
@@ -94,6 +94,7 @@
         boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE);
 
         mAutoTimePref = (RestrictedSwitchPreference) findPreference(KEY_AUTO_TIME);
+        mAutoTimePref.setOnPreferenceChangeListener(this);
         EnforcedAdmin admin = RestrictedLockUtils.checkIfAutoTimeRequired(getActivity());
         mAutoTimePref.setDisabledByAdmin(admin);
 
@@ -106,6 +107,7 @@
         // Settings.Global.AUTO_TIME to true. Note that this app listens to that change.
         mAutoTimePref.setChecked(autoTimeEnabled);
         mAutoTimeZonePref = (SwitchPreference) findPreference(KEY_AUTO_TIME_ZONE);
+        mAutoTimeZonePref.setOnPreferenceChangeListener(this);
         // Override auto-timezone if it's a wifi-only device or if we're still in setup wizard.
         // TODO: Remove the wifiOnly test when auto-timezone is implemented based on wifi-location.
         if (Utils.isWifiOnly(getActivity()) || isFirstRun) {
@@ -131,9 +133,6 @@
     public void onResume() {
         super.onResume();
 
-        getPreferenceScreen().getSharedPreferences()
-                .registerOnSharedPreferenceChangeListener(this);
-
         ((SwitchPreference)mTime24Pref).setChecked(is24Hour());
 
         // Register for time ticks and other reasons for time change
@@ -150,8 +149,6 @@
     public void onPause() {
         super.onPause();
         getActivity().unregisterReceiver(mIntentReceiver);
-        getPreferenceScreen().getSharedPreferences()
-                .unregisterOnSharedPreferenceChangeListener(this);
     }
 
     public void updateTimeAndDateDisplay(Context context) {
@@ -190,19 +187,20 @@
     }
 
     @Override
-    public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-        if (key.equals(KEY_AUTO_TIME)) {
-            boolean autoEnabled = preferences.getBoolean(key, true);
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference.getKey().equals(KEY_AUTO_TIME)) {
+            boolean autoEnabled = (Boolean) newValue;
             Settings.Global.putInt(getContentResolver(), Settings.Global.AUTO_TIME,
                     autoEnabled ? 1 : 0);
             mTimePref.setEnabled(!autoEnabled);
             mDatePref.setEnabled(!autoEnabled);
-        } else if (key.equals(KEY_AUTO_TIME_ZONE)) {
-            boolean autoZoneEnabled = preferences.getBoolean(key, true);
+        } else if (preference.getKey().equals(KEY_AUTO_TIME_ZONE)) {
+            boolean autoZoneEnabled = (Boolean) newValue;
             Settings.Global.putInt(
                     getContentResolver(), Settings.Global.AUTO_TIME_ZONE, autoZoneEnabled ? 1 : 0);
             mTimeZone.setEnabled(!autoZoneEnabled);
         }
+        return true;
     }
 
     @Override
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 2a9207a..943a4e6 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -53,6 +53,7 @@
 import android.os.ServiceManager;
 import android.os.StrictMode;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.IMountService;
 import android.provider.SearchIndexableResource;
@@ -75,7 +76,6 @@
 import android.webkit.IWebViewUpdateService;
 import android.webkit.WebViewProviderInfo;
 import android.widget.Switch;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.internal.app.LocalePicker;
@@ -94,7 +94,7 @@
 /*
  * Displays preferences for application developers.
  */
-public class DevelopmentSettings extends SettingsPreferenceFragment
+public class DevelopmentSettings extends RestrictedSettingsFragment
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
                 OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener, Indexable {
     private static final String TAG = "DevelopmentSettings";
@@ -115,6 +115,7 @@
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
     private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
     private static final String WEBVIEW_PROVIDER_KEY = "select_webview_provider";
+    private static final String WEBVIEW_MULTIPROCESS_KEY = "enable_webview_multiprocess";
     private static final String ENABLE_OEM_UNLOCK = "oem_unlock_enable";
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
     private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
@@ -174,7 +175,6 @@
     private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
     private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
     private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
-    private static final String WIFI_LEGACY_DHCP_CLIENT_KEY = "legacy_dhcp_client";
     private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
     private static final String KEY_COLOR_MODE = "color_mode";
     private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
@@ -205,6 +205,8 @@
     private static final String KEY_NIGHT_MODE = "night_mode";
     private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
 
+    private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
+
     private static final int RESULT_DEBUG_APP = 1000;
     private static final int RESULT_MOCK_LOCATION_APP = 1001;
 
@@ -217,6 +219,7 @@
 
     private IWindowManager mWindowManager;
     private IBackupManager mBackupManager;
+    private IWebViewUpdateService mWebViewUpdateService;
     private DevicePolicyManager mDpm;
     private UserManager mUm;
     private WifiManager mWifiManager;
@@ -249,9 +252,9 @@
     private SwitchPreference mWifiDisplayCertification;
     private SwitchPreference mWifiVerboseLogging;
     private SwitchPreference mWifiAggressiveHandover;
-    private SwitchPreference mLegacyDhcpClient;
     private SwitchPreference mMobileDataAlwaysOn;
     private SwitchPreference mBluetoothDisableAbsVolume;
+    private SwitchPreference mOtaDisableAutomaticUpdate;
 
     private SwitchPreference mWifiAllowScansWithTraffic;
     private SwitchPreference mStrictMode;
@@ -276,6 +279,8 @@
     private ListPreference mAnimatorDurationScale;
     private ListPreference mOverlayDisplayDevices;
     private ListPreference mOpenGLTraces;
+
+    private SwitchPreference mWebViewMultiprocess;
     private ListPreference mWebViewProvider;
 
     private ListPreference mSimulateColorSpace;
@@ -311,6 +316,10 @@
     private Dialog mAdbKeysDialog;
     private boolean mUnavailable;
 
+    public DevelopmentSettings() {
+        super(UserManager.DISALLOW_DEBUGGING_FEATURES);
+    }
+
     @Override
     protected int getMetricsCategory() {
         return MetricsEvent.DEVELOPMENT;
@@ -323,13 +332,16 @@
         mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
         mBackupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
+        mWebViewUpdateService  =
+            IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
+
         mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
 
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
 
-        if (!mUm.isAdminUser()
-                || mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)
+        setIfOnlyAvailableForAdmins(true);
+        if (isUiRestricted()
                 || Settings.Global.getInt(getActivity().getContentResolver(),
                         Settings.Global.DEVICE_PROVISIONED, 0) == 0) {
             // Block access to developer options if the user is not the owner, if user policy
@@ -413,11 +425,11 @@
         mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY);
         mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
         mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
-        mLegacyDhcpClient = findAndInitSwitchPref(WIFI_LEGACY_DHCP_CLIENT_KEY);
         mMobileDataAlwaysOn = findAndInitSwitchPref(MOBILE_DATA_ALWAYS_ON);
         mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY);
         mUsbConfiguration = addListPreference(USB_CONFIGURATION_KEY);
         mWebViewProvider = addListPreference(WEBVIEW_PROVIDER_KEY);
+        mWebViewMultiprocess = findAndInitSwitchPref(WEBVIEW_MULTIPROCESS_KEY);
         mBluetoothDisableAbsVolume = findAndInitSwitchPref(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY);
 
         mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
@@ -465,6 +477,8 @@
             removePreference(KEY_CONVERT_FBE);
         }
 
+        mOtaDisableAutomaticUpdate = findAndInitSwitchPref(OTA_DISABLE_AUTOMATIC_UPDATE_KEY);
+
         mNightModePreference = (DropDownPreference) findPreference(KEY_NIGHT_MODE);
         final UiModeManager uiManager = (UiModeManager) getSystemService(
                 Context.UI_MODE_SERVICE);
@@ -571,11 +585,10 @@
 
         if (mUnavailable) {
             // Show error message
-            TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-            setEmptyView(emptyView);
-            if (emptyView != null) {
-                emptyView.setText(R.string.development_settings_not_available);
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.development_settings_not_available);
             }
+            getPreferenceScreen().removeAll();
             return;
         }
 
@@ -698,6 +711,7 @@
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
         updateVerifyAppsOverUsbOptions();
+        updateOtaDisableAutomaticUpdateOptions();
         updateBugreportOptions();
         updateForceRtlOptions();
         updateLogdSizeValues();
@@ -705,12 +719,12 @@
         updateWifiVerboseLoggingOptions();
         updateWifiAggressiveHandoverOptions();
         updateWifiAllowScansWithTrafficOptions();
-        updateLegacyDhcpClientOptions();
         updateMobileDataAlwaysOnOptions();
         updateSimulateColorSpace();
         updateUSBAudioOptions();
         updateForceResizableOptions();
         updateEnableFreeformWindowsSupportOptions();
+        updateWebViewMultiprocessOptions();
         updateWebViewProviderOptions();
         updateOemUnlockOptions();
         if (mColorTemperaturePreference != null) {
@@ -746,10 +760,8 @@
     }
 
     private void updateWebViewProviderOptions() {
-        IWebViewUpdateService webViewUpdateService  =
-            IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
         try {
-            WebViewProviderInfo[] providers = webViewUpdateService.getValidWebViewPackages();
+            WebViewProviderInfo[] providers = mWebViewUpdateService.getValidWebViewPackages();
             if (providers == null) {
                 Log.e(TAG, "No WebView providers available");
                 return;
@@ -765,7 +777,7 @@
             mWebViewProvider.setEntries(options.toArray(new String[options.size()]));
             mWebViewProvider.setEntryValues(values.toArray(new String[values.size()]));
 
-            String value = webViewUpdateService.getCurrentWebViewPackageName();
+            String value = mWebViewUpdateService.getCurrentWebViewPackageName();
             if (value == null) {
                 value = "";
             }
@@ -780,6 +792,25 @@
         }
     }
 
+    private void updateWebViewMultiprocessOptions() {
+        updateSwitchPreference(mWebViewMultiprocess,
+                Settings.Global.getInt(getActivity().getContentResolver(),
+                        Settings.Global.WEBVIEW_MULTIPROCESS, 0) != 0);
+    }
+
+    private void writeWebViewMultiprocessOptions() {
+        boolean value = mWebViewMultiprocess.isChecked();
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.WEBVIEW_MULTIPROCESS, value ? 1 : 0);
+
+        try {
+            String wv_package = mWebViewUpdateService.getCurrentWebViewPackageName();
+            ActivityManagerNative.getDefault().killPackageDependents(
+                    wv_package, UserHandle.USER_ALL);
+        } catch(RemoteException e) {
+        }
+    }
+
     private void updateHdcpValues() {
         ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
@@ -820,11 +851,8 @@
     }
 
     private void writeWebViewProviderOptions(Object newValue) {
-        IWebViewUpdateService webViewUpdateService  =
-            IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
-
         try {
-            webViewUpdateService.changeProviderAndSetting(
+            mWebViewUpdateService.changeProviderAndSetting(
                     newValue == null ? "" : newValue.toString());
             updateWebViewProviderOptions();
         } catch(RemoteException e) {
@@ -951,6 +979,24 @@
                 mVerifyAppsOverUsb.isChecked() ? 1 : 0);
     }
 
+    private void updateOtaDisableAutomaticUpdateOptions() {
+        // We use the "disabled status" in code, but show the opposite text
+        // "Automatic system updates" on screen. So a value 0 indicates the
+        // automatic update is enabled.
+        updateSwitchPreference(mOtaDisableAutomaticUpdate, Settings.Global.getInt(
+                getActivity().getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, 0) != 1);
+    }
+
+    private void writeOtaDisableAutomaticUpdateOptions() {
+        // We use the "disabled status" in code, but show the opposite text
+        // "Automatic system updates" on screen. So a value 0 indicates the
+        // automatic update is enabled.
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                mOtaDisableAutomaticUpdate.isChecked() ? 0 : 1);
+    }
+
     private boolean enableVerifierSetting() {
         final ContentResolver cr = getActivity().getContentResolver();
         if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 0) {
@@ -1395,18 +1441,6 @@
         mWifiManager.setAllowScansWithTraffic(mWifiAllowScansWithTraffic.isChecked() ? 1 : 0);
     }
 
-    private void updateLegacyDhcpClientOptions() {
-        updateSwitchPreference(mLegacyDhcpClient, Settings.Global.getInt(
-                getActivity().getContentResolver(),
-                Settings.Global.LEGACY_DHCP_CLIENT, 0) != 0);
-    }
-
-    private void writeLegacyDhcpClientOptions() {
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.LEGACY_DHCP_CLIENT,
-                mLegacyDhcpClient.isChecked() ? 1 : 0);
-    }
-
     private void updateBluetoothDisableAbsVolumeOptions() {
         updateSwitchPreference(mBluetoothDisableAbsVolume,
                 SystemProperties.getBoolean(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false));
@@ -1852,6 +1886,8 @@
             writeDebuggerOptions();
         } else if (preference == mVerifyAppsOverUsb) {
             writeVerifyAppsOverUsbOptions();
+        } else if (preference == mOtaDisableAutomaticUpdate) {
+            writeOtaDisableAutomaticUpdateOptions();
         } else if (preference == mStrictMode) {
             writeStrictModeVisualOptions();
         } else if (preference == mPointerLocation) {
@@ -1888,8 +1924,6 @@
             writeWifiAggressiveHandoverOptions();
         } else if (preference == mWifiAllowScansWithTraffic) {
             writeWifiAllowScansWithTrafficOptions();
-        } else if (preference == mLegacyDhcpClient) {
-            writeLegacyDhcpClientOptions();
         } else if (preference == mMobileDataAlwaysOn) {
             writeMobileDataAlwaysOnOptions();
         } else if (preference == mColorTemperaturePreference) {
@@ -1906,6 +1940,8 @@
             startBackgroundCheckFragment();
         } else if (preference == mBluetoothDisableAbsVolume) {
             writeBluetoothDisableAbsVolumeOptions();
+        } else if (preference == mWebViewMultiprocess) {
+            writeWebViewMultiprocessOptions();
         } else {
             return super.onPreferenceTreeClick(preference);
         }
@@ -1932,20 +1968,9 @@
 
     private boolean isPackageEnabled(String packageName) {
         try {
-            PackageManager pm = getActivity().getPackageManager();
-            int enabled_state = pm.getApplicationEnabledSetting(packageName);
-            switch (enabled_state) {
-                case PackageManager.COMPONENT_ENABLED_STATE_ENABLED:
-                    return true;
-                case PackageManager.COMPONENT_ENABLED_STATE_DEFAULT:
-                    return pm.getPackageInfo(packageName, 0).applicationInfo.enabled;
-                default:
-                    return false;
-            }
+            return getActivity().getPackageManager().getApplicationInfo(packageName, 0).enabled;
         } catch (NameNotFoundException e) {
-            // Thrown by PackageManager.getPackageInfo if the package does not exist
-        } catch (IllegalArgumentException e) {
-            // Thrown by PackageManager.getApplicationEnabledSetting if the package does not exist
+            // Thrown by PackageManager.getApplicationInfo if the package does not exist
         }
         return false;
     }
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 9791160..3adce15 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -359,6 +359,9 @@
                 DeviceAdminInfo deviceAdminInfo =  createDeviceAdminInfo(resolveInfo);
                 // add only visible ones (note: active admins are added regardless of visibility)
                 if (deviceAdminInfo != null && deviceAdminInfo.isVisible()) {
+                    if (!deviceAdminInfo.getActivityInfo().applicationInfo.isInternal()) {
+                        continue;
+                    }
                     DeviceAdminListItem item = new DeviceAdminListItem();
                     item.info = deviceAdminInfo;
                     item.name = deviceAdminInfo.loadLabel(pm).toString();
@@ -391,6 +394,8 @@
                     for (int j = 0; j < resolvedMax; ++j) {
                         DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolved.get(j));
                         if (deviceAdminInfo != null) {
+                            // Don't do the applicationInfo.isInternal() check here; if an active
+                            // admin is already on SD card, just show it.
                             DeviceAdminListItem item = new DeviceAdminListItem();
                             item.info = deviceAdminInfo;
                             item.name = deviceAdminInfo.loadLabel(packageManager).toString();
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 94336e6..0f51011 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -81,7 +81,9 @@
     private UserManager mUm;
 
     private EnforcedAdmin mFunDisallowedAdmin;
+    private boolean mFunDisallowedBySystem;
     private EnforcedAdmin mDebuggingFeaturesDisallowedAdmin;
+    private boolean mDebuggingFeaturesDisallowedBySystem;
 
     @Override
     protected int getMetricsCategory() {
@@ -192,8 +194,12 @@
         mDevHitToast = null;
         mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
                 getActivity(), UserManager.DISALLOW_FUN, UserHandle.myUserId());
+        mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+                getActivity(), UserManager.DISALLOW_FUN, UserHandle.myUserId());
         mDebuggingFeaturesDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
                 getActivity(), UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
+        mDebuggingFeaturesDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+                getActivity(), UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
     }
 
     @Override
@@ -202,9 +208,11 @@
             System.arraycopy(mHits, 1, mHits, 0, mHits.length-1);
             mHits[mHits.length-1] = SystemClock.uptimeMillis();
             if (mHits[0] >= (SystemClock.uptimeMillis()-500)) {
-                if (mFunDisallowedAdmin != null) {
-                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
-                            mFunDisallowedAdmin);
+                if (mUm.hasUserRestriction(UserManager.DISALLOW_FUN)) {
+                    if (mFunDisallowedAdmin != null && !mFunDisallowedBySystem) {
+                        RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
+                                mFunDisallowedAdmin);
+                    }
                     Log.d(LOG_TAG, "Sorry, no fun for you!");
                     return false;
                 }
@@ -228,9 +236,12 @@
                 return true;
             }
 
-            if (mDebuggingFeaturesDisallowedAdmin != null) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
-                        mDebuggingFeaturesDisallowedAdmin);
+            if (mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) {
+                if (mDebuggingFeaturesDisallowedAdmin != null &&
+                        !mDebuggingFeaturesDisallowedBySystem) {
+                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
+                            mDebuggingFeaturesDisallowedAdmin);
+                }
                 return true;
             }
 
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 5e8baac..75a4d67 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -41,9 +41,12 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.List;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"
  * state.  Multiple confirmations are required: first, a general "are you sure
@@ -280,10 +283,17 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
+        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
         final UserManager um = UserManager.get(getActivity());
-        if (!um.isAdminUser()
-                || um.hasUserRestriction(UserManager.DISALLOW_FACTORY_RESET)) {
+        if (!um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
             return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
+        } else if (admin != null) {
+            View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
+            ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false);
+            view.setVisibility(View.VISIBLE);
+            return view;
         }
 
         mContentView = inflater.inflate(R.layout.master_clear, null);
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 697c5c9..7c14bad 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -22,6 +22,7 @@
 import android.content.pm.ActivityInfo;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.service.persistentdata.PersistentDataBlockManager;
@@ -32,6 +33,9 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settingslib.RestrictedLockUtils;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"
@@ -136,9 +140,16 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        if (UserManager.get(getActivity()).hasUserRestriction(
-                UserManager.DISALLOW_FACTORY_RESET)) {
+        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
+        if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
             return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
+        } else if (admin != null) {
+            View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
+            ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false);
+            view.setVisibility(View.VISIBLE);
+            return view;
         }
         mContentView = inflater.inflate(R.layout.master_clear_confirm, null);
         establishFinalConfirmationState();
diff --git a/src/com/android/settings/PreferenceAvailabilityProvider.java b/src/com/android/settings/PreferenceAvailabilityProvider.java
new file mode 100644
index 0000000..bb33aee
--- /dev/null
+++ b/src/com/android/settings/PreferenceAvailabilityProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.content.Context;
+
+/**
+ * Interface for classes whose instances can provide the availability of the preference.
+ */
+public interface PreferenceAvailabilityProvider {
+    /**
+     * @return the availability of the preference. Please make sure the availability in managed
+     * profile is taken into account.
+     */
+    boolean isAvailable(Context context);
+}
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index a0b074b..03e569b 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -38,6 +38,7 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
 
 import java.util.ArrayList;
@@ -186,12 +187,6 @@
             // Hide the item if data management intent is not supported by transport.
             getPreferenceScreen().removePreference(mManageData);
         }
-
-        RestrictedPreference networkResetPref = (RestrictedPreference) findPreference(
-                NETWORK_RESET);
-        if (networkResetPref != null) {
-            networkResetPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_NETWORK_RESET);
-        }
     }
 
     private void setConfigureSummary(String summary) {
@@ -315,5 +310,13 @@
             nonVisibleKeys.add(AUTO_RESTORE);
             nonVisibleKeys.add(CONFIGURE_ACCOUNT);
         }
+        if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
+            nonVisibleKeys.add(FACTORY_RESET);
+        }
+        if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+            nonVisibleKeys.add(NETWORK_RESET);
+        }
     }
 }
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 18bd4f0..fe12924 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -20,6 +20,7 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -33,10 +34,13 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 /**
  * Confirm and execute a reset of the device's network settings to a clean "just out of the box"
  * state.  Multiple confirmations are required: first, a general "are you sure you want to do this?"
@@ -180,9 +184,16 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         final UserManager um = UserManager.get(getActivity());
-        if (!um.isAdminUser()
-                || um.hasUserRestriction(UserManager.DISALLOW_NETWORK_RESET)) {
+        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
+        if (!um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
             return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
+        } else if (admin != null) {
+            View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
+            ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false);
+            view.setVisibility(View.VISIBLE);
+            return view;
         }
 
         mContentView = inflater.inflate(R.layout.reset_network, null);
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index ad98bab..777f4d4 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -22,6 +22,7 @@
 import android.net.NetworkPolicyManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -34,6 +35,9 @@
 import com.android.ims.ImsManager;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settingslib.RestrictedLockUtils;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 /**
  * Confirm and execute a reset of the network settings to a clean "just out of the box"
@@ -113,9 +117,16 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        if (UserManager.get(getActivity()).hasUserRestriction(
-                UserManager.DISALLOW_NETWORK_RESET)) {
+        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
+        if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
             return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
+        } else if (admin != null) {
+            View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
+            ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(), view, admin, false);
+            view.setVisibility(View.VISIBLE);
+            return view;
         }
         mContentView = inflater.inflate(R.layout.reset_network_confirm, null);
         establishFinalConfirmationState();
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index 3642fa6..0f2c033 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -27,6 +27,7 @@
 import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 
@@ -69,6 +70,9 @@
     private EnforcedAdmin mEnforcedAdmin;
     private TextView mEmptyTextView;
 
+    private boolean mOnlyAvailableForAdmins = false;
+    private boolean mIsAdminUser;
+
     // Receiver to clear pin status when the screen is turned off.
     private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
         @Override
@@ -96,6 +100,7 @@
 
         mRestrictionsManager = (RestrictionsManager) getSystemService(Context.RESTRICTIONS_SERVICE);
         mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        mIsAdminUser = mUserManager.isAdminUser();
 
         if (icicle != null) {
             mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
@@ -198,26 +203,24 @@
         return restricted && mRestrictionsManager.hasRestrictionsProvider();
     }
 
-    protected View initAdminSupportDetailsView() {
-        return null;
+    private View initAdminSupportDetailsView() {
+        return getActivity().findViewById(R.id.admin_support_details);
     }
 
     protected TextView initEmptyTextView() {
-        return null;
+        TextView emptyView = (TextView) getActivity().findViewById(android.R.id.empty);
+        emptyView.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
+        return emptyView;
     }
 
     private void updateAdminSupportDetailsView() {
-        mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
-                mRestrictionKey, UserHandle.myUserId());
-        if (mEnforcedAdmin != null) {
+        final EnforcedAdmin admin = getRestrictionEnforcedAdmin();
+        if (admin != null) {
             final Activity activity = getActivity();
             DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService(
                     Context.DEVICE_POLICY_SERVICE);
-            if (mEnforcedAdmin.userId == UserHandle.USER_NULL) {
-                mEnforcedAdmin.userId = UserHandle.myUserId();
-            }
             CharSequence supportMessage = dpm.getShortSupportMessageForUser(
-                    mEnforcedAdmin.component, mEnforcedAdmin.userId);
+                    admin.component, admin.userId);
             if (supportMessage != null) {
                 TextView textView = (TextView) activity.findViewById(R.id.admin_support_msg);
                 textView.setText(supportMessage);
@@ -226,6 +229,15 @@
         }
     }
 
+    public EnforcedAdmin getRestrictionEnforcedAdmin() {
+        mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
+                mRestrictionKey, UserHandle.myUserId());
+        if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {
+            mEnforcedAdmin.userId = UserHandle.myUserId();
+        }
+        return mEnforcedAdmin;
+    }
+
     @Override
     public void onClick(View view) {
         Intent intent = new Intent();
@@ -251,8 +263,10 @@
     @Override
     protected void onDataSetChanged() {
         highlightPreferenceIfNeeded();
-        if (mAdminSupportDetails != null && isUiRestricted()) {
-            updateAdminSupportDetailsView();
+        if (mAdminSupportDetails != null && isUiRestrictedByOnlyAdmin()) {
+            final EnforcedAdmin admin = getRestrictionEnforcedAdmin();
+            ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(),
+                    mAdminSupportDetails, admin, false);
             setEmptyView(mAdminSupportDetails);
         } else if (mEmptyTextView != null) {
             setEmptyView(mEmptyTextView);
@@ -260,10 +274,20 @@
         super.onDataSetChanged();
     }
 
+    public void setIfOnlyAvailableForAdmins(boolean onlyForAdmins) {
+        mOnlyAvailableForAdmins = onlyForAdmins;
+    }
+
     /**
      * Returns whether restricted or actionable UI elements should be removed or disabled.
      */
     protected boolean isUiRestricted() {
-        return isRestrictedAndNotProviderProtected() || !hasChallengeSucceeded();
+        return isRestrictedAndNotProviderProtected() || !hasChallengeSucceeded()
+                || (!mIsAdminUser && mOnlyAvailableForAdmins);
+    }
+
+    protected boolean isUiRestrictedByOnlyAdmin() {
+        return isUiRestricted() && !mUserManager.hasBaseUserRestriction(mRestrictionKey,
+                UserHandle.of(UserHandle.myUserId())) && (mIsAdminUser || !mOnlyAvailableForAdmins);
     }
 }
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index e89b0d2..b4cbab2 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -276,19 +276,30 @@
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
 
-        RestrictedPreference credentialStorageType = (RestrictedPreference) root.findPreference(
-                KEY_CREDENTIAL_STORAGE_TYPE);
-        credentialStorageType.checkRestrictionAndSetDisabled(
-                UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        RestrictedPreference installCredentials = (RestrictedPreference) root.findPreference(
-                KEY_CREDENTIALS_INSTALL);
-        installCredentials.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        mResetCredentials.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_CREDENTIALS);
+        if (!RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_CONFIG_CREDENTIALS, MY_USER_ID)) {
+            RestrictedPreference credentialStorageType = (RestrictedPreference) root.findPreference(
+                    KEY_CREDENTIAL_STORAGE_TYPE);
+            credentialStorageType.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
+            RestrictedPreference installCredentials = (RestrictedPreference) root.findPreference(
+                    KEY_CREDENTIALS_INSTALL);
+            installCredentials.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
+            mResetCredentials.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_CONFIG_CREDENTIALS);
 
-        final int storageSummaryRes =
-                mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
-                        : R.string.credential_storage_type_software;
-        credentialStorageType.setSummary(storageSummaryRes);
+            final int storageSummaryRes =
+                    mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
+                            : R.string.credential_storage_type_software;
+            credentialStorageType.setSummary(storageSummaryRes);
+        } else {
+            PreferenceGroup credentialsManager = (PreferenceGroup)
+                    root.findPreference(KEY_CREDENTIALS_MANAGER);
+            credentialsManager.removePreference(root.findPreference(KEY_RESET_CREDENTIALS));
+            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIALS_INSTALL));
+            credentialsManager.removePreference(root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE));
+        }
 
 
         // Application install
@@ -300,6 +311,12 @@
         // Side loading of apps.
         // Disable for restricted profiles. For others, check if policy disallows it.
         mToggleAppInstallation.setEnabled(!um.getUserInfo(MY_USER_ID).isRestricted());
+        if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, MY_USER_ID)
+                || RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                        UserManager.DISALLOW_INSTALL_APPS, MY_USER_ID)) {
+            mToggleAppInstallation.setEnabled(false);
+        }
         if (mToggleAppInstallation.isEnabled()) {
             mToggleAppInstallation.checkRestrictionAndSetDisabled(
                     UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index b6ac0c0..b875823 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -460,18 +460,22 @@
     @Override
     public SharedPreferences getSharedPreferences(String name, int mode) {
         if (name.equals(getPackageName() + "_preferences")) {
-            String tag = getClass().getName();
-            if (getIntent() != null && getIntent().hasExtra(EXTRA_SHOW_FRAGMENT)) {
-                tag = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
-            }
-            if (tag.startsWith("com.android.settings.")) {
-                tag = tag.replace("com.android.settings.", "");
-            }
-            return new SharedPreferencesLogger(this, tag);
+            return new SharedPreferencesLogger(this, getMetricsTag());
         }
         return super.getSharedPreferences(name, mode);
     }
 
+    private String getMetricsTag() {
+        String tag = getClass().getName();
+        if (getIntent() != null && getIntent().hasExtra(EXTRA_SHOW_FRAGMENT)) {
+            tag = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
+        }
+        if (tag.startsWith("com.android.settings.")) {
+            tag = tag.replace("com.android.settings.", "");
+        }
+        return tag;
+    }
+
     private static boolean isShortCutIntent(final Intent intent) {
         Set<String> categories = intent.getCategories();
         return (categories != null) && categories.contains("com.android.settings.SHORTCUT");
@@ -610,6 +614,9 @@
             mActionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled);
         }
         mSwitchBar = (SwitchBar) findViewById(R.id.switch_bar);
+        if (mSwitchBar != null) {
+            mSwitchBar.setMetricsTag(getMetricsTag());
+        }
 
         // see if we should show Back/Next buttons
         if (intent.getBooleanExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)) {
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 9aebdbf..49d72b4 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -40,7 +40,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import com.android.settings.accessibility.AccessibilitySettingsForSetupWizardActivity;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.widget.FloatingActionButton;
 
@@ -164,8 +163,7 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        if (!TextUtils.isEmpty(mHelpUri)
-                && !(getActivity() instanceof AccessibilitySettingsForSetupWizardActivity)) {
+        if (!TextUtils.isEmpty(mHelpUri)) {
             setHasOptionsMenu(true);
         }
     }
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
index f1fbfc9..4f0d4ea 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -25,12 +25,16 @@
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.fingerprint.SetupSkipDialog;
 import com.android.setupwizardlib.SetupWizardLayout;
+import com.android.setupwizardlib.SetupWizardPreferenceLayout;
 import com.android.setupwizardlib.view.NavigationBar;
 
 /**
@@ -71,7 +75,9 @@
 
             SetupWizardUtils.setImmersiveMode(getActivity());
 
-            SetupWizardLayout layout = (SetupWizardLayout) view;
+            SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) view;
+            layout.setDividerInset(getContext().getResources().getDimensionPixelSize(
+                    R.dimen.suw_items_text_divider_inset));
             final NavigationBar navigationBar = layout.getNavigationBar();
             Button nextButton = navigationBar.getNextButton();
             nextButton.setText(null);
@@ -86,6 +92,9 @@
                 layout.setHeaderText(R.string.lock_settings_picker_title);
             }
 
+            // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
+            // PreferenceFragment.
+            setDivider(null);
         }
 
         @Override
@@ -115,6 +124,13 @@
             // activity will be resumed to foreground.
         }
 
+        @Override
+        public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
+                Bundle savedInstanceState) {
+            SetupWizardPreferenceLayout layout = (SetupWizardPreferenceLayout) parent;
+            return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
+        }
+
         /***
          * Disables preferences that are less secure than required quality and shows only secure
          * screen lock options here.
diff --git a/src/com/android/settings/ShowAdminSupportDetailsDialog.java b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
index bc7168f..f44c4b8 100644
--- a/src/com/android/settings/ShowAdminSupportDetailsDialog.java
+++ b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
@@ -23,12 +23,14 @@
 import android.app.IActivityManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.util.Log;
@@ -37,40 +39,59 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 public class ShowAdminSupportDetailsDialog extends Activity
         implements DialogInterface.OnDismissListener {
 
-    private final String TAG = "AdminSupportDialog";
+    private static final String TAG = "AdminSupportDialog";
 
     private DevicePolicyManager mDpm;
 
+    private EnforcedAdmin mEnforcedAdmin;
+    private View mDialogView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         mDpm = getSystemService(DevicePolicyManager.class);
-        ComponentName admin = null;
-        int userId = UserHandle.myUserId();
-        Intent intent = getIntent();
-        if (intent != null) {
-            // Only allow apps with MANAGE_DEVICE_ADMINS permission to specify admin and user.
-            if (checkIfCallerHasPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS)) {
-                admin = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
-                userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
-            }
-        }
+        mEnforcedAdmin = getAdminDetailsFromIntent(getIntent());
 
-        View rootView = LayoutInflater.from(this).inflate(
+        mDialogView = LayoutInflater.from(this).inflate(
                 R.layout.admin_support_details_dialog, null);
-        setAdminSupportDetails(rootView, admin, userId);
+        setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true);
 
         new AlertDialog.Builder(this)
-                .setView(rootView)
+                .setView(mDialogView)
                 .setPositiveButton(R.string.okay, null)
                 .setOnDismissListener(this)
                 .show();
     }
 
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        EnforcedAdmin admin = getAdminDetailsFromIntent(intent);
+        if (!mEnforcedAdmin.equals(admin)) {
+            mEnforcedAdmin = admin;
+            setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true);
+        }
+    }
+
+    private EnforcedAdmin getAdminDetailsFromIntent(Intent intent) {
+        EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.myUserId());
+        if (intent == null) {
+            return admin;
+        }
+        // Only allow apps with MANAGE_DEVICE_ADMINS permission to specify admin and user.
+        if (checkIfCallerHasPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS)) {
+            admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+            admin.userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+        }
+        return admin;
+    }
+
     private boolean checkIfCallerHasPermission(String permission) {
         IActivityManager am = ActivityManagerNative.getDefault();
         try {
@@ -83,14 +104,8 @@
         return false;
     }
 
-    private void setAdminSupportDetails(View root, final ComponentName admin, final int userId) {
+    private void initializeDialogViews(View root, final ComponentName admin, int userId) {
         if (admin != null) {
-            CharSequence supportMessage = mDpm.getShortSupportMessageForUser(admin, userId);
-            if (supportMessage != null) {
-                TextView textView = (TextView) root.findViewById(R.id.admin_support_msg);
-                textView.setText(supportMessage);
-            }
-
             ActivityInfo ai = null;
             try {
                 ai = AppGlobals.getPackageManager().getReceiverInfo(admin, 0 /* flags */, userId);
@@ -106,25 +121,52 @@
             }
         }
 
+        setAdminSupportDetails(this, root, new EnforcedAdmin(admin, userId), true);
+    }
+
+    public static void setAdminSupportDetails(final Activity activity, View root,
+            final EnforcedAdmin enforcedAdmin, final boolean finishActivity) {
+        if (enforcedAdmin == null) {
+            return;
+        }
+        if (enforcedAdmin.component != null) {
+            DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService(
+                    Context.DEVICE_POLICY_SERVICE);
+            if (enforcedAdmin.userId == UserHandle.USER_NULL) {
+                enforcedAdmin.userId = UserHandle.myUserId();
+            }
+            CharSequence supportMessage = null;
+            if (UserHandle.isSameApp(Process.myUid(), Process.SYSTEM_UID)) {
+                supportMessage = dpm.getShortSupportMessageForUser(
+                        enforcedAdmin.component, enforcedAdmin.userId);
+            }
+            if (supportMessage != null) {
+                TextView textView = (TextView) root.findViewById(R.id.admin_support_msg);
+                textView.setText(supportMessage);
+            }
+        }
+
         root.findViewById(R.id.admins_policies_list).setOnClickListener(
                 new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         Intent intent = new Intent();
-                        if (admin != null) {
-                            intent.setClass(ShowAdminSupportDetailsDialog.this,
-                                    DeviceAdminAdd.class);
-                            intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin);
+                        if (enforcedAdmin.component != null) {
+                            intent.setClass(activity, DeviceAdminAdd.class);
+                            intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN,
+                                    enforcedAdmin.component);
                             // DeviceAdminAdd class may need to run as managed profile.
-                            startActivityAsUser(intent, new UserHandle(userId));
+                            activity.startActivityAsUser(intent,
+                                    new UserHandle(enforcedAdmin.userId));
                         } else {
-                            intent.setClass(ShowAdminSupportDetailsDialog.this,
-                                    Settings.DeviceAdminSettingsActivity.class);
+                            intent.setClass(activity, Settings.DeviceAdminSettingsActivity.class);
                             // Activity merges both managed profile and parent users
                             // admins so show as same user as this activity.
-                            startActivity(intent);
+                            activity.startActivity(intent);
                         }
-                        finish();
+                        if (finishActivity) {
+                            activity.finish();
+                        }
                     }
                 });
     }
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 3aa72d2..0338020 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -42,7 +42,6 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.wifi.WifiApDialog;
@@ -56,7 +55,7 @@
 /*
  * Displays preferences for Tethering.
  */
-public class TetherSettings extends SettingsPreferenceFragment
+public class TetherSettings extends RestrictedSettingsFragment
         implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener {
 
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
@@ -94,7 +93,6 @@
     private WifiApDialog mDialog;
     private WifiManager mWifiManager;
     private WifiConfiguration mWifiConfig = null;
-    private UserManager mUm;
     private ConnectivityManager mCm;
 
     private boolean mUsbConnected;
@@ -113,16 +111,18 @@
         return MetricsEvent.TETHER;
     }
 
+    public TetherSettings() {
+        super(UserManager.DISALLOW_CONFIG_TETHERING);
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.tether_prefs);
 
-        mUm = (UserManager) getSystemService(Context.USER_SERVICE);
-
-        if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)
-                || !mUm.isAdminUser()) {
+        setIfOnlyAvailableForAdmins(true);
+        if (isUiRestricted()) {
             mUnavailable = true;
             setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
             return;
@@ -259,11 +259,10 @@
         super.onStart();
 
         if (mUnavailable) {
-            TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-            setEmptyView(emptyView);
-            if (emptyView != null) {
-                emptyView.setText(R.string.tethering_settings_not_available);
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.tethering_settings_not_available);
             }
+            getPreferenceScreen().removeAll();
             return;
         }
 
diff --git a/src/com/android/settings/TintablePreference.java b/src/com/android/settings/TintablePreference.java
index 0ada6ed..45f43fb 100644
--- a/src/com/android/settings/TintablePreference.java
+++ b/src/com/android/settings/TintablePreference.java
@@ -42,6 +42,8 @@
         if (mTintColor != 0) {
             ((ImageView) view.findViewById(android.R.id.icon)).setImageTintList(
                     ColorStateList.valueOf(mTintColor));
+        } else {
+            ((ImageView) view.findViewById(android.R.id.icon)).setImageTintList(null);
         }
     }
 }
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index ce0766b..5b1d644 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -34,6 +34,7 @@
 import android.nfc.NfcManager;
 import android.os.Bundle;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
@@ -242,7 +243,8 @@
         //enable/disable wimax depending on the value in config.xml
         final boolean isWimaxEnabled = isAdmin && this.getResources().getBoolean(
                 com.android.internal.R.bool.config_wimaxEnabled);
-        if (!isWimaxEnabled) {
+        if (!isWimaxEnabled || RestrictedLockUtils.hasBaseUserRestriction(activity,
+                UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, UserHandle.myUserId())) {
             PreferenceScreen root = getPreferenceScreen();
             Preference ps = findPreference(KEY_WIMAX_SETTINGS);
             if (ps != null) root.removePreference(ps);
@@ -260,7 +262,8 @@
         }
         // Disable VPN.
         // TODO: http://b/23693383
-        if (!isAdmin) {
+        if (!isAdmin || RestrictedLockUtils.hasBaseUserRestriction(activity,
+                UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId())) {
             removePreference(KEY_VPN_SETTINGS);
         }
 
@@ -285,7 +288,9 @@
 
         // Remove Mobile Network Settings and Manage Mobile Plan for secondary users,
         // if it's a wifi-only device.
-        if (!isAdmin || Utils.isWifiOnly(getActivity())) {
+        if (!isAdmin || Utils.isWifiOnly(getActivity()) ||
+                RestrictedLockUtils.hasBaseUserRestriction(activity,
+                        UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, UserHandle.myUserId())) {
             removePreference(KEY_MOBILE_NETWORK_SETTINGS);
             removePreference(KEY_MANAGE_MOBILE_PLAN);
         }
@@ -317,9 +322,11 @@
         final ConnectivityManager cm =
                 (ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
 
-        final boolean adminDisallowedTetherConfig = mUm.hasUserRestriction(
-                UserManager.DISALLOW_CONFIG_TETHERING);
-        if (!cm.isTetheringSupported() && !adminDisallowedTetherConfig) {
+        final boolean adminDisallowedTetherConfig = RestrictedLockUtils.checkIfRestrictionEnforced(
+                activity, UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
+        if ((!cm.isTetheringSupported() && !adminDisallowedTetherConfig) ||
+                RestrictedLockUtils.hasBaseUserRestriction(activity,
+                        UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId())) {
             getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
         } else if (!adminDisallowedTetherConfig) {
             Preference p = findPreference(KEY_TETHER_SETTINGS);
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
index 26f5f39..35bb83b 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
@@ -17,14 +17,18 @@
 package com.android.settings.accessibility;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Handler;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
+import android.util.Log;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.logging.MetricsProto;
@@ -40,16 +44,30 @@
 public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragment
         implements DialogCreatable, Preference.OnPreferenceChangeListener {
 
+    private static final String TAG = AccessibilitySettingsForSetupWizard.class.getSimpleName();
+
     // Preferences.
     private static final String DISPLAY_MAGNIFICATION_PREFERENCE =
             "screen_magnification_preference";
-    private static final String TALKBACK_PREFERENCE = "talkback_preference";
+    private static final String SCREEN_READER_PREFERENCE = "talkback_preference";
     private static final String FONT_SIZE_PREFERENCE = "font_size_preference";
 
+    // Time needed to let Talkback initialize its self before launching the tutorial.
+    private static final long SCREEN_READER_INITIALIZATION_DELAY_MS = 3000;
+
+    private String mTalkbackPackage;
+
     // Preference controls.
     private Preference mDisplayMagnificationPreference;
     private Preference mTalkbackPreference;
 
+    private Runnable mStartTalkbackRunnable = new Runnable() {
+        @Override
+        public void run() {
+            launchTalkbackTutorial();
+        }
+    };
+
     @Override
     protected int getMetricsCategory() {
         return MetricsProto.MetricsEvent.ACCESSIBILITY;
@@ -61,7 +79,7 @@
         addPreferencesFromResource(R.xml.accessibility_settings_for_setup_wizard);
 
         mDisplayMagnificationPreference = findPreference(DISPLAY_MAGNIFICATION_PREFERENCE);
-        mTalkbackPreference = findPreference(TALKBACK_PREFERENCE);
+        mTalkbackPreference = findPreference(SCREEN_READER_PREFERENCE);
     }
 
     @Override
@@ -75,41 +93,16 @@
         return false;
     }
 
-    /**
-     * Returns a semicolon-delimited string containing a list of all the
-     * installed {@link AccessibilityService}s that provide at least one
-     * required feedback type.
-     *
-     * @param context The {@link android.app.Activity} context.
-     * @param requiredFeedbackTypes An integer mask containing the required
-     *            feedback types.
-     * @return A semicolon-delimited string containing a list of accessibility services.
-     */
-    private String getAccessibilityServicesFiltered(
-            Context context, int requiredFeedbackTypes) {
-        final AccessibilityManager manager = context.getSystemService(AccessibilityManager.class);
-        final List<AccessibilityServiceInfo> accessibilityServices = manager
-                .getInstalledAccessibilityServiceList();
-        final StringBuilder servicesToEnable = new StringBuilder();
-
-        for (AccessibilityServiceInfo accessibilityService : accessibilityServices) {
-            if ((accessibilityService.feedbackType & requiredFeedbackTypes) == 0) {
-                continue;
-            }
-
-            final ServiceInfo serviceInfo = accessibilityService.getResolveInfo().serviceInfo;
-            final ComponentName componentName = new ComponentName(serviceInfo.packageName,
-                    serviceInfo.name);
-
-            servicesToEnable.append(componentName.flattenToString());
-            servicesToEnable.append(':');
+    private void launchTalkbackTutorial() {
+        try {
+            Intent intent = new Intent(Settings.ACTION_SCREEN_READER_TUTORIAL);
+            intent.setPackage(mTalkbackPackage);
+            startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            // This can happen if either the build is misconfigued or an OEM removes the intent
+            // filter for the Talkback tutorial from their implementation of Talkback.
+            Log.e(TAG, "Can't find Talkback Tutorial: " + Settings.ACTION_SCREEN_READER_TUTORIAL);
         }
-
-        if (servicesToEnable.length() > 0) {
-            servicesToEnable.deleteCharAt(servicesToEnable.length() - 1);
-        }
-
-        return servicesToEnable.toString();
     }
 
     @Override
@@ -130,17 +123,34 @@
             final int accessibilityEnabled =
                     Settings.Secure.getInt(resolver, Settings.Secure.ACCESSIBILITY_ENABLED, 0);
             if (accessibilityEnabled == 0) {
-                final String servicesToEnable = getAccessibilityServicesFiltered(
-                        getActivity(), AccessibilityServiceInfo.FEEDBACK_SPOKEN);
+                // Find the first installed screen reader.
+                String serviceToEnable = null;
+                final AccessibilityManager manager =
+                        getActivity().getSystemService(AccessibilityManager.class);
+                final List<AccessibilityServiceInfo> accessibilityServices =
+                        manager.getInstalledAccessibilityServiceList();
+                for (AccessibilityServiceInfo accessibilityService : accessibilityServices) {
+                    if ((accessibilityService.feedbackType
+                            & AccessibilityServiceInfo.FEEDBACK_SPOKEN) != 0) {
+                        final ServiceInfo serviceInfo =
+                                accessibilityService.getResolveInfo().serviceInfo;
+                        mTalkbackPackage = serviceInfo.packageName;
+                        final ComponentName componentName =
+                                new ComponentName(serviceInfo.packageName, serviceInfo.name);
+
+                        serviceToEnable = componentName.flattenToString();
+                        break;
+                    }
+                }
 
                 // Enable all accessibility services with spoken feedback type.
                 Settings.Secure.putString(resolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-                        servicesToEnable);
+                        serviceToEnable);
 
                 // Allow the services we just enabled to toggle touch exploration.
                 Settings.Secure.putString(resolver,
                         Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES,
-                        servicesToEnable);
+                        serviceToEnable);
 
                 // Enable touch exploration.
                 Settings.Secure.putInt(resolver, Settings.Secure.TOUCH_EXPLORATION_ENABLED, 1);
@@ -148,6 +158,13 @@
                 // Turn on accessibility mode last, since enabling accessibility with no
                 // services has no effect.
                 Settings.Secure.putInt(resolver, Settings.Secure.ACCESSIBILITY_ENABLED, 1);
+
+                // Since Talkback will display an error message if it's not active when the Tutorial
+                // is launched, launch Talkbck Tutorial with a delay.
+                new Handler().postDelayed(mStartTalkbackRunnable,
+                        SCREEN_READER_INITIALIZATION_DELAY_MS);
+            } else {
+                launchTalkbackTutorial();
             }
         }
 
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 041fed8..748dc15 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -55,7 +55,7 @@
             view.setDividerAllowedBelow(false);
             final RelativeLayout background =
                     (RelativeLayout) view.findViewById(R.id.video_background);
-            final VideoView videoView = (VideoView) view.findViewById(R.id.video);
+            VideoView videoView = (VideoView) view.findViewById(R.id.video);
 
             // Hacky adjustment for using VideoView in recycle view and positioning
             // it on the background image
@@ -98,7 +98,8 @@
                     ContentResolver.SCHEME_ANDROID_RESOURCE,
                     getPrefContext().getPackageName(),
                     R.raw.accessibility_screen_magnification)));
-            videoView.setMediaController(new MediaController(getPrefContext()));
+            // Make sure video controls (e.g. for pausing) are not displayed.
+            videoView.setMediaController(null);
             videoView.start();
         }
     }
@@ -149,6 +150,11 @@
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 0) {
             setMagnificationEnabled(1);
         }
+
+        VideoView videoView = (VideoView) getView().findViewById(R.id.video);
+        if (videoView != null) {
+            videoView.start();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 03163f1..3337209 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -62,6 +62,7 @@
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.users.UserDialogs;
+import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
@@ -325,9 +326,12 @@
         if (userInfo.isEnabled()) {
             profileData.authenticatorHelper = new AuthenticatorHelper(context,
                     userInfo.getUserHandle(), this);
-            profileData.addAccountPreference = newAddAccountPreference(context);
-            profileData.addAccountPreference.checkRestrictionAndSetDisabled(
-                    DISALLOW_MODIFY_ACCOUNTS, userInfo.id);
+            if (!RestrictedLockUtils.hasBaseUserRestriction(context,
+                    UserManager.DISALLOW_MODIFY_ACCOUNTS, userInfo.id)) {
+                profileData.addAccountPreference = newAddAccountPreference(context);
+                profileData.addAccountPreference.checkRestrictionAndSetDisabled(
+                        DISALLOW_MODIFY_ACCOUNTS, userInfo.id);
+            }
         }
         mProfiles.put(userInfo.id, profileData);
         Index.getInstance(getActivity()).updateFromClassNameResource(
@@ -715,13 +719,16 @@
             for (int i = 0; i < profilesCount; i++) {
                 UserInfo userInfo = profiles.get(i);
                 if (userInfo.isEnabled()) {
-                    SearchIndexableRaw data = new SearchIndexableRaw(context);
-                    data = new SearchIndexableRaw(context);
-                    data.title = res.getString(R.string.add_account_label);
-                    data.screenTitle = screenTitle;
-                    result.add(data);
-                    if (userInfo.isManagedProfile()) {
+                    if (!RestrictedLockUtils.hasBaseUserRestriction(context,
+                            DISALLOW_MODIFY_ACCOUNTS, userInfo.id)) {
+                        SearchIndexableRaw data = new SearchIndexableRaw(context);
                         data = new SearchIndexableRaw(context);
+                        data.title = res.getString(R.string.add_account_label);
+                        data.screenTitle = screenTitle;
+                        result.add(data);
+                    }
+                    if (userInfo.isManagedProfile()) {
+                        SearchIndexableRaw data = new SearchIndexableRaw(context);
                         data = new SearchIndexableRaw(context);
                         data.title = res.getString(R.string.remove_managed_profile_label);
                         data.screenTitle = screenTitle;
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 33c29bd..493e1db 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -262,20 +262,23 @@
         MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
                 getString(R.string.sync_menu_sync_cancel))
                 .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
-        MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
-                getString(R.string.remove_account_label))
-                .setIcon(R.drawable.ic_menu_delete);
-        removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
-                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-        EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
-                getPrefContext(), UserManager.DISALLOW_MODIFY_ACCOUNTS,
-                mUserHandle.getIdentifier());
-        if (admin == null) {
-            admin = RestrictedLockUtils.checkIfAccountManagementDisabled(
-                    getPrefContext(), mAccount.type, mUserHandle.getIdentifier());
+        if (!RestrictedLockUtils.hasBaseUserRestriction(getPrefContext(),
+                UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle.getIdentifier())) {
+            MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
+                    getString(R.string.remove_account_label))
+                    .setIcon(R.drawable.ic_menu_delete);
+            removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
+                    MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+            EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                    getPrefContext(), UserManager.DISALLOW_MODIFY_ACCOUNTS,
+                    mUserHandle.getIdentifier());
+            if (admin == null) {
+                admin = RestrictedLockUtils.checkIfAccountManagementDisabled(
+                        getPrefContext(), mAccount.type, mUserHandle.getIdentifier());
+            }
+            RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
+                    removeAccount, admin);
         }
-        RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
-                removeAccount, admin);
         syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         syncCancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index b67eb2b..76729ab 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -56,6 +56,7 @@
     protected static final boolean localLOGV = false;
 
     protected EnforcedAdmin mAppsControlDisallowedAdmin;
+    protected boolean mAppsControlDisallowedBySystem;
 
     protected ApplicationsState mState;
     protected ApplicationsState.Session mSession;
@@ -97,6 +98,8 @@
         mSession.resume();
         mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
                 UserManager.DISALLOW_APPS_CONTROL, mUserId);
+        mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_APPS_CONTROL, mUserId);
 
         if (!refreshUi()) {
             setIntentAndFinish(true, true);
diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java
index c7b78af..f1f0896 100644
--- a/src/com/android/settings/applications/AppStateNotificationBridge.java
+++ b/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -67,7 +67,7 @@
                 return false;
             }
             AppRow row = (AppRow) info.extraInfo;
-            return row.banned || row.bannedTopics;
+            return row.banned;
         }
     };
 }
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 34fc083..357ec1e 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -194,7 +194,7 @@
     @Override
     public void onClick(View v) {
         if (v == mClearCacheButton) {
-            if (mAppsControlDisallowedAdmin != null) {
+            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
                         getActivity(), mAppsControlDisallowedAdmin);
                 return;
@@ -203,7 +203,7 @@
             }
             mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver);
         } else if (v == mClearDataButton) {
-            if (mAppsControlDisallowedAdmin != null) {
+            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
                         getActivity(), mAppsControlDisallowedAdmin);
             } else if (mAppEntry.info.manageSpaceActivityName != null) {
@@ -219,7 +219,7 @@
         } else if (v == mChangeStorageButton && mDialogBuilder != null && !isMoveInProgress()) {
             mDialogBuilder.show();
         } else if (v == mClearUriButton) {
-            if (mAppsControlDisallowedAdmin != null) {
+            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
                         getActivity(), mAppsControlDisallowedAdmin);
             } else {
@@ -323,6 +323,10 @@
                 mClearCacheButton.setOnClickListener(this);
             }
         }
+        if (mAppsControlDisallowedBySystem) {
+            mClearCacheButton.setEnabled(false);
+            mClearDataButton.setEnabled(false);
+        }
     }
 
     @Override
@@ -369,6 +373,10 @@
             }
             mClearDataButton.setOnClickListener(this);
         }
+
+        if (mAppsControlDisallowedBySystem) {
+            mClearDataButton.setEnabled(false);
+        }
     }
 
     private void initMoveDialog() {
@@ -488,6 +496,10 @@
             mUri.addPreference(pref);
         }
 
+        if (mAppsControlDisallowedBySystem) {
+            mClearUriButton.setEnabled(false);
+        }
+
         mClearUri.setOrder(order);
         mClearUriButton.setVisibility(View.VISIBLE);
 
diff --git a/src/com/android/settings/applications/DefaultBrowserPreference.java b/src/com/android/settings/applications/DefaultBrowserPreference.java
index 32f77ba..a9a4e2a 100644
--- a/src/com/android/settings/applications/DefaultBrowserPreference.java
+++ b/src/com/android/settings/applications/DefaultBrowserPreference.java
@@ -25,6 +25,7 @@
 import android.util.AttributeSet;
 
 import com.android.settings.AppListPreference;
+import com.android.settings.PreferenceAvailabilityProvider;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -72,4 +73,11 @@
 
         return result;
     }
+
+    public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
+        @Override
+        public boolean isAvailable(Context context) {
+            return true;
+        }
+    }
 }
diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
index 7c9b124..bb6e84d 100644
--- a/src/com/android/settings/applications/DefaultEmergencyPreference.java
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -32,6 +32,7 @@
 import android.util.AttributeSet;
 
 import com.android.settings.AppListPreference;
+import com.android.settings.PreferenceAvailabilityProvider;
 import com.android.settings.Utils;
 
 import java.util.List;
@@ -51,10 +52,7 @@
     public DefaultEmergencyPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContentResolver = context.getContentResolver();
-
-        if (isAvailable(context)) {
-            load();
-        }
+        load();
     }
 
     @Override
@@ -135,13 +133,7 @@
         return packages;
     }
 
-    public static boolean isAvailable(Context context) {
-        return isCapable(context)
-                && context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null
-                && !Utils.isManagedProfile(UserManager.get(context)) ;
-    }
-
-    public static boolean isCapable(Context context) {
+    private static boolean isCapable(Context context) {
         return TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED
                 && context.getResources().getBoolean(
                 com.android.internal.R.bool.config_voice_capable);
@@ -151,4 +143,13 @@
         return info.applicationInfo != null
                 && (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
     }
+
+    public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
+        @Override
+        public boolean isAvailable(Context context) {
+            return isCapable(context)
+                    && context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null
+                    && !Utils.isManagedProfile(UserManager.get(context));
+        }
+    }
 }
diff --git a/src/com/android/settings/applications/DefaultHomePreference.java b/src/com/android/settings/applications/DefaultHomePreference.java
index 7426ce6..2837a97 100644
--- a/src/com/android/settings/applications/DefaultHomePreference.java
+++ b/src/com/android/settings/applications/DefaultHomePreference.java
@@ -26,8 +26,11 @@
 import android.os.Build;
 import android.os.UserManager;
 import android.util.AttributeSet;
+
 import com.android.settings.AppListPreference;
+import com.android.settings.PreferenceAvailabilityProvider;
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -115,4 +118,10 @@
         return false;
     }
 
+    public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
+        @Override
+        public boolean isAvailable(Context context) {
+            return !Utils.isManagedProfile(UserManager.get(context));
+        }
+    }
 }
diff --git a/src/com/android/settings/applications/DefaultNotificationAssistantPreference.java b/src/com/android/settings/applications/DefaultNotificationAssistantPreference.java
index 186c442..ab3a0b2 100644
--- a/src/com/android/settings/applications/DefaultNotificationAssistantPreference.java
+++ b/src/com/android/settings/applications/DefaultNotificationAssistantPreference.java
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.android.settings.PreferenceAvailabilityProvider;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.notification.ManagedServiceSettings;
@@ -111,7 +112,10 @@
         return c;
     }
 
-    public static boolean isAvailable(Context context) {
-        return !Utils.isManagedProfile(UserManager.get(context));
+    public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
+        @Override
+        public boolean isAvailable(Context context) {
+            return !Utils.isManagedProfile(UserManager.get(context));
+        }
     }
 }
diff --git a/src/com/android/settings/applications/DefaultPhonePreference.java b/src/com/android/settings/applications/DefaultPhonePreference.java
index 3d9131e..7ab6325 100644
--- a/src/com/android/settings/applications/DefaultPhonePreference.java
+++ b/src/com/android/settings/applications/DefaultPhonePreference.java
@@ -25,6 +25,8 @@
 import android.util.AttributeSet;
 
 import com.android.settings.AppListPreference;
+import com.android.settings.PreferenceAvailabilityProvider;
+import com.android.settings.Utils;
 
 import java.util.List;
 import java.util.Objects;
@@ -36,9 +38,7 @@
         super(context, attrs);
 
         mContext = context.getApplicationContext();
-        if (isAvailable(context)) {
-            loadDialerApps();
-        }
+        loadDialerApps();
     }
 
     @Override
@@ -65,15 +65,19 @@
         return DefaultDialerManager.getDefaultDialerApplication(getContext());
     }
 
-    public static boolean isAvailable(Context context) {
-        final TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        if (!tm.isVoiceCapable()) {
-            return false;
-        }
+    public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
+        @Override
+        public boolean isAvailable(Context context) {
 
-        final UserManager um =
-                (UserManager) context.getSystemService(Context.USER_SERVICE);
-        return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
+            final TelephonyManager tm =
+                    (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+            if (!tm.isVoiceCapable()) {
+                return false;
+            }
+
+            final UserManager um =
+                    (UserManager) context.getSystemService(Context.USER_SERVICE);
+            return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
+        }
     }
 }
diff --git a/src/com/android/settings/applications/DefaultSmsPreference.java b/src/com/android/settings/applications/DefaultSmsPreference.java
index 7281394..73404bb 100644
--- a/src/com/android/settings/applications/DefaultSmsPreference.java
+++ b/src/com/android/settings/applications/DefaultSmsPreference.java
@@ -17,6 +17,7 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -25,6 +26,7 @@
 import com.android.internal.telephony.SmsApplication;
 import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.settings.AppListPreference;
+import com.android.settings.PreferenceAvailabilityProvider;
 import com.android.settings.Utils;
 
 import java.util.Collection;
@@ -68,10 +70,18 @@
         return true;
     }
 
-    public static boolean isAvailable(Context context) {
-        TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        return tm.isSmsCapable() && !Utils.isManagedProfile(UserManager.get(context));
+    public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
+        @Override
+        public boolean isAvailable(Context context) {
+            boolean isRestrictedUser =
+                    UserManager.get(context)
+                            .getUserInfo(UserHandle.myUserId()).isRestricted();
+            TelephonyManager tm =
+                    (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+            return !isRestrictedUser
+                    && tm.isSmsCapable()
+                    && !Utils.isManagedProfile(UserManager.get(context));
+        }
     }
 
 }
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index a8e8eae..7ba6c7f 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -250,6 +250,10 @@
             }
         }
 
+        if (mAppsControlDisallowedBySystem) {
+            enabled = false;
+        }
+
         mUninstallButton.setEnabled(enabled);
         if (enabled) {
             // Register listener
@@ -413,7 +417,7 @@
         menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(showIt);
         mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);
-        uninstallUpdatesItem.setVisible(mUpdatedSysApp);
+        uninstallUpdatesItem.setVisible(mUpdatedSysApp && !mAppsControlDisallowedBySystem);
         if (uninstallUpdatesItem.isVisible()) {
             RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getActivity(),
                     uninstallUpdatesItem, mAppsControlDisallowedAdmin);
@@ -673,8 +677,12 @@
     }
 
     private void updateForceStopButton(boolean enabled) {
-        mForceStopButton.setEnabled(enabled);
-        mForceStopButton.setOnClickListener(InstalledAppDetails.this);
+        if (mAppsControlDisallowedBySystem) {
+            mForceStopButton.setEnabled(false);
+        } else {
+            mForceStopButton.setEnabled(enabled);
+            mForceStopButton.setOnClickListener(InstalledAppDetails.this);
+        }
     }
 
     private void checkForceStop() {
@@ -740,7 +748,9 @@
             }
             EnforcedAdmin admin = RestrictedLockUtils.checkIfUninstallBlocked(getActivity(),
                     packageName, mUserId);
-            if (admin != null) {
+            boolean uninstallBlockedBySystem = mAppsControlDisallowedBySystem ||
+                    RestrictedLockUtils.hasBaseUserRestriction(getActivity(), packageName, mUserId);
+            if (admin != null && !uninstallBlockedBySystem) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(), admin);
             } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
                 if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
@@ -760,7 +770,7 @@
                 uninstallPkg(packageName, false, false);
             }
         } else if (v == mForceStopButton) {
-            if (mAppsControlDisallowedAdmin != null) {
+            if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
                 RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
                         getActivity(), mAppsControlDisallowedAdmin);
             } else {
@@ -842,8 +852,6 @@
     public static CharSequence getNotificationSummary(AppRow appRow, Context context) {
         if (appRow.banned) {
             return context.getString(R.string.notifications_disabled);
-        } else if (appRow.bannedTopics) {
-            return context.getString(R.string.notifications_partially_disabled);
         }
         return context.getString(R.string.notifications_enabled);
     }
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 0c2b966..f88a8ae 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -758,6 +758,7 @@
             protected void publishResults(CharSequence constraint, FilterResults results) {
                 mCurFilterPrefix = constraint;
                 mEntries = (ArrayList<ApplicationsState.AppEntry>) results.values;
+                rebuildSections();
                 notifyDataSetChanged();
             }
         };
@@ -891,43 +892,7 @@
             mBaseEntries = entries;
             if (mBaseEntries != null) {
                 mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);
-
-                if (mManageApplications.mListView.isFastScrollEnabled()) {
-                    // Rebuild sections
-                    if (mIndex == null) {
-                        LocaleList locales = mContext.getResources().getConfiguration().getLocales();
-                        if (locales.size() == 0) {
-                            locales = new LocaleList(Locale.ENGLISH);
-                        }
-                        AlphabeticIndex index = new AlphabeticIndex<>(locales.get(0));
-                        int localeCount = locales.size();
-                        for (int i = 1; i < localeCount; i++) {
-                            index.addLabels(locales.get(i));
-                        }
-                        // Ensure we always have some base English locale buckets
-                        index.addLabels(Locale.ENGLISH);
-                        mIndex = index.buildImmutableIndex();
-                    }
-
-                    ArrayList<SectionInfo> sections = new ArrayList<>();
-                    int lastSecId = -1;
-                    int totalEntries = mEntries.size();
-                    mPositionToSectionIndex = new int[totalEntries];
-
-                    for (int pos = 0; pos < totalEntries; pos++) {
-                        String label = mEntries.get(pos).label;
-                        int secId = mIndex.getBucketIndex(TextUtils.isEmpty(label) ? "" : label);
-                        if (secId != lastSecId) {
-                            lastSecId = secId;
-                            sections.add(new SectionInfo(mIndex.getBucket(secId).getLabel(), pos));
-                        }
-                        mPositionToSectionIndex[pos] = sections.size() - 1;
-                    }
-                    mSections = sections.toArray(EMPTY_SECTIONS);
-                } else {
-                    mSections = EMPTY_SECTIONS;
-                    mPositionToSectionIndex = null;
-                }
+                rebuildSections();
             } else {
                 mEntries = null;
                 mSections = EMPTY_SECTIONS;
@@ -949,6 +914,45 @@
             mManageApplications.setHasDisabled(mState.haveDisabledApps());
         }
 
+        private void rebuildSections() {
+            if (mEntries!= null && mManageApplications.mListView.isFastScrollEnabled()) {
+                // Rebuild sections
+                if (mIndex == null) {
+                    LocaleList locales = mContext.getResources().getConfiguration().getLocales();
+                    if (locales.size() == 0) {
+                        locales = new LocaleList(Locale.ENGLISH);
+                    }
+                    AlphabeticIndex index = new AlphabeticIndex<>(locales.get(0));
+                    int localeCount = locales.size();
+                    for (int i = 1; i < localeCount; i++) {
+                        index.addLabels(locales.get(i));
+                    }
+                    // Ensure we always have some base English locale buckets
+                    index.addLabels(Locale.ENGLISH);
+                    mIndex = index.buildImmutableIndex();
+                }
+
+                ArrayList<SectionInfo> sections = new ArrayList<>();
+                int lastSecId = -1;
+                int totalEntries = mEntries.size();
+                mPositionToSectionIndex = new int[totalEntries];
+
+                for (int pos = 0; pos < totalEntries; pos++) {
+                    String label = mEntries.get(pos).label;
+                    int secId = mIndex.getBucketIndex(TextUtils.isEmpty(label) ? "" : label);
+                    if (secId != lastSecId) {
+                        lastSecId = secId;
+                        sections.add(new SectionInfo(mIndex.getBucket(secId).getLabel(), pos));
+                    }
+                    mPositionToSectionIndex[pos] = sections.size() - 1;
+                }
+                mSections = sections.toArray(EMPTY_SECTIONS);
+            } else {
+                mSections = EMPTY_SECTIONS;
+                mPositionToSectionIndex = null;
+            }
+        }
+
         private void updateLoading() {
             Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
                     mManageApplications.mListContainer,
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java
index fca124f..5a17a31 100644
--- a/src/com/android/settings/applications/ManageAssist.java
+++ b/src/com/android/settings/applications/ManageAssist.java
@@ -28,6 +28,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.PreferenceAvailabilityProvider;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -179,7 +180,10 @@
         updateUi();
     }
 
-    public static boolean isAvailable(Context context) {
-        return !Utils.isManagedProfile(UserManager.get(context));
+    public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
+        @Override
+        public boolean isAvailable(Context context) {
+            return !Utils.isManagedProfile(UserManager.get(context));
+        }
     }
 }
diff --git a/src/com/android/settings/applications/ManageDefaultApps.java b/src/com/android/settings/applications/ManageDefaultApps.java
index b421c9d..327c98b 100644
--- a/src/com/android/settings/applications/ManageDefaultApps.java
+++ b/src/com/android/settings/applications/ManageDefaultApps.java
@@ -24,15 +24,17 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
+import android.support.v4.util.ArrayMap;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.PreferenceAvailabilityProvider;
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
@@ -48,18 +50,23 @@
 
     private static final String TAG = ManageDefaultApps.class.getSimpleName();
 
+    private static final String KEY_DEFAULT_HOME = "default_home";
     private static final String KEY_ASSIST_AND_VOICE_INPUT = "assist_and_voice_input";
     private static final String KEY_DEFAULT_BROWSER = "default_browser";
     private static final String KEY_DEFAULT_PHONE_APP = "default_phone_app";
     private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
     private static final String KEY_SMS_APPLICATION = "default_sms_app";
     private static final String KEY_DEFAULT_NOTIFICATION_ASST = "default_notification_asst_app";
+    private static final String[] PREFERENCE_KEYS = new String[] {
+            KEY_DEFAULT_HOME, KEY_ASSIST_AND_VOICE_INPUT, KEY_DEFAULT_BROWSER,
+            KEY_DEFAULT_PHONE_APP, KEY_DEFAULT_EMERGENCY_APP, KEY_SMS_APPLICATION,
+            KEY_DEFAULT_NOTIFICATION_ASST
+    };
 
     private DefaultBrowserPreference mDefaultBrowserPreference;
     private PackageManager mPm;
     private int myUserId;
 
-
     private static final long DELAY_UPDATE_BROWSER_MILLIS = 500;
 
     private final Handler mHandler = new Handler();
@@ -140,6 +147,7 @@
                 new Preference.OnPreferenceChangeListener() {
                     @Override
                     public boolean onPreferenceChange(Preference preference, Object newValue) {
+
                         if (newValue == null) {
                             return false;
                         }
@@ -157,35 +165,65 @@
                         return result;
                     }
                 });
-        final boolean isRestrictedUser = UserManager.get(getActivity())
-                .getUserInfo(myUserId).isRestricted();
 
-        // Restricted users cannot currently read/write SMS.
-        // Remove SMS Application if the device does not support SMS
-        if (isRestrictedUser || !DefaultSmsPreference.isAvailable(getActivity())) {
-            removePreference(KEY_SMS_APPLICATION);
-        }
+        updatePreferenceVisibility();
+        // Update the index.
+        Index.getInstance(getActivity()).updateFromClassNameResource(
+                ManageDefaultApps.class.getName(), true, true);
+    }
 
-        if (!DefaultPhonePreference.isAvailable(getActivity())) {
-            removePreference(KEY_DEFAULT_PHONE_APP);
+    /**
+     * Iterate all preferences and hide it if it is unavailable.
+     */
+    private void updatePreferenceVisibility() {
+        PreferenceScreen preferenceScreen = getPreferenceScreen();
+        int count = preferenceScreen.getPreferenceCount();
+        List<String> preferenceKeys = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            String preferenceKey = preferenceScreen.getPreference(i).getKey();
+            if (!TextUtils.isEmpty(preferenceKey)) {
+                preferenceKeys.add(preferenceKey);
+            }
         }
+        for (String preferenceKey : preferenceKeys) {
+            boolean isAvailable = getPreferenceAvailability(getContext(), preferenceKey);
+            if (!isAvailable) {
+                Preference preference = preferenceScreen.findPreference(preferenceKey);
+                preferenceScreen.removePreference(preference);
+            }
+        }
+    }
 
-        if (!DefaultEmergencyPreference.isAvailable(getActivity())) {
-            removePreference(KEY_DEFAULT_EMERGENCY_APP);
-        }
+    /**
+     * Get availability of preference from {@link PreferenceAvailabilityProvider}.
+     */
+    private static boolean getPreferenceAvailability(Context context,
+                                              String preferenceKey) {
+        // Consider the preference is unavailable if no corresponding provider is found.
+        PreferenceAvailabilityProvider provider = getPreferenceAvailabilityProvider(preferenceKey);
+        return (provider == null) ? false : provider.isAvailable(context);
+    }
 
-        if (!ManageAssist.isAvailable(getActivity())) {
-            removePreference(KEY_ASSIST_AND_VOICE_INPUT);
+    private static PreferenceAvailabilityProvider getPreferenceAvailabilityProvider(
+            String preferenceKey) {
+        switch (preferenceKey) {
+            case KEY_ASSIST_AND_VOICE_INPUT:
+                return new ManageAssist.AvailabilityProvider();
+            case KEY_DEFAULT_BROWSER:
+                return new DefaultBrowserPreference.AvailabilityProvider();
+            case KEY_DEFAULT_EMERGENCY_APP:
+                return new DefaultEmergencyPreference.AvailabilityProvider();
+            case KEY_DEFAULT_HOME:
+                return new DefaultHomePreference.AvailabilityProvider();
+            case KEY_DEFAULT_NOTIFICATION_ASST:
+                return new DefaultNotificationAssistantPreference.AvailabilityProvider();
+            case KEY_DEFAULT_PHONE_APP:
+                return new DefaultPhonePreference.AvailabilityProvider();
+            case KEY_SMS_APPLICATION:
+                return new DefaultSmsPreference.AvailabilityProvider();
         }
-
-        if (!DefaultNotificationAssistantPreference.isAvailable(getActivity())) {
-            removePreference(KEY_DEFAULT_NOTIFICATION_ASST);
-        }
-
-        if (DefaultEmergencyPreference.isCapable(getActivity())) {
-            Index.getInstance(getActivity()).updateFromClassNameResource(
-                    ManageDefaultApps.class.getName(), true, true);
-        }
+        Log.w(TAG, "getPreferenceAvailabilityProvider: Cannot find provider for " + preferenceKey);
+        return null;
     }
 
     @Override
@@ -224,19 +262,14 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    final ArrayList<String> result = new ArrayList<String>();
-
-                    // Remove SMS Application if the device does not support SMS
-                    final boolean isRestrictedUser = UserManager.get(context)
-                            .getUserInfo(UserHandle.myUserId()).isRestricted();
-                    if (!DefaultSmsPreference.isAvailable(context) || isRestrictedUser) {
-                        result.add(KEY_SMS_APPLICATION);
+                    // Iterate all preferences to see which is not available.
+                    final ArrayList<String> result = new ArrayList<>();
+                    for (String key : PREFERENCE_KEYS) {
+                        boolean isAvailable = getPreferenceAvailability(context, key);
+                        if (!isAvailable) {
+                            result.add(key);
+                        }
                     }
-
-                    if (!DefaultEmergencyPreference.isAvailable(context)) {
-                        result.add(KEY_DEFAULT_EMERGENCY_APP);
-                    }
-
                     return result;
                 }
             };
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 244b5ee..9aa14fc 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -34,7 +34,6 @@
 import android.text.Spannable;
 import android.text.style.TextAppearanceSpan;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -171,6 +170,9 @@
 
         if (isUiRestricted()) {
             setDeviceListGroup(getPreferenceScreen());
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.bluetooth_empty_list_user_restricted);
+            }
             removeAllDevices();
             return;
         }
@@ -294,6 +296,7 @@
                 mDevicePreferenceMap.clear();
 
                 if (isUiRestricted()) {
+                    messageId = R.string.bluetooth_empty_list_user_restricted;
                     break;
                 }
 
@@ -355,7 +358,7 @@
             case BluetoothAdapter.STATE_OFF:
                 setOffMessage();
                 if (isUiRestricted()) {
-                    messageId = 0;
+                    messageId = R.string.bluetooth_empty_list_user_restricted;
                 }
                 break;
 
@@ -375,18 +378,6 @@
         }
     }
 
-    @Override
-    protected TextView initEmptyTextView() {
-        TextView textView = (TextView) getView().findViewById(android.R.id.empty);
-        textView.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
-        return textView;
-    }
-
-    @Override
-    protected View initAdminSupportDetailsView() {
-        return getActivity().findViewById(R.id.admin_support_details);
-    }
-
     private void setOffMessage() {
         final TextView emptyView = getEmptyTextView();
         if (emptyView == null) {
diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
index d465942..7d617b7 100644
--- a/src/com/android/settings/dashboard/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -20,12 +20,14 @@
 import android.app.IWallpaperManagerCallback;
 import android.app.KeyguardManager;
 import android.app.NotificationManager;
+import android.app.WallpaperManager;
 import android.content.Context;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+
 import com.android.ims.ImsManager;
 import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
 import com.android.settings.Settings.FingerprintSuggestionActivity;
@@ -98,7 +100,8 @@
         IBinder b = ServiceManager.getService(Context.WALLPAPER_SERVICE);
         IWallpaperManager service = Stub.asInterface(b);
         try {
-            return service.getWallpaper(mCallback, new Bundle()) != null;
+            return service.getWallpaper(mCallback, WallpaperManager.FLAG_SET_SYSTEM,
+                    new Bundle(), mContext.getUserId()) != null;
         } catch (RemoteException e) {
         }
         return false;
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 3875885..b6eedc3 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -39,7 +39,11 @@
 
     public void setStorageSize(long size, long total) {
         setSummary(Formatter.formatFileSize(getContext(), size));
-        progress = (int)(size * PROGRESS_MAX / total);
+        if (total == 0) {
+            progress = 0;
+        } else {
+            progress = (int)(size * PROGRESS_MAX / total);
+        }
         updateProgressBar();
     }
 
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 5e0aacc..277f59f 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -395,7 +395,10 @@
                     EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
                             getActivity(), UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA,
                             UserHandle.myUserId());
-                    if (admin != null) {
+                    boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(
+                            getActivity(), UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA,
+                            UserHandle.myUserId());
+                    if (admin != null && !hasBaseUserRestriction) {
                         RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(), admin);
                         return;
                     }
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
index fffdf74..69247f6 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
@@ -86,6 +86,8 @@
         switch (returnCode) {
             case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
                 return getString(R.string.insufficient_storage);
+            case PackageManager.MOVE_FAILED_DEVICE_ADMIN:
+                return getString(R.string.move_error_device_admin);
             case PackageManager.MOVE_FAILED_DOESNT_EXIST:
                 return getString(R.string.does_not_exist);
             case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
index 53895fe..cd88709 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -22,6 +22,7 @@
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
 import android.hardware.usb.UsbPortStatus;
+import android.os.UserHandle;
 import android.os.UserManager;
 
 public class UsbBackend {
@@ -37,6 +38,7 @@
     public static final int MODE_DATA_MIDI   = 0x03 << 1;
 
     private final boolean mRestricted;
+    private final boolean mRestrictedBySystem;
     private final boolean mMidi;
 
     private UserManager mUserManager;
@@ -56,6 +58,8 @@
         mUsbManager = context.getSystemService(UsbManager.class);
 
         mRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
+        mRestrictedBySystem = mUserManager.hasBaseUserRestriction(
+                UserManager.DISALLOW_USB_FILE_TRANSFER, UserHandle.of(UserHandle.myUserId()));
         mMidi = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI);
 
         UsbPort[] ports = mUsbManager.getPorts();
@@ -134,7 +138,7 @@
                     ? UsbPort.POWER_ROLE_SOURCE : UsbPort.POWER_ROLE_SINK;
     }
 
-    public boolean isModeDisallowedByAdmin(int mode) {
+    public boolean isModeDisallowed(int mode) {
         if (mRestricted && (mode & MODE_DATA_MASK) != MODE_DATA_NONE
                 && (mode & MODE_DATA_MASK) != MODE_DATA_MIDI) {
             // No USB data modes are supported.
@@ -143,6 +147,15 @@
         return false;
     }
 
+    public boolean isModeDisallowedBySystem(int mode) {
+        if (mRestrictedBySystem && (mode & MODE_DATA_MASK) != MODE_DATA_NONE
+                && (mode & MODE_DATA_MASK) != MODE_DATA_MIDI) {
+            // No USB data modes are supported.
+            return true;
+        }
+        return false;
+    }
+
     public boolean isModeSupported(int mode) {
         if (!mMidi && (mode & MODE_DATA_MASK) == MODE_DATA_MIDI) {
             return false;
diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index c2f9477..e1f8950 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -106,9 +106,10 @@
         mBackend = new UsbBackend(this);
         int current = mBackend.getCurrentMode();
         for (int i = 0; i < DEFAULT_MODES.length; i++) {
-            if (mBackend.isModeSupported(DEFAULT_MODES[i])) {
+            if (mBackend.isModeSupported(DEFAULT_MODES[i])
+                    && !mBackend.isModeDisallowedBySystem(DEFAULT_MODES[i])) {
                 inflateOption(DEFAULT_MODES[i], current == DEFAULT_MODES[i], container,
-                        mBackend.isModeDisallowedByAdmin(DEFAULT_MODES[i]));
+                        mBackend.isModeDisallowed(DEFAULT_MODES[i]));
             }
         }
     }
diff --git a/src/com/android/settings/display/ConversationMessageView.java b/src/com/android/settings/display/ConversationMessageView.java
new file mode 100644
index 0000000..a0889c4
--- /dev/null
+++ b/src/com/android/settings/display/ConversationMessageView.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * The view for a single entry in a conversation. This is a simplified version of
+ * com.android.messaging.ui.conversation.ConversationMessageView class.
+ */
+public class ConversationMessageView extends FrameLayout {
+    private final boolean mIncoming;
+    private final CharSequence mMessageText;
+    private final CharSequence mTimestampText;
+    private final CharSequence mIconText;
+    private final int mIconTextColor;
+    private final int mIconBackgroundColor;
+
+    private LinearLayout mMessageBubble;
+    private ViewGroup mMessageTextAndInfoView;
+    private TextView mMessageTextView;
+    private TextView mStatusTextView;
+    private TextView mContactIconView;
+
+    public ConversationMessageView(Context context) {
+        this(context, null);
+    }
+
+    public ConversationMessageView(final Context context, final AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ConversationMessageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public ConversationMessageView(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        final TypedArray a = context.obtainStyledAttributes(attrs,
+                R.styleable.ConversationMessageView);
+
+        mIncoming = a.getBoolean(R.styleable.ConversationMessageView_incoming, true);
+        mMessageText = a.getString(R.styleable.ConversationMessageView_messageText);
+        mTimestampText = a.getString(R.styleable.ConversationMessageView_timestampText);
+        mIconText = a.getString(R.styleable.ConversationMessageView_iconText);
+        mIconTextColor = a.getColor(R.styleable.ConversationMessageView_iconTextColor, 0);
+        mIconBackgroundColor = a.getColor(R.styleable.ConversationMessageView_iconBackgroundColor,
+                0);
+
+        LayoutInflater.from(context).inflate(R.layout.conversation_message_icon, this);
+        LayoutInflater.from(context).inflate(R.layout.conversation_message_content, this);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        mMessageBubble = (LinearLayout) findViewById(R.id.message_content);
+        mMessageTextAndInfoView = (ViewGroup) findViewById(R.id.message_text_and_info);
+        mMessageTextView = (TextView) findViewById(R.id.message_text);
+        mStatusTextView = (TextView) findViewById(R.id.message_status);
+        mContactIconView = (TextView) findViewById(R.id.conversation_icon);
+        updateViewContent();
+    }
+
+    @Override
+    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
+        updateViewAppearance();
+
+        final int horizontalSpace = MeasureSpec.getSize(widthMeasureSpec);
+        final int iconSize = getResources()
+                .getDimensionPixelSize(R.dimen.conversation_message_contact_icon_size);
+
+        final int unspecifiedMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+        final int iconMeasureSpec = MeasureSpec.makeMeasureSpec(iconSize, MeasureSpec.EXACTLY);
+
+        mContactIconView.measure(iconMeasureSpec, iconMeasureSpec);
+
+        final int arrowWidth =
+                getResources().getDimensionPixelSize(R.dimen.message_bubble_arrow_width);
+
+        // We need to subtract contact icon width twice from the horizontal space to get
+        // the max leftover space because we want the message bubble to extend no further than the
+        // starting position of the message bubble in the opposite direction.
+        final int maxLeftoverSpace = horizontalSpace - mContactIconView.getMeasuredWidth() * 2
+                - arrowWidth - getPaddingLeft() - getPaddingRight();
+        final int messageContentWidthMeasureSpec = MeasureSpec.makeMeasureSpec(maxLeftoverSpace,
+                MeasureSpec.AT_MOST);
+
+        mMessageBubble.measure(messageContentWidthMeasureSpec, unspecifiedMeasureSpec);
+
+        final int maxHeight = Math.max(mContactIconView.getMeasuredHeight(),
+                mMessageBubble.getMeasuredHeight());
+        setMeasuredDimension(horizontalSpace, maxHeight + getPaddingBottom() + getPaddingTop());
+    }
+
+    @Override
+    protected void onLayout(final boolean changed, final int left, final int top, final int right,
+            final int bottom) {
+        final boolean isRtl = isLayoutRtl(this);
+
+        final int iconWidth = mContactIconView.getMeasuredWidth();
+        final int iconHeight = mContactIconView.getMeasuredHeight();
+        final int iconTop = getPaddingTop();
+        final int contentWidth = (right -left) - iconWidth - getPaddingLeft() - getPaddingRight();
+        final int contentHeight = mMessageBubble.getMeasuredHeight();
+        final int contentTop = iconTop;
+
+        final int iconLeft;
+        final int contentLeft;
+
+        if (mIncoming) {
+            if (isRtl) {
+                iconLeft = (right - left) - getPaddingRight() - iconWidth;
+                contentLeft = iconLeft - contentWidth;
+            } else {
+                iconLeft = getPaddingLeft();
+                contentLeft = iconLeft + iconWidth;
+            }
+        } else {
+            if (isRtl) {
+                iconLeft = getPaddingLeft();
+                contentLeft = iconLeft + iconWidth;
+            } else {
+                iconLeft = (right - left) - getPaddingRight() - iconWidth;
+                contentLeft = iconLeft - contentWidth;
+            }
+        }
+
+        mContactIconView.layout(iconLeft, iconTop, iconLeft + iconWidth, iconTop + iconHeight);
+
+        mMessageBubble.layout(contentLeft, contentTop, contentLeft + contentWidth,
+                contentTop + contentHeight);
+    }
+
+    private static boolean isLayoutRtl(final View view) {
+        return View.LAYOUT_DIRECTION_RTL == view.getLayoutDirection();
+    }
+
+    private void updateViewContent() {
+        mMessageTextView.setText(mMessageText);
+        mStatusTextView.setText(mTimestampText);
+        mContactIconView.setText(mIconText);
+
+        mContactIconView.setTextColor(mIconTextColor);
+        final Drawable iconBase = getContext().getDrawable(R.drawable.conversation_message_icon);
+        mContactIconView
+                .setBackground(getTintedDrawable(getContext(), iconBase, mIconBackgroundColor));
+    }
+
+    private void updateViewAppearance() {
+        final Resources res = getResources();
+
+        final int arrowWidth = res.getDimensionPixelOffset(
+                R.dimen.message_bubble_arrow_width);
+        final int messageTextLeftRightPadding = res.getDimensionPixelOffset(
+                R.dimen.message_text_left_right_padding);
+        final int textTopPadding = res.getDimensionPixelOffset(
+                R.dimen.message_text_top_padding);
+        final int textBottomPadding = res.getDimensionPixelOffset(
+                R.dimen.message_text_bottom_padding);
+
+        final int textLeftPadding, textRightPadding;
+
+        if (mIncoming) {
+            textLeftPadding = messageTextLeftRightPadding + arrowWidth;
+            textRightPadding = messageTextLeftRightPadding;
+        } else {
+            textLeftPadding = messageTextLeftRightPadding;
+            textRightPadding = messageTextLeftRightPadding + arrowWidth;
+        }
+
+        // These values do not depend on whether the message includes attachments
+        final int gravity = mIncoming ? (Gravity.START | Gravity.CENTER_VERTICAL) :
+                (Gravity.END | Gravity.CENTER_VERTICAL);
+        final int messageTopPadding = res.getDimensionPixelSize(
+                R.dimen.message_padding_default);
+        final int metadataTopPadding =  res.getDimensionPixelOffset(
+                R.dimen.message_metadata_top_padding);
+
+        // Update the message text/info views
+        final int bubbleDrawableResId = mIncoming ? R.drawable.msg_bubble_incoming
+                : R.drawable.msg_bubble_outgoing;
+        final int bubbleColorResId = mIncoming ? R.color.message_bubble_incoming
+                : R.color.message_bubble_outgoing;
+        final Context context = getContext();
+
+        final Drawable textBackgroundDrawable = getTintedDrawable(context,
+                context.getDrawable(bubbleDrawableResId),
+                context.getColor(bubbleColorResId));
+        mMessageTextAndInfoView.setBackground(textBackgroundDrawable);
+
+        if (isLayoutRtl(this)) {
+            // Need to switch right and left padding in RtL mode
+            mMessageTextAndInfoView.setPadding(textRightPadding,
+                    textTopPadding + metadataTopPadding,
+                    textLeftPadding, textBottomPadding);
+        } else {
+            mMessageTextAndInfoView.setPadding(textLeftPadding,
+                    textTopPadding + metadataTopPadding,
+                    textRightPadding, textBottomPadding);
+        }
+
+        // Update the message row and message bubble views
+        setPadding(getPaddingLeft(), messageTopPadding, getPaddingRight(), 0);
+        mMessageBubble.setGravity(gravity);
+
+        updateTextAppearance();
+    }
+
+    private void updateTextAppearance() {
+        final int messageColorResId = (mIncoming ? R.color.message_text_incoming
+                : R.color.message_text_outgoing);
+        final int timestampColorResId = mIncoming ? R.color.timestamp_text_incoming
+                : R.color.timestamp_text_outgoing;
+        final int messageColor = getContext().getColor(messageColorResId);
+
+        mMessageTextView.setTextColor(messageColor);
+        mMessageTextView.setLinkTextColor(messageColor);
+        mStatusTextView.setTextColor(timestampColorResId);
+    }
+
+    private static Drawable getTintedDrawable(final Context context, final Drawable drawable,
+            final int color) {
+        // For some reason occassionally drawables on JB has a null constant state
+        final Drawable.ConstantState constantStateDrawable = drawable.getConstantState();
+        final Drawable retDrawable = (constantStateDrawable != null)
+                ? constantStateDrawable.newDrawable(context.getResources()).mutate()
+                : drawable;
+        retDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        return retDrawable;
+    }
+}
diff --git a/src/com/android/settings/display/DisplayDensityUtils.java b/src/com/android/settings/display/DisplayDensityUtils.java
index cef5418..891b7fb 100644
--- a/src/com/android/settings/display/DisplayDensityUtils.java
+++ b/src/com/android/settings/display/DisplayDensityUtils.java
@@ -116,7 +116,8 @@
         if (numSmaller > 0) {
             final float interval = (1 - minScale) / numSmaller;
             for (int i = numSmaller - 1; i >= 0; i--) {
-                final int density = (int) (normalDensity * (1 - (i + 1) * interval));
+                // Round down to a multiple of 2 by truncating the low bit.
+                final int density = ((int) (normalDensity * (1 - (i + 1) * interval))) & ~1;
                 if (currentDensity == density) {
                     currentDensityIndex = curIndex;
                 }
@@ -136,7 +137,8 @@
         if (numLarger > 0) {
             final float interval = (maxScale - 1) / numLarger;
             for (int i = 0; i < numLarger; i++) {
-                final int density = (int) (normalDensity * (1 + (i + 1) * interval));
+                // Round down to a multiple of 2 by truncating the low bit.
+                final int density = ((int) (normalDensity * (1 + (i + 1) * interval))) & ~1;
                 if (currentDensity == density) {
                     currentDensityIndex = curIndex;
                 }
diff --git a/src/com/android/settings/display/MessageBubbleBackground.java b/src/com/android/settings/display/MessageBubbleBackground.java
new file mode 100644
index 0000000..b2e1e97
--- /dev/null
+++ b/src/com/android/settings/display/MessageBubbleBackground.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+
+public class MessageBubbleBackground extends LinearLayout {
+    private final  int mSnapWidthPixels;
+
+    public MessageBubbleBackground(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mSnapWidthPixels = context.getResources().getDimensionPixelSize(
+                R.dimen.conversation_bubble_width_snap);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        final int widthPadding = getPaddingLeft() + getPaddingRight();
+        int bubbleWidth = getMeasuredWidth() - widthPadding;
+        final int maxWidth = MeasureSpec.getSize(widthMeasureSpec) - widthPadding;
+        // Round up to next snapWidthPixels
+        bubbleWidth = Math.min(maxWidth,
+                (int) (Math.ceil(bubbleWidth / (float) mSnapWidthPixels) * mSnapWidthPixels));
+        super.onMeasure(
+                MeasureSpec.makeMeasureSpec(bubbleWidth + widthPadding, MeasureSpec.EXACTLY),
+                heightMeasureSpec);
+        Log.w(this.getClass().getSimpleName(),
+                String.format("onMeasure called; width:%d, height:%d", this.getMeasuredWidth(),
+                        this.getMeasuredHeight()));
+    }
+}
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index 406c993..d87f230 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -50,7 +50,7 @@
         // This should be replaced once the final preview sample screen is in place.
         mPreviewSampleResIds = new int[]{R.layout.screen_zoom_preview_1,
                 R.layout.screen_zoom_preview_2,
-                R.layout.screen_zoom_preview_3};
+                R.layout.screen_zoom_preview_settings};
 
         final DisplayDensityUtils density = new DisplayDensityUtils(getContext());
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 7148bd5..2656f17 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -168,15 +168,30 @@
     @Override
     protected void onStop() {
         super.onStop();
-        mSidecar.setListener(null);
+        if (mSidecar != null) {
+            mSidecar.setListener(null);
+        }
         stopIconAnimation();
         if (!isChangingConfigurations()) {
-            mSidecar.cancelEnrollment();
-            getFragmentManager().beginTransaction().remove(mSidecar).commit();
+            if (mSidecar != null) {
+                mSidecar.cancelEnrollment();
+                getFragmentManager().beginTransaction().remove(mSidecar).commit();
+            }
             finish();
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        if (mSidecar != null) {
+            mSidecar.setListener(null);
+            mSidecar.cancelEnrollment();
+            getFragmentManager().beginTransaction().remove(mSidecar).commit();
+            mSidecar = null;
+        }
+        super.onBackPressed();
+    }
+
     private void animateProgress(int progress) {
         if (mProgressAnim != null) {
             mProgressAnim.cancel();
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index b2b4c54..3b00168 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -38,6 +38,7 @@
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceGroup;
@@ -66,6 +67,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SubSettings;
+import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.List;
@@ -638,12 +640,15 @@
                         mFp.getFingerId());
                 FingerprintSettingsFragment parent
                         = (FingerprintSettingsFragment) getTargetFragment();
-                if (parent.mFingerprintManager.getEnrolledFingerprints().size() > 1) {
+                final boolean isProfileChallengeUser =
+                        Utils.isManagedProfile(UserManager.get(getContext()), parent.mUserId);
+                if (parent.mFingerprintManager.getEnrolledFingerprints(parent.mUserId).size() > 1) {
                     parent.deleteFingerPrint(mFp);
                 } else {
                     ConfirmLastDeleteDialog lastDeleteDialog = new ConfirmLastDeleteDialog();
                     Bundle args = new Bundle();
                     args.putParcelable("fingerprint", mFp);
+                    args.putBoolean("isProfileChallengeUser", isProfileChallengeUser);
                     lastDeleteDialog.setArguments(args);
                     lastDeleteDialog.setTargetFragment(getTargetFragment(), 0);
                     lastDeleteDialog.show(getFragmentManager(),
@@ -671,9 +676,13 @@
             @Override
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 mFp = getArguments().getParcelable("fingerprint");
+                final boolean isProfileChallengeUser =
+                        getArguments().getBoolean("isProfileChallengeUser");
                 final AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
                         .setTitle(R.string.fingerprint_last_delete_title)
-                        .setMessage(R.string.fingerprint_last_delete_message)
+                        .setMessage((isProfileChallengeUser)
+                                ? R.string.fingerprint_last_delete_message_profile_challenge
+                                : R.string.fingerprint_last_delete_message)
                         .setPositiveButton(R.string.fingerprint_last_delete_confirm,
                                 new DialogInterface.OnClickListener() {
                                     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index 461c498..7aafeba 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -17,17 +17,17 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryStats;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
-import android.view.ViewGroup;
-
+import android.widget.TextView;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settingslib.BatteryInfo;
+import com.android.settingslib.graph.UsageView;
 
 /**
  * Custom preference for displaying power consumption as a bar and an icon on the left for the
@@ -38,73 +38,41 @@
 
     protected static final String BATTERY_HISTORY_FILE = "tmp_bat_history.bin";
 
-    private BatteryStats mStats;
-    private Intent mBatteryBroadcast;
-
-    private BatteryHistoryChart mChart;
     private BatteryStatsHelper mHelper;
+    private BatteryInfo mBatteryInfo;
 
     public BatteryHistoryPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setLayoutResource(R.layout.battery_usage_graph);
     }
-    
+
     @Override
     protected void onClick() {
-        if (!isEnabled()) {
-            return;
-        }
         mHelper.storeStatsHistoryInFile(BATTERY_HISTORY_FILE);
         Bundle args = new Bundle();
         args.putString(BatteryHistoryDetail.EXTRA_STATS, BATTERY_HISTORY_FILE);
-        args.putParcelable(BatteryHistoryDetail.EXTRA_BROADCAST,
-                mHelper.getBatteryBroadcast());
-        if (getContext() instanceof SettingsActivity) {
-            SettingsActivity sa = (SettingsActivity) getContext();
-            sa.startPreferencePanel(BatteryHistoryDetail.class.getName(), args,
-                    R.string.history_details_title, null, null, 0);
-        }
+        args.putParcelable(BatteryHistoryDetail.EXTRA_BROADCAST, mHelper.getBatteryBroadcast());
+        Utils.startWithFragment(getContext(), BatteryHistoryDetail.class.getName(), args,
+                null, 0, R.string.history_details_title, null);
     }
 
     public void setStats(BatteryStatsHelper batteryStats) {
-        // Clear out the chart to receive new data.
-        mChart = null;
         mHelper = batteryStats;
-        mStats = batteryStats.getStats();
-        mBatteryBroadcast = batteryStats.getBatteryBroadcast();
-        if (getLayoutResource() != R.layout.battery_history_chart) {
-            // Now we should have some data, set the layout we want.
-            setLayoutResource(R.layout.battery_history_chart);
-        }
+        final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
+        mBatteryInfo = BatteryInfo.getBatteryInfo(getContext(), batteryStats.getBatteryBroadcast(),
+                batteryStats.getStats(), elapsedRealtimeUs);
         notifyChanged();
     }
 
-    BatteryStats getStats() {
-        return mStats;
-    }
-
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        if (mStats == null) {
+        if (mBatteryInfo == null) {
             return;
         }
-        BatteryHistoryChart chart = (BatteryHistoryChart) view.findViewById(
-                R.id.battery_history_chart);
-        if (mChart == null) {
-            // First time: use and initialize this chart.
-            chart.setStats(mStats, mBatteryBroadcast);
-            mChart = chart;
-        } else {
-            // All future times: forget the newly inflated chart, re-use the
-            // already initialized chart from last time.
-            ViewGroup parent = (ViewGroup) chart.getParent();
-            int index = parent.indexOfChild(chart);
-            parent.removeViewAt(index);
-            if (mChart.getParent() != null) {
-                ((ViewGroup) mChart.getParent()).removeView(mChart);
-            }
-            parent.addView(mChart, index);
-        }
+        view.setDividerAllowedAbove(true);
+        ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);
+        ((TextView) view.findViewById(R.id.estimation)).setText(mBatteryInfo.remainingLabel);
+        UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);
+        mBatteryInfo.bindHistory(usageView);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatterySaverPreference.java b/src/com/android/settings/fuelgauge/BatterySaverPreference.java
new file mode 100644
index 0000000..9e0f39b
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatterySaverPreference.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.support.v7.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+public class BatterySaverPreference extends Preference {
+
+    private PowerManager mPowerManager;
+
+    public BatterySaverPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void performClick(View view) {
+        Utils.startWithFragment(getContext(), getFragment(), null, null, 0, 0, getTitle());
+    }
+
+    @Override
+    public void onAttached() {
+        super.onAttached();
+        mPowerManager = (PowerManager) getContext().getSystemService(Context.POWER_SERVICE);
+        mObserver.onChange(true);
+        getContext().getContentResolver().registerContentObserver(
+                Settings.Global.getUriFor(Global.LOW_POWER_MODE_TRIGGER_LEVEL), true, mObserver);
+        getContext().getContentResolver().registerContentObserver(
+                Settings.Global.getUriFor(Global.LOW_POWER_MODE), true, mObserver);
+    }
+
+    @Override
+    public void onDetached() {
+        super.onDetached();
+        getContext().getContentResolver().unregisterContentObserver(mObserver);
+    }
+
+    private void updateSwitch() {
+        final Context context = getContext();
+        final boolean mode = mPowerManager.isPowerSaveMode();
+        int format = mode ? R.string.battery_saver_on_summary
+                : R.string.battery_saver_off_summary;
+        int percent = Settings.Global.getInt(context.getContentResolver(),
+                Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+        int percentFormat = percent > 0 ? R.string.battery_saver_desc_turn_on_auto_pct
+                : R.string.battery_saver_desc_turn_on_auto_never;
+        setSummary(context.getString(format, context.getString(percentFormat,
+                Utils.formatPercentage(percent))));
+    }
+
+    private final ContentObserver mObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            updateSwitch();
+        }
+    };
+
+}
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index 5b39a14..b0bf4b4 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -20,30 +20,37 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
-
-import com.android.settings.AppProgressPreference;
+import com.android.settings.R;
+import com.android.settings.TintablePreference;
 import com.android.settings.Utils;
 
 /**
  * Custom preference for displaying power consumption as a bar and an icon on
  * the left for the subsystem/app type.
  */
-public class PowerGaugePreference extends AppProgressPreference {
+public class PowerGaugePreference extends TintablePreference {
+    private final int mIconSize;
+
     private BatteryEntry mInfo;
     private final CharSequence mContentDescription;
+    private CharSequence mProgress;
 
     public PowerGaugePreference(Context context, Drawable icon, CharSequence contentDescription,
             BatteryEntry info) {
         super(context, null);
         setIcon(icon != null ? icon : new ColorDrawable(0));
+        setWidgetLayoutResource(R.layout.preference_widget_summary);
         mInfo = info;
         mContentDescription = contentDescription;
+        mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
     }
 
     public void setPercent(double percentOfMax, double percentOfTotal) {
-        setProgress((int) Math.ceil(percentOfMax));
-        setSummary(Utils.formatPercentage((int) (percentOfTotal + 0.5)));
+        mProgress = Utils.formatPercentage((int) (percentOfTotal + 0.5));
+        notifyChanged();
     }
 
     BatteryEntry getInfo() {
@@ -53,7 +60,10 @@
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
+        ImageView icon = (ImageView) view.findViewById(android.R.id.icon);
+        icon.setLayoutParams(new LinearLayout.LayoutParams(mIconSize, mIconSize));
 
+        ((TextView) view.findViewById(R.id.widget_summary)).setText(mProgress);
         if (mContentDescription != null) {
             final TextView titleView = (TextView) view.findViewById(android.R.id.title);
             titleView.setContentDescription(mContentDescription);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index d7b6849..a0d276f 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -65,7 +65,6 @@
     private static final String KEY_BATTERY_HISTORY = "battery_history";
 
     private static final int MENU_STATS_TYPE = Menu.FIRST;
-    private static final int MENU_BATTERY_SAVER = Menu.FIRST + 2;
     private static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
     private static final int MENU_HELP = Menu.FIRST + 4;
 
@@ -134,9 +133,6 @@
                     .setAlphabeticShortcut('t');
         }
 
-        MenuItem batterySaver = menu.add(0, MENU_BATTERY_SAVER, 0, R.string.battery_saver);
-        batterySaver.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-
         menu.add(0, MENU_HIGH_POWER_APPS, 0, R.string.high_power_apps);
         super.onCreateOptionsMenu(menu, inflater);
     }
@@ -158,10 +154,6 @@
                 }
                 refreshStats();
                 return true;
-            case MENU_BATTERY_SAVER:
-                sa.startPreferencePanel(BatterySaverSettings.class.getName(), null,
-                        R.string.battery_saver, null, null, 0);
-                return true;
             case MENU_HIGH_POWER_APPS:
                 Bundle args = new Bundle();
                 args.putString(ManageApplications.EXTRA_CLASSNAME,
@@ -280,6 +272,7 @@
 
     protected void refreshStats() {
         super.refreshStats();
+        PowerWhitelistBackend powerWhiteist = PowerWhitelistBackend.getInstance();
         updatePreference(mHistPref);
         mAppListGroup.removeAll();
         mAppListGroup.setOrderingAsAdded(false);
@@ -352,6 +345,12 @@
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
                 pref.setPercent(percentOfMax, percentOfTotal);
+                if (sipper.drainType == DrainType.APP) {
+                    pref.setSummary(powerWhiteist.isWhitelisted(entry.defaultPackageName)
+                            || powerWhiteist.isSysWhitelisted(entry.defaultPackageName)
+                            ? getString(R.string.not_battery_optimizing)
+                            : null);
+                }
                 if (sipper.uidObj != null) {
                     pref.setKey(Integer.toString(sipper.uidObj.getUid()));
                 }
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index e891ebd..4996d04 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -266,8 +266,8 @@
         mManagedProfileSwitch.setOnPreferenceClickListener(null);
         final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
                 UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile.getIdentifier());
-        if (mUm.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile)
-                && admin != null) {
+        final boolean isRestrictedByBase = isManagedProfileRestrictedByBase();
+        if (!isRestrictedByBase && admin != null) {
             mManagedProfileSwitch.setDisabledByAdmin(admin);
             mManagedProfileSwitch.setChecked(false);
         } else {
@@ -278,9 +278,8 @@
             if (!enabled) {
                 mManagedProfileSwitch.setChecked(false);
             } else {
-                final boolean isRestricted = isManagedProfileRestrictedByBase();
-                mManagedProfileSwitch.setChecked(!isRestricted);
-                summaryResId = (isRestricted ?
+                mManagedProfileSwitch.setChecked(!isRestrictedByBase);
+                summaryResId = (isRestrictedByBase ?
                         R.string.switch_off_text : R.string.switch_on_text);
                 mManagedProfileSwitch.setOnPreferenceClickListener(
                         mManagedProfileSwitchClickListener);
@@ -382,9 +381,11 @@
         final boolean enabled = (mode != android.provider.Settings.Secure.LOCATION_MODE_OFF);
         EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
                 UserManager.DISALLOW_SHARE_LOCATION, UserHandle.myUserId());
+        boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_SHARE_LOCATION, UserHandle.myUserId());
         // Disable the whole switch bar instead of the switch itself. If we disabled the switch
         // only, it would be re-enabled again if the switch bar is not disabled.
-        if (admin != null) {
+        if (!hasBaseUserRestriction && admin != null) {
             mSwitchBar.setDisabledByAdmin(admin);
         } else {
             mSwitchBar.setEnabled(!restricted);
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index b81d342..5bda1ad 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -21,12 +21,14 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.nfc.NfcAdapter;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
 
 /**
@@ -40,6 +42,7 @@
     private final RestrictedPreference mAndroidBeam;
     private final NfcAdapter mNfcAdapter;
     private final IntentFilter mIntentFilter;
+    private boolean mBeamDisallowedBySystem;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -58,6 +61,8 @@
         mSwitch = switchPreference;
         mAndroidBeam = androidBeam;
         mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
+        mBeamDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(context,
+                UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
 
         if (mNfcAdapter == null) {
             // NFC is not supported
@@ -66,6 +71,9 @@
             mIntentFilter = null;
             return;
         }
+        if (mBeamDisallowedBySystem) {
+            mAndroidBeam.setEnabled(false);
+        }
         mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
     }
 
@@ -112,7 +120,12 @@
         case NfcAdapter.STATE_ON:
             mSwitch.setChecked(true);
             mSwitch.setEnabled(true);
-            mAndroidBeam.checkRestrictionAndSetDisabled(UserManager.DISALLOW_OUTGOING_BEAM);
+            if (mBeamDisallowedBySystem) {
+                mAndroidBeam.setDisabledByAdmin(null);
+                mAndroidBeam.setEnabled(false);
+            } else {
+                mAndroidBeam.checkRestrictionAndSetDisabled(UserManager.DISALLOW_OUTGOING_BEAM);
+            }
             if (mNfcAdapter.isNdefPushEnabled() && mAndroidBeam.isEnabled()) {
                 mAndroidBeam.setSummary(R.string.android_beam_on_summary);
             } else {
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index b3b15af..8f30f59 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -17,11 +17,14 @@
 package com.android.settings.notification;
 
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Settings;
 import android.service.notification.NotificationListenerService.Ranking;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
@@ -32,6 +35,7 @@
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -50,16 +54,12 @@
     private static final String TAG = "AppNotificationSettings";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    private static final String KEY_BLOCK = "block";
-    private static final String KEY_CATEGORIES = "categories";
-
     private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
             = new Intent(Intent.ACTION_MAIN)
                 .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES);
 
-    private RestrictedSwitchPreference mBlock;
-    private PreferenceCategory mCategories;
     private AppRow mAppRow;
+    private boolean mDndVisualEffectsSuppressed;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -79,8 +79,6 @@
         super.onCreate(savedInstanceState);
 
         addPreferencesFromResource(R.xml.app_notification_settings);
-        mCategories = (PreferenceCategory) findPreference(KEY_CATEGORIES);
-        mBlock = (RestrictedSwitchPreference) findPreference(KEY_BLOCK);
         mImportance = (ImportanceSeekBarPreference) findPreference(KEY_IMPORTANCE);
         mImportanceReset = (LayoutPreference) findPreference(KEY_IMPORTANCE_RESET);
         mImportanceTitle = (RestrictedPreference) findPreference(KEY_IMPORTANCE_TITLE);
@@ -91,84 +89,49 @@
 
         mAppRow = mBackend.loadAppRow(mPm, mPkgInfo);
 
+        NotificationManager.Policy policy =
+                NotificationManager.from(mContext).getNotificationPolicy();
+        mDndVisualEffectsSuppressed = policy == null ? false : policy.suppressedVisualEffects != 0;
+
         // load settings intent
         ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(rows);
 
-        // Add topics
-        List<Notification.Topic> topics = mBackend.getTopics(mPkg, mUid);
-        if (topics.size() <= 1) {
-            removeAppPrefs();
-            setupImportancePrefs(mAppRow.systemApp, mAppRow.appImportance);
-            setupPriorityPref(mAppRow.appBypassDnd);
-            setupSensitivePref(mAppRow.appSensitive);
-        } else {
-            removeTopicPrefs();
-            setupBlockSwitch();
-            for (Notification.Topic topic : topics) {
-                RestrictedPreference topicPreference = new RestrictedPreference(getPrefContext());
-                topicPreference.setDisabledByAdmin(mSuspendedAppsAdmin);
-                topicPreference.setKey(topic.getId());
-                topicPreference.setTitle(topic.getLabel());
-                // Create intent for this preference.
-                Bundle topicArgs = new Bundle();
-                topicArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-                topicArgs.putParcelable(TopicNotificationSettings.ARG_TOPIC, topic);
-                topicArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
-                topicArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
-                topicArgs.putParcelable(TopicNotificationSettings.ARG_PACKAGE_INFO, mPkgInfo);
-
-                Intent topicIntent = Utils.onBuildStartFragmentIntent(getActivity(),
-                        TopicNotificationSettings.class.getName(),
-                        topicArgs, null, R.string.topic_notifications_title, null, false);
-                topicPreference.setIntent(topicIntent);
-                mCategories.addPreference(topicPreference);
-            }
-        }
+        setupImportancePrefs(mAppRow.systemApp, mAppRow.appImportance);
+        setupPriorityPref(mAppRow.appBypassDnd);
+        setupSensitivePref(mAppRow.appSensitive);
+        updateDependents(mAppRow.appImportance);
     }
 
     @Override
-    protected void updateDependents(int progress) {
-        updateDependents(progress == Ranking.IMPORTANCE_NONE);
+    protected void updateDependents(int importance) {
+        final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure(
+                UserHandle.myUserId());
+        final boolean lockscreenNotificationsEnabled = getLockscreenNotificationsEnabled();
+        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
+
+        setVisible(mPriority, checkCanBeVisible(Ranking.IMPORTANCE_DEFAULT, importance)
+                && !mDndVisualEffectsSuppressed);
+        setVisible(mSensitive, checkCanBeVisible(Ranking.IMPORTANCE_LOW, importance)
+                && lockscreenSecure && lockscreenNotificationsEnabled && allowPrivate);
     }
 
-    private void removeTopicPrefs() {
-        setVisible(mImportance, false);
-        setVisible(mImportanceReset, false);
-        setVisible(mImportanceTitle, false);
-        setVisible(mPriority, false);
-        setVisible(mSensitive, false);
+    protected boolean checkCanBeVisible(int minImportanceVisible, int importance) {
+        if (importance == Ranking.IMPORTANCE_UNSPECIFIED) {
+            return true;
+        }
+        return importance > minImportanceVisible;
     }
 
-    private void removeAppPrefs() {
-        setVisible(mBlock, false);
-        setVisible(mCategories, false);
+    private boolean getLockscreenNotificationsEnabled() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
     }
 
-    private void updateDependents(boolean banned) {
-        mBlock.setEnabled(!mAppRow.systemApp);
-        mCategories.setEnabled(!banned);
-    }
-
-    private void setupBlockSwitch() {
-        mBlock.setDisabledByAdmin(mSuspendedAppsAdmin);
-        mBlock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean banned = (Boolean) newValue;
-                if (banned) {
-                    MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BAN_APP_NOTES, mPkg);
-                }
-                final boolean success = mBackend.setNotificationsBanned(mPkg, mUid, banned);
-                if (success) {
-                    updateDependents(banned);
-                }
-                return success;
-            }
-        });
-        mBlock.setChecked(mAppRow.banned);
-        updateDependents(mAppRow.banned);
+    private boolean getLockscreenAllowPrivateNotifications() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
     }
 
     private List<ResolveInfo> queryNotificationConfigActivities() {
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 8dd6a4c..772fa19 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -15,8 +15,6 @@
  */
 package com.android.settings.notification;
 
-import com.google.android.collect.Lists;
-
 import android.app.INotificationManager;
 import android.app.Notification;
 import android.content.Context;
@@ -24,15 +22,12 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ParceledListSlice;
 import android.graphics.drawable.Drawable;
 import android.os.ServiceManager;
 import android.service.notification.NotificationListenerService;
 import android.util.Log;
 import com.android.settingslib.Utils;
 
-import java.util.List;
-
 public class NotificationBackend {
     private static final String TAG = "NotificationBackend";
 
@@ -51,10 +46,9 @@
         }
         row.icon = app.loadIcon(pm);
         row.banned = getNotificationsBanned(row.pkg, row.uid);
-        row.appImportance = getImportance(row.pkg, row.uid, null);
-        row.appBypassDnd = getBypassZenMode(row.pkg, row.uid, null);
-        row.appSensitive = getSensitive(row.pkg, row.uid, null);
-        row.bannedTopics = hasBannedTopics(row.pkg, row.uid);
+        row.appImportance = getImportance(row.pkg, row.uid);
+        row.appBypassDnd = getBypassZenMode(row.pkg, row.uid);
+        row.appSensitive = getSensitive(row.pkg, row.uid);
         return row;
     }
 
@@ -64,31 +58,6 @@
         return row;
     }
 
-    public TopicRow loadTopicRow(PackageManager pm, PackageInfo app, Notification.Topic topic) {
-        final TopicRow row = new TopicRow();
-        row.pkg = app.packageName;
-        row.uid = app.applicationInfo.uid;
-        row.label = topic.getLabel();
-        row.icon = app.applicationInfo.loadIcon(pm);
-        row.systemApp = Utils.isSystemPackage(pm, app);
-        row.topic = topic;
-        row.priority = getBypassZenMode(row.pkg, row.uid, row.topic);
-        row.sensitive = getSensitive(row.pkg, row.uid, row.topic);
-        row.banned = getNotificationsBanned(row.pkg, row.uid);
-        row.importance = getImportance(row.pkg, row.uid, row.topic);
-        return row;
-    }
-
-    public boolean setNotificationsBanned(String pkg, int uid, boolean banned) {
-        try {
-            sINM.setNotificationsEnabledForPackage(pkg, uid, !banned);
-            return true;
-        } catch (Exception e) {
-           Log.w(TAG, "Error calling NoMan", e);
-           return false;
-        }
-    }
-
     public boolean getNotificationsBanned(String pkg, int uid) {
         try {
             final boolean enabled = sINM.areNotificationsEnabledForPackage(pkg, uid);
@@ -99,19 +68,18 @@
         }
     }
 
-    public boolean getBypassZenMode(String pkg, int uid, Notification.Topic topic) {
+    public boolean getBypassZenMode(String pkg, int uid) {
         try {
-            return sINM.getPriority(pkg, uid, topic) == Notification.PRIORITY_MAX;
+            return sINM.getPriority(pkg, uid) == Notification.PRIORITY_MAX;
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
             return false;
         }
     }
 
-    public boolean setBypassZenMode(String pkg, int uid, Notification.Topic topic,
-            boolean bypassZen) {
+    public boolean setBypassZenMode(String pkg, int uid, boolean bypassZen) {
         try {
-            sINM.setPriority(pkg, uid, topic,
+            sINM.setPriority(pkg, uid,
                     bypassZen ? Notification.PRIORITY_MAX : Notification.PRIORITY_DEFAULT);
             return true;
         } catch (Exception e) {
@@ -120,19 +88,18 @@
         }
     }
 
-    public boolean getSensitive(String pkg, int uid, Notification.Topic topic) {
+    public boolean getSensitive(String pkg, int uid) {
         try {
-            return sINM.getVisibilityOverride(pkg, uid, topic)
-                    == Notification.VISIBILITY_PRIVATE;
+            return sINM.getVisibilityOverride(pkg, uid) == Notification.VISIBILITY_PRIVATE;
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
             return false;
         }
     }
 
-    public boolean setSensitive(String pkg, int uid, Notification.Topic topic, boolean sensitive) {
+    public boolean setSensitive(String pkg, int uid, boolean sensitive) {
         try {
-            sINM.setVisibilityOverride(pkg, uid, topic,
+            sINM.setVisibilityOverride(pkg, uid,
                     sensitive ? Notification.VISIBILITY_PRIVATE
                             : NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE);
             return true;
@@ -142,9 +109,9 @@
         }
     }
 
-    public boolean setImportance(String pkg, int uid, Notification.Topic topic, int importance) {
+    public boolean setImportance(String pkg, int uid, int importance) {
         try {
-            sINM.setImportance(pkg, uid, topic, importance);
+            sINM.setImportance(pkg, uid, importance);
             return true;
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
@@ -152,34 +119,15 @@
         }
     }
 
-    public int getImportance(String pkg, int uid, Notification.Topic topic) {
+    public int getImportance(String pkg, int uid) {
         try {
-            return sINM.getImportance(pkg, uid, topic);
+            return sINM.getImportance(pkg, uid);
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
             return NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED;
         }
     }
 
-    public List<Notification.Topic> getTopics(String pkg, int uid) {
-        try {
-            final ParceledListSlice<Notification.Topic> parceledList = sINM.getTopics(pkg, uid);
-            return parceledList.getList();
-        } catch (Exception e) {
-            Log.w(TAG, "Error calling NoMan", e);
-            return Lists.newArrayList();
-        }
-    }
-
-    public boolean hasBannedTopics(String pkg, int uid) {
-        try {
-            return sINM.hasBannedTopics(pkg, uid);
-        } catch (Exception e) {
-            Log.w(TAG, "Error calling NoMan", e);
-            return false;
-        }
-    }
-
     static class Row {
         public String section;
     }
@@ -196,13 +144,5 @@
         public int appImportance;
         public boolean appBypassDnd;
         public boolean appSensitive;
-        public boolean bannedTopics;
-    }
-
-    public static class TopicRow extends AppRow {
-        public Notification.Topic topic;
-        public boolean priority;
-        public boolean sensitive;
-        public int importance;
     }
 }
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 7f7dfd5..a58edf7 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -47,9 +47,6 @@
     private static final String TAG = "NotifiSettingsBase";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    protected static final String ARG_PACKAGE_INFO = "arg_info";
-    protected static final String ARG_TOPIC = "arg_topic";
-
     protected static final String KEY_BYPASS_DND = "bypass_dnd";
     protected static final String KEY_SENSITIVE = "sensitive";
     protected static final String KEY_IMPORTANCE = "importance";
@@ -64,7 +61,6 @@
     protected int mUserId;
     protected String mPkg;
     protected PackageInfo mPkgInfo;
-    protected Notification.Topic mTopic;
     protected ImportanceSeekBarPreference mImportance;
     protected RestrictedPreference mImportanceTitle;
     protected LayoutPreference mImportanceReset;
@@ -113,11 +109,7 @@
         mUserId = UserHandle.getUserId(mUid);
 
         if (DEBUG) Log.d(TAG, "Load details for pkg=" + mPkg + " uid=" + mUid);
-        mPkgInfo = args != null && args.containsKey(ARG_PACKAGE_INFO)
-                ? (PackageInfo) args.getParcelable(ARG_PACKAGE_INFO) : null;
-        if (mPkgInfo == null) {
-            mPkgInfo = findPackageInfo(mPkg, mUid);
-        }
+        mPkgInfo = findPackageInfo(mPkg, mUid);
         if (mPkgInfo == null) {
             Log.w(TAG, "Failed to find package info: " + Settings.EXTRA_APP_PACKAGE + " was " + mPkg
                     + ", " + Settings.EXTRA_APP_UID + " was " + mUid);
@@ -125,10 +117,6 @@
             return;
         }
 
-        // Will be null for app wide settings.
-        mTopic = args != null && args.containsKey(ARG_TOPIC)
-                ? (Notification.Topic) args.getParcelable(ARG_TOPIC) : null;
-
         mSuspendedAppsAdmin = RestrictedLockUtils.checkIfApplicationIsSuspended(
                 mContext, mPkg, mUserId);
     }
@@ -177,7 +165,7 @@
         mImportance.setCallback(new ImportanceSeekBarPreference.Callback() {
             @Override
             public void onImportanceChanged(int progress) {
-                mBackend.setImportance(mPkg, mUid, mTopic, progress);
+                mBackend.setImportance(mPkg, mUid, progress);
                 mImportanceTitle.setSummary(getProgressSummary(progress));
                 updateDependents(progress);
             }
@@ -194,7 +182,7 @@
                     return;
                 }
 
-                mBackend.setImportance(mPkg, mUid, mTopic, Ranking.IMPORTANCE_UNSPECIFIED);
+                mBackend.setImportance(mPkg, mUid, Ranking.IMPORTANCE_UNSPECIFIED);
                 mImportanceReset.setVisible(false);
                 mImportance.setVisible(false);
                 mImportanceTitle.setOnPreferenceClickListener(showEditableImportance);
@@ -231,7 +219,7 @@
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 final boolean bypassZenMode = (Boolean) newValue;
-                return mBackend.setBypassZenMode(mPkgInfo.packageName, mUid, mTopic, bypassZenMode);
+                return mBackend.setBypassZenMode(mPkgInfo.packageName, mUid, bypassZenMode);
             }
         });
     }
@@ -243,7 +231,7 @@
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 final boolean sensitive = (Boolean) newValue;
-                return mBackend.setSensitive(mPkgInfo.packageName, mUid, mTopic, sensitive);
+                return mBackend.setSensitive(mPkgInfo.packageName, mUid, sensitive);
             }
         });
     }
@@ -287,7 +275,7 @@
             new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    mBackend.setImportance(mPkg, mUid, mTopic, Ranking.IMPORTANCE_DEFAULT);
+                    mBackend.setImportance(mPkg, mUid, Ranking.IMPORTANCE_DEFAULT);
                     mImportance.setProgress(Ranking.IMPORTANCE_DEFAULT);
                     mImportanceTitle.setSummary(getProgressSummary(Ranking.IMPORTANCE_DEFAULT));
                     mImportance.setVisible(true);
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 4eb4f7d..274ce59 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -169,7 +169,9 @@
         } catch (IllegalArgumentException ignored) {
             isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed
         }
-        if (!mUserManager.isAdminUser() || !isCellBroadcastAppLinkEnabled) {
+        if (!mUserManager.isAdminUser() || !isCellBroadcastAppLinkEnabled ||
+                RestrictedLockUtils.hasBaseUserRestriction(mContext,
+                        UserManager.DISALLOW_CONFIG_CELL_BROADCASTS, UserHandle.myUserId())) {
             removePreference(KEY_CELL_BROADCAST_SETTINGS);
         }
         initRingtones();
@@ -193,12 +195,15 @@
 
         final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
                 UserManager.DISALLOW_ADJUST_VOLUME, UserHandle.myUserId());
+        final boolean hasBaseRestriction = RestrictedLockUtils.hasBaseUserRestriction(mContext,
+                UserManager.DISALLOW_ADJUST_VOLUME, UserHandle.myUserId());
         for (String key : RESTRICTED_KEYS) {
             Preference pref = findPreference(key);
-            if (pref instanceof RestrictedPreference) {
+            if (pref != null) {
+                pref.setEnabled(!hasBaseRestriction);
+            }
+            if (pref instanceof RestrictedPreference && !hasBaseRestriction) {
                 ((RestrictedPreference) pref).setDisabledByAdmin(admin);
-            } else if (pref != null) {
-                pref.setEnabled(admin == null);
             }
         }
         RestrictedPreference broadcastSettingsPref = (RestrictedPreference) findPreference(
diff --git a/src/com/android/settings/notification/TopicNotificationSettings.java b/src/com/android/settings/notification/TopicNotificationSettings.java
deleted file mode 100644
index c1df2de..0000000
--- a/src/com/android/settings/notification/TopicNotificationSettings.java
+++ /dev/null
@@ -1,111 +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.
- */
-
-package com.android.settings.notification;
-
-import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.AppHeader;
-import com.android.settings.R;
-import com.android.settings.applications.LayoutPreference;
-import com.android.settings.notification.NotificationBackend.TopicRow;
-import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.RestrictedSwitchPreference;
-
-import android.app.NotificationManager;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.service.notification.NotificationListenerService.Ranking;
-
-/** These settings are per topic, so should not be returned in global search results. */
-public class TopicNotificationSettings extends NotificationSettingsBase {
-    private static final String TAG = "TopicNotiSettings";
-    private TopicRow mTopicRow;
-    private boolean mDndVisualEffectsSuppressed;
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        if (mTopicRow == null) return;
-        AppHeader.createAppHeader(
-                this, mTopicRow.icon, mTopicRow.label, mTopicRow.pkg, mTopicRow.uid);
-    }
-
-    @Override
-    protected int getMetricsCategory() {
-        return MetricsEvent.NOTIFICATION_TOPIC_NOTIFICATION;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        NotificationManager.Policy policy =
-                NotificationManager.from(mContext).getNotificationPolicy();
-        mDndVisualEffectsSuppressed = policy == null ? false : policy.suppressedVisualEffects != 0;
-
-        if (mTopic == null) {
-            toastAndFinish();
-            return;
-        }
-
-        addPreferencesFromResource(R.xml.topic_notification_settings);
-        mTopicRow = mBackend.loadTopicRow(mPm, mPkgInfo, mTopic);
-
-        mImportance = (ImportanceSeekBarPreference) findPreference(KEY_IMPORTANCE);
-        mImportanceReset = (LayoutPreference) findPreference(KEY_IMPORTANCE_RESET);
-        mImportanceTitle = (RestrictedPreference) findPreference(KEY_IMPORTANCE_TITLE);
-        mPriority = (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
-        mSensitive = (RestrictedSwitchPreference) findPreference(KEY_SENSITIVE);
-
-        setupImportancePrefs(mTopicRow.systemApp, mTopicRow.importance);
-        setupPriorityPref(mTopicRow.priority);
-        setupSensitivePref(mTopicRow.sensitive);
-
-        updateDependents(mTopicRow.importance);
-    }
-
-    @Override
-    protected void updateDependents(int importance) {
-        final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure(
-                UserHandle.myUserId());
-        final boolean lockscreenNotificationsEnabled = getLockscreenNotificationsEnabled();
-        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
-
-        setVisible(mPriority, checkCanBeVisible(Ranking.IMPORTANCE_DEFAULT, importance)
-                && !mDndVisualEffectsSuppressed);
-        setVisible(mSensitive, checkCanBeVisible(Ranking.IMPORTANCE_LOW, importance)
-                && lockscreenSecure && lockscreenNotificationsEnabled && allowPrivate);
-    }
-
-    protected boolean checkCanBeVisible(int minImportanceVisible, int importance) {
-        if (importance == Ranking.IMPORTANCE_UNSPECIFIED) {
-            return true;
-        }
-        return importance > minImportanceVisible;
-    }
-
-    private boolean getLockscreenNotificationsEnabled() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
-    }
-
-    private boolean getLockscreenAllowPrivateNotifications() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
-    }
-}
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
index 5f0fa5e..1c5027e 100644
--- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
@@ -29,6 +29,7 @@
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 import android.service.notification.ZenModeConfig.ScheduleInfo;
+import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceScreen;
@@ -49,6 +50,7 @@
     private static final String KEY_DAYS = "days";
     private static final String KEY_START_TIME = "start_time";
     private static final String KEY_END_TIME = "end_time";
+    private static final String KEY_EXIT_AT_ALARM = "exit_at_alarm";
 
     public static final String ACTION = Settings.ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS;
 
@@ -58,6 +60,7 @@
     private Preference mDays;
     private TimePickerPreference mStart;
     private TimePickerPreference mEnd;
+    private SwitchPreference mExitAtAlarm;
 
     private ScheduleInfo mSchedule;
 
@@ -137,6 +140,16 @@
         });
         root.addPreference(mEnd);
         mEnd.setDependency(mDays.getKey());
+
+        mExitAtAlarm = (SwitchPreference) root.findPreference(KEY_EXIT_AT_ALARM);
+        mExitAtAlarm.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object o) {
+                mSchedule.exitAtAlarm = (Boolean) o;
+                updateRule(ZenModeConfig.toScheduleConditionId(mSchedule));
+                return true;
+            }
+        });
     }
 
     private void updateDays() {
@@ -181,6 +194,7 @@
         updateDays();
         mStart.setTime(mSchedule.startHour, mSchedule.startMinute);
         mEnd.setTime(mSchedule.endHour, mSchedule.endMinute);
+        mExitAtAlarm.setChecked(mSchedule.exitAtAlarm);
         updateEndSummary();
     }
 
diff --git a/src/com/android/settings/notification/ZenModeSettingsBase.java b/src/com/android/settings/notification/ZenModeSettingsBase.java
index f1b5edf..ec1426d 100644
--- a/src/com/android/settings/notification/ZenModeSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeSettingsBase.java
@@ -28,9 +28,7 @@
 import android.provider.Settings.Global;
 import android.service.notification.ZenModeConfig;
 import android.util.Log;
-import android.view.View;
 
-import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 
 import java.util.List;
@@ -69,17 +67,16 @@
         maybeRefreshRules(true, true /*fireChanged*/);
         mSettingsObserver.register();
         if (isUiRestricted()) {
-            getPreferenceScreen().removeAll();
-            return;
+            if (isUiRestrictedByOnlyAdmin()) {
+                getPreferenceScreen().removeAll();
+                return;
+            } else {
+                finish();
+            }
         }
     }
 
     @Override
-    protected View initAdminSupportDetailsView() {
-        return getActivity().findViewById(R.id.admin_support_details);
-    }
-
-    @Override
     public void onPause() {
         super.onPause();
         mSettingsObserver.unregister();
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 7504218..dcf50e8 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -64,6 +64,9 @@
     /** Preference key for the TTS rate selection dialog. */
     private static final String KEY_DEFAULT_RATE = "tts_default_rate";
 
+    /** Preference key for the TTS reset speech rate preference. */
+    private static final String KEY_RESET_SPEECH_RATE = "reset_speech_rate";
+
     /** Preference key for the TTS status field. */
     private static final String KEY_STATUS = "tts_status";
 
@@ -87,6 +90,7 @@
     private PreferenceCategory mEnginePreferenceCategory;
     private SeekBarPreference mDefaultRatePref;
     private SwitchPreference mHigherRateSwitchPref;
+    private Preference mResetSpeechRate;
     private Preference mPlayExample;
     private Preference mEngineStatus;
 
@@ -171,6 +175,9 @@
         mPlayExample.setOnPreferenceClickListener(this);
         mPlayExample.setEnabled(false);
 
+        mResetSpeechRate = findPreference(KEY_RESET_SPEECH_RATE);
+        mResetSpeechRate.setOnPreferenceClickListener(this);
+
         mEnginePreferenceCategory = (PreferenceCategory) findPreference(
                 KEY_ENGINE_PREFERENCE_SECTION);
         mDefaultRatePref = (SeekBarPreference) findPreference(KEY_DEFAULT_RATE);
@@ -459,24 +466,13 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (KEY_DEFAULT_RATE.equals(preference.getKey())) {
-            // Default rate
-            mDefaultRate = ((Integer) objValue).intValue();
-            try {
-                android.provider.Settings.Secure.putInt(getContentResolver(),
-                        TTS_DEFAULT_RATE, mDefaultRate);
-                if (mTts != null) {
-                    mTts.setSpeechRate(mDefaultRate / 100.0f);
-                }
-                if (DBG) Log.d(TAG, "TTS default rate changed, now " + mDefaultRate);
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "could not persist default TTS rate setting", e);
-            }
+            updateSpeechRate(((Integer) objValue).intValue());
         }
         return true;
     }
 
     /**
-     * Called when mPlayExample is clicked
+     * Called when mPlayExample or mResetSpeechRate is clicked.
      */
     @Override
     public boolean onPreferenceClick(Preference preference) {
@@ -485,11 +481,29 @@
             // the actual speaking
             speakSampleText();
             return true;
+        } else if (preference == mResetSpeechRate) {
+          mDefaultRatePref.setProgress(TextToSpeech.Engine.DEFAULT_RATE);
+          updateSpeechRate(TextToSpeech.Engine.DEFAULT_RATE);
+          return true;
         }
-
         return false;
     }
 
+    private void updateSpeechRate(int speechRate) {
+        mDefaultRate = speechRate;
+        try {
+            android.provider.Settings.Secure.putInt(getContentResolver(),
+                    TTS_DEFAULT_RATE, mDefaultRate);
+            if (mTts != null) {
+                mTts.setSpeechRate(mDefaultRate / 100.0f);
+            }
+            if (DBG) Log.d(TAG, "TTS default rate changed, now " + mDefaultRate);
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "could not persist default TTS rate setting", e);
+        }
+        return;
+    }
+
     private void updateWidgetState(boolean enable) {
         mPlayExample.setEnabled(enable);
         mDefaultRatePref.setEnabled(enable);
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index a7af930..2a71885 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -29,7 +29,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.List;
 
@@ -60,7 +60,7 @@
 
     private UserManager mUserManager;
     private SwitchPreference mPhonePref;
-    private RestrictedPreference mRemoveUserPref;
+    private Preference mRemoveUserPref;
 
     private UserInfo mUserInfo;
     private boolean mGuestUser;
@@ -80,7 +80,7 @@
 
         addPreferencesFromResource(R.xml.user_details_settings);
         mPhonePref = (SwitchPreference) findPreference(KEY_ENABLE_TELEPHONY);
-        mRemoveUserPref = (RestrictedPreference) findPreference(KEY_REMOVE_USER);
+        mRemoveUserPref = findPreference(KEY_REMOVE_USER);
 
         mGuestUser = getArguments().getBoolean(EXTRA_USER_GUEST, false);
 
@@ -103,16 +103,14 @@
             mPhonePref.setChecked(
                     !mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS));
         }
+        if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
+            removePreference(KEY_REMOVE_USER);
+        }
         mPhonePref.setOnPreferenceChangeListener(this);
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        mRemoveUserPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_REMOVE_USER);
-    }
-
-    @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference == mRemoveUserPref) {
             if (!mUserManager.isAdminUser()) {
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index c9cdeb8..a871297 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -104,7 +104,6 @@
     private static final String KEY_USER_ME = "user_me";
     private static final String KEY_ADD_USER = "user_add";
     private static final String KEY_EMERGENCY_INFO = "emergency_info";
-    private static final String KEY_LOCK_SCREEN_SETTINGS = "lock_screen_settings";
 
     private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENGY_INFO";
 
@@ -237,14 +236,6 @@
         mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");
         mAddUserWhenLocked = (RestrictedSwitchPreference) findPreference("add_users_when_locked");
         mEmergencyInfoPreference = findPreference(KEY_EMERGENCY_INFO);
-        if(emergencyInfoActivityPresent()) {
-            mEmergencyInfoPreference.setOnPreferenceClickListener(this);
-        } else {
-            // Remove this view if the emergency info package is not found.
-            PreferenceCategory lockScreenSettingsCategory =
-                    (PreferenceCategory) findPreference(KEY_LOCK_SCREEN_SETTINGS);
-            lockScreenSettingsCategory.removePreference(mEmergencyInfoPreference);
-        }
         loadProfile();
         setHasOptionsMenu(true);
         IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -775,8 +766,9 @@
             userPreferences.add(pref);
         }
 
-        if (!mUserCaps.mIsGuest &&
-                (mUserCaps.mCanAddGuest || findGuest() != null || mUserCaps.mDisallowAddUser)) {
+        // Check if Guest tile should be added.
+        if (!mUserCaps.mIsGuest && (mUserCaps.mCanAddGuest ||
+                mUserCaps.mDisallowAddUserSetByAdmin)) {
             // Add a virtual Guest user for guest defaults
             UserPreference pref = new UserPreference(getPrefContext(), null,
                     UserPreference.USERID_GUEST_DEFAULTS,
@@ -784,7 +776,6 @@
                     null /* delete icon handler */);
             pref.setTitle(R.string.user_guest);
             pref.setIcon(getEncircledDefaultIcon());
-            pref.setOnPreferenceClickListener(this);
             userPreferences.add(pref);
             pref.setDisabledByAdmin(
                     mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
@@ -821,7 +812,7 @@
         }
 
         // Append Add user to the end of the list
-        if (mUserCaps.mCanAddUser || mUserCaps.mDisallowAddUser) {
+        if (mUserCaps.mCanAddUser || mUserCaps.mDisallowAddUserSetByAdmin) {
             boolean moreUsers = mUserManager.canAddMoreUsers();
             mAddUser.setOrder(Preference.DEFAULT_ORDER);
             preferenceScreen.addPreference(mAddUser);
@@ -836,7 +827,8 @@
                         mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
             }
         }
-        if (mUserCaps.mIsAdmin) {
+        if (mUserCaps.mIsAdmin &&
+                (!mUserCaps.mDisallowAddUser || mUserCaps.mDisallowAddUserSetByAdmin)) {
             mLockScreenSettings.setOrder(Preference.DEFAULT_ORDER);
             preferenceScreen.addPreference(mLockScreenSettings);
             mAddUserWhenLocked.setChecked(Settings.Global.getInt(getContentResolver(),
@@ -845,6 +837,12 @@
             mAddUserWhenLocked.setDisabledByAdmin(
                     mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
         }
+
+        if (emergencyInfoActivityPresent()) {
+            mEmergencyInfoPreference.setOnPreferenceClickListener(this);
+            mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER);
+            preferenceScreen.addPreference(mEmergencyInfoPreference);
+        }
     }
 
     private int getMaxRealUsers() {
@@ -922,17 +920,11 @@
             }
         } else if (pref instanceof UserPreference) {
             int userId = ((UserPreference) pref).getUserId();
-            if (userId == UserPreference.USERID_GUEST_DEFAULTS) {
-                createAndSwitchToGuestUser();
-            } else {
-                // Get the latest status of the user
-                UserInfo user = mUserManager.getUserInfo(userId);
-                if (!isInitialized(user)) {
-                    mHandler.sendMessage(mHandler.obtainMessage(
-                            MESSAGE_SETUP_USER, user.id, user.serialNumber));
-                } else {
-                    switchUserNow(userId);
-                }
+            // Get the latest status of the user
+            UserInfo user = mUserManager.getUserInfo(userId);
+            if (!isInitialized(user)) {
+                mHandler.sendMessage(mHandler.obtainMessage(
+                        MESSAGE_SETUP_USER, user.id, user.serialNumber));
             }
         } else if (pref == mAddUser) {
             // If we allow both types, show a picker, otherwise directly go to
@@ -949,29 +941,6 @@
         return false;
     }
 
-    private void createAndSwitchToGuestUser() {
-        final UserInfo guest = findGuest();
-        if (guest != null) {
-            switchUserNow(guest.id);
-            return;
-        }
-        UserInfo guestUser = mUserManager.createGuest(getActivity(),
-                    getResources().getString(R.string.user_guest));
-        if (guestUser != null) {
-            switchUserNow(guestUser.id);
-        }
-    }
-
-    private UserInfo findGuest() {
-        List<UserInfo> users = mUserManager.getUsers();
-        for (UserInfo user : users) {
-            if (user.isGuest()) {
-                return user;
-            }
-        }
-        return null;
-    }
-
     private boolean isInitialized(UserInfo user) {
         return (user.flags & UserInfo.FLAG_INITIALIZED) != 0;
     }
@@ -1040,6 +1009,7 @@
         boolean mIsGuest;
         boolean mCanAddGuest;
         boolean mDisallowAddUser;
+        boolean mDisallowAddUserSetByAdmin;
         EnforcedAdmin mEnforcedAdmin;
 
         private UserCapabilities() {}
@@ -1057,7 +1027,12 @@
             caps.mIsAdmin = myUserInfo.isAdmin();
             caps.mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
                     UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
-            caps.mDisallowAddUser = (caps.mEnforcedAdmin != null);
+            final boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(
+                    context, UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
+            caps.mDisallowAddUserSetByAdmin =
+                    caps.mEnforcedAdmin != null && !hasBaseUserRestriction;
+            caps.mDisallowAddUser =
+                    (caps.mEnforcedAdmin != null || hasBaseUserRestriction);
             if (!caps.mIsAdmin || UserManager.getMaxSupportedUsers() < 2
                     || !UserManager.supportsMultipleUsers()
                     || caps.mDisallowAddUser) {
@@ -1137,7 +1112,7 @@
                     data.screenTitle = res.getString(R.string.user_settings_title);
                     result.add(data);
 
-                    if (userCaps.mCanAddUser || userCaps.mDisallowAddUser) {
+                    if (userCaps.mCanAddUser || userCaps.mDisallowAddUserSetByAdmin) {
                         data = new SearchIndexableRaw(context);
                         data.title = res.getString(userCaps.mCanAddRestrictedProfile ?
                                 R.string.user_add_user_or_profile_menu
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 4cbb3df..6f56b06 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -49,7 +49,6 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.net.LegacyVpnInfo;
@@ -57,7 +56,8 @@
 import com.android.internal.net.VpnProfile;
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settingslib.RestrictedLockUtils;
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
@@ -72,7 +72,7 @@
  * Settings screen listing VPNs. Configured VPNs and networks managed by apps
  * are shown in the same list.
  */
-public class VpnSettings extends SettingsPreferenceFragment implements
+public class VpnSettings extends RestrictedSettingsFragment implements
         Handler.Callback, Preference.OnPreferenceClickListener {
     private static final String LOG_TAG = "VpnSettings";
 
@@ -101,6 +101,10 @@
 
     private boolean mUnavailable;
 
+    public VpnSettings() {
+        super(UserManager.DISALLOW_CONFIG_VPN);
+    }
+
     @Override
     protected int getMetricsCategory() {
         return MetricsEvent.VPN;
@@ -111,7 +115,7 @@
         super.onCreate(savedState);
 
         mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
-        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
+        if (isUiRestricted()) {
             mUnavailable = true;
             setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
             setHasOptionsMenu(false);
@@ -136,7 +140,12 @@
 
         // Disable all actions if VPN configuration has been disallowed
         for (int i = 0; i < menu.size(); i++) {
-            menu.getItem(i).setEnabled(!mUnavailable);
+            if (isUiRestrictedByOnlyAdmin()) {
+                RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
+                        menu.getItem(i), getRestrictionEnforcedAdmin());
+            } else {
+                menu.getItem(i).setEnabled(!mUnavailable);
+            }
         }
 
         // Hide lockdown VPN on devices that require IMS authentication
@@ -172,11 +181,10 @@
 
         if (mUnavailable) {
             // Show a message to explain that VPN settings have been disabled
-            TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-            setEmptyView(emptyView);
-            if (emptyView != null) {
-                emptyView.setText(R.string.vpn_settings_not_available);
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.vpn_settings_not_available);
             }
+            getPreferenceScreen().removeAll();
             return;
         }
 
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index bf093d4..adf1ce0 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -34,6 +34,7 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -64,6 +65,8 @@
     private boolean mDisabledByAdmin = false;
     private EnforcedAdmin mEnforcedAdmin = null;
 
+    private String mMetricsTag;
+
     private ArrayList<OnSwitchChangeListener> mSwitchChangeListeners =
             new ArrayList<OnSwitchChangeListener>();
 
@@ -125,6 +128,10 @@
         setVisibility(View.GONE);
     }
 
+    public void setMetricsTag(String tag) {
+        mMetricsTag = tag;
+    }
+
     public void setTextViewLabel(boolean isChecked) {
         mLabel = getResources()
                 .getString(isChecked ? R.string.switch_on_text : R.string.switch_off_text);
@@ -217,9 +224,11 @@
     @Override
     public void onClick(View v) {
         if (mDisabledByAdmin) {
+            MetricsLogger.histogram(mContext, mMetricsTag + "/switch_bar|restricted", 1);
             RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mEnforcedAdmin);
         } else {
             final boolean isChecked = !mSwitch.isChecked();
+            MetricsLogger.histogram(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);
             setChecked(isChecked);
         }
     }
@@ -318,11 +327,15 @@
         requestLayout();
     }
 
+    @Override
+    public CharSequence getAccessibilityClassName() {
+        return Switch.class.getName();
+    }
+
     /** @hide */
     @Override
     public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
         super.onInitializeAccessibilityNodeInfoInternal(info);
-        info.setClassName(Switch.class.getName());
         info.setText(mTextView.getText());
         info.setCheckable(true);
         info.setChecked(mSwitch.isChecked());
@@ -332,7 +345,10 @@
     @Override
     public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
         super.onInitializeAccessibilityEventInternal(event);
-        event.setClassName(Switch.class.getName());
+        // Don't say "on on" or "off off" - rather, speak the state only once. We need to specify
+        // this explicitly as each of our children (the textview and the checkbox) contribute to
+        // the state once, giving us duplicate text by default.
+        event.setContentDescription(mTextView.getText());
         event.setChecked(mSwitch.isChecked());
     }
 }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index fbdc4bf..54bd3d0 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -535,30 +535,43 @@
                         config.enterpriseConfig.setPhase2Method(phase2Method);
                         break;
                 }
+
                 String caCert = (String) mEapCaCertSpinner.getSelectedItem();
+                config.enterpriseConfig.setCaCertificateAliases(null);
+                config.enterpriseConfig.setCaPath(null);
+                config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
                 if (caCert.equals(mUnspecifiedCertString)
                         || caCert.equals(mDoNotValidateEapServerString)) {
-                    // Note: |caCert| should not be able to take the value |unspecifiedCert|,
-                    // since we prevent such configurations from being saved.
-                    config.enterpriseConfig.setCaCertificateAliases(null);
-                } else {
-                    config.enterpriseConfig.setDomainSuffixMatch(
-                            mEapDomainView.getText().toString());
-                    if (caCert.equals(mUseSystemCertsString)) {
-                        config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
-                    } else if (caCert.equals(mMultipleCertSetString)) {
-                        if (mAccessPoint != null) {
-                            if (!mAccessPoint.isSaved()) {
-                                Log.e(TAG, "Multiple certs can only be set "
-                                        + "when editing saved network");
-                            }
-                            config.enterpriseConfig.setCaCertificateAliases(
-                                    mAccessPoint.getConfig().enterpriseConfig
-                                            .getCaCertificateAliases());
+                    // ca_cert already set to null, so do nothing.
+                } else if (caCert.equals(mUseSystemCertsString)) {
+                    config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
+                } else if (caCert.equals(mMultipleCertSetString)) {
+                    if (mAccessPoint != null) {
+                        if (!mAccessPoint.isSaved()) {
+                            Log.e(TAG, "Multiple certs can only be set "
+                                    + "when editing saved network");
                         }
-                    } else {
-                        config.enterpriseConfig.setCaCertificateAliases(new String[] {caCert});
+                        config.enterpriseConfig.setCaCertificateAliases(
+                                mAccessPoint
+                                        .getConfig()
+                                        .enterpriseConfig
+                                        .getCaCertificateAliases());
                     }
+                } else {
+                    config.enterpriseConfig.setCaCertificateAliases(new String[] {caCert});
+                }
+
+                // ca_cert or ca_path should not both be non-null, since we only intend to let
+                // the use either their own certificate, or the system certificates, not both.
+                // The variable that is not used must explicitly be set to null, so that a
+                // previously-set value on a saved configuration will be erased on an update.
+                if (config.enterpriseConfig.getCaCertificateAliases() != null
+                        && config.enterpriseConfig.getCaPath() != null) {
+                    Log.e(TAG, "ca_cert ("
+                            + config.enterpriseConfig.getCaCertificateAliases()
+                            + ") and ca_path ("
+                            + config.enterpriseConfig.getCaPath()
+                            + ") should not both be non-null");
                 }
 
                 String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index e391fc8..12e5c54 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -54,7 +54,6 @@
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -633,6 +632,9 @@
         // Safeguard from some delayed event handling
         if (getActivity() == null) return;
         if (isUiRestricted()) {
+            if (!isUiRestrictedByOnlyAdmin()) {
+                addMessagePreference(R.string.wifi_empty_list_user_restricted);
+            }
             getPreferenceScreen().removeAll();
             return;
         }
@@ -718,20 +720,11 @@
         }
     }
 
-    @Override
-    protected TextView initEmptyTextView() {
-        TextView emptyView = (TextView) getActivity().findViewById(android.R.id.empty);
-        emptyView.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
-        return emptyView;
-    }
-
-    @Override
-    protected View initAdminSupportDetailsView() {
-        return getActivity().findViewById(R.id.admin_support_details);
-    }
-
     private void setOffMessage() {
         if (isUiRestricted()) {
+            if (!isUiRestrictedByOnlyAdmin()) {
+                addMessagePreference(R.string.wifi_empty_list_user_restricted);
+            }
             getPreferenceScreen().removeAll();
             return;
         }