Merge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev
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/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/conversation_message_icon.xml b/res/layout/conversation_message_icon.xml
new file mode 100644
index 0000000..4ffd285
--- /dev/null
+++ b/res/layout/conversation_message_icon.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<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/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/values-af/strings.xml b/res/values-af/strings.xml
index a7518bf..232ca18 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 92bb5d9..5231627 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f970f81..3f98ced 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -383,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>
@@ -493,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>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 4290f2a..f8b72a2 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 223b4be..8c1608d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -377,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>
@@ -487,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>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4b115d8..999157e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 008c13c..d72720e 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -375,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>
@@ -485,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>
@@ -1693,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>
@@ -1710,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>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index 0a83340..2db29be 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -390,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>
@@ -500,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>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b554211..79149b4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -336,7 +336,7 @@
     <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">"No s\'han activat les funcions de protecció del dispositiu. 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_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>
@@ -375,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>
@@ -413,10 +415,10 @@
     <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="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 complets. 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. 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. 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. Tria el bloqueig de pantalla que vulguis utilitzar."</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>
@@ -485,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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9e7e1cd..04bc859 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fe22b67..775951c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 16553af..e2d357d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index bbced14..94a6e0f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 324618b..0186ee4 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 324618b..0186ee4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 324618b..0186ee4 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 99ca9d2..b805f5c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3791558..3ee6fd7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 1b86de2..89bd4a9 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 552c0c5..13db00c 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -375,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>
@@ -413,7 +415,7 @@
     <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="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 babeskopiak blokeatzeko pantaila."</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>
@@ -485,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>
@@ -1941,7 +1942,7 @@
     <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="7736174723276745230">"Desaktibatu gailu-administratzaile hau"</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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 760b85e..71d3249 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ae62b56..9c7d75c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 605d3fb..3f77a2d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 335237b..378de4a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 5744af2..f7a4af4 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 4ab6d49..ae33227 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -375,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>
@@ -412,7 +414,7 @@
     <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="1572244299605153324">"તમારા ફોનની સુરક્ષા કરો"</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>
@@ -485,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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fe7aea0..d021511 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e1617f5..63c5a96 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -377,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>
@@ -487,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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a0e7f5c..4079787 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -337,7 +337,7 @@
     <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 ha elveszíti, illetve ellopják."</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>
@@ -375,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>
@@ -485,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>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 8d7409e..42526c7 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c2d2e19..fac84f4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 1a60493..4375364 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5ec5226..723e283 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2002276..87d783a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index af8ec50..0533500 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -375,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>
@@ -489,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>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 15f5bdd..ef80a7d 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 2be55f3..ad15bfe 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index f857c21..030d6d6 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 5d22ebd..b3ae151 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9559d2e..c606892 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 1a86744..1707f15 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 2e244a5..d2220de 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3cb280e..8085a6e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d10b9ed..9296fbc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -377,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>
@@ -487,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>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 5d0551c..b4eb570 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 9cb2bb6..3cf7632 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -375,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>
@@ -485,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>
@@ -658,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>
@@ -1543,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>
@@ -2293,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>
@@ -2859,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 49fe698..f967937 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 83c31b8..b57434e 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index fcf50df..2778361 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 39555ea..c876537 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6a3ec7ed..f916238 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index ea7453d..d80ebc6 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -331,7 +331,7 @@
     <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="1650783655974801525">"नोट: तपाईंको फिंगरप्रिन्ट ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></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>
@@ -375,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>
@@ -413,7 +415,7 @@
     <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="1572244299605153324">"तपाईँको फोन सुरक्षित गर्नुहोस्"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="2431588439043969764">"तपाईंको फिंगरप्रिन्ट ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ। सुरक्षित हुनका लागि जगेडा लक स्क्रिन सेटअप गर्नुहोस्।"</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>
@@ -485,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>
@@ -2271,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="5588995926340277372">"तपाईँको फोन अनलक नगरीकन नै आपतकालीन डायलमा जोकोहीको पहुँच"</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-nl/strings.xml b/res/values-nl/strings.xml
index 05b2e91..7adce33 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index fbb6525..fed92d0 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 58d8e70..8b5c736 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4fc4aba..32e37ef 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a79c6f1..6d6088e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4fc4aba..32e37ef 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 71afbf7..38c54fd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -141,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>
@@ -377,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>
@@ -387,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>
@@ -487,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>
@@ -791,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>
@@ -1161,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>
@@ -1257,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>
@@ -1328,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>
@@ -1399,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>
@@ -1419,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>
@@ -1437,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>
@@ -1446,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>
@@ -1494,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>
@@ -1800,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>
@@ -2129,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>
@@ -2267,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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dba92ba..68aebda 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 3d6a231..358cdc6 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5a5c16b..7a98bfd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 98a28dc..3baee5d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 0de87fb..a5f632d 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index da58c60..eddd5bd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -377,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>
@@ -487,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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ba024fa..3b5a1a2 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6cd1bf7..28a24ec 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -377,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>
@@ -489,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>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index d17c4a9..13e4c4c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 625a8dd..cf94d8e 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 62c3c95..2b542fe 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 676b2fb..15bbe75 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d1af17f..5c0fd1f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1f2b2bc..f2134ca 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -379,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>
@@ -489,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>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 0b17119..96e8863 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index fa71a4a..4fa1aab 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -375,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>
@@ -485,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>
@@ -1941,7 +1942,7 @@
     <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="7736174723276745230">"Bu qurilma administratorini o‘chirib qo‘yish"</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>
@@ -1950,7 +1951,7 @@
     <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="1349673618141610506">"Bu qurilma administratorini 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>
@@ -2271,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="5588995926340277372">"Telefonni qulfdan chiqarmasdan favqulodda tergichdan barcha foydalanishi 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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2c512fa..7670909 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fc062a8..b0eef63 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -375,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>
@@ -485,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>
@@ -2271,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="5588995926340277372">"任何人都能通过紧急呼救拨号器访问,无需先将手机解锁"</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-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 254a5de..09a469c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0e94520..3d5b3f7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -375,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>
@@ -485,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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8d74fe4..df6ee31 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -375,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>
@@ -485,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>
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 aa82cfe..1122e0f 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>
@@ -3132,13 +3133,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>
 
@@ -6095,6 +6096,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>
 
@@ -6882,6 +6889,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] -->
@@ -7000,6 +7028,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>
 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 3b3dafe..02454c0 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -89,6 +89,10 @@
         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 +167,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/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/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/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f33b23d..3de2af2 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -174,7 +174,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 +204,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;
 
@@ -249,9 +250,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;
@@ -413,7 +414,6 @@
         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);
@@ -465,6 +465,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);
@@ -698,6 +700,7 @@
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
         updateVerifyAppsOverUsbOptions();
+        updateOtaDisableAutomaticUpdateOptions();
         updateBugreportOptions();
         updateForceRtlOptions();
         updateLogdSizeValues();
@@ -705,7 +708,6 @@
         updateWifiVerboseLoggingOptions();
         updateWifiAggressiveHandoverOptions();
         updateWifiAllowScansWithTrafficOptions();
-        updateLegacyDhcpClientOptions();
         updateMobileDataAlwaysOnOptions();
         updateSimulateColorSpace();
         updateUSBAudioOptions();
@@ -949,6 +951,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) {
@@ -1393,18 +1413,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));
@@ -1850,6 +1858,8 @@
             writeDebuggerOptions();
         } else if (preference == mVerifyAppsOverUsb) {
             writeVerifyAppsOverUsbOptions();
+        } else if (preference == mOtaDisableAutomaticUpdate) {
+            writeOtaDisableAutomaticUpdateOptions();
         } else if (preference == mStrictMode) {
             writeStrictModeVisualOptions();
         } else if (preference == mPointerLocation) {
@@ -1886,8 +1896,6 @@
             writeWifiAggressiveHandoverOptions();
         } else if (preference == mWifiAllowScansWithTraffic) {
             writeWifiAllowScansWithTrafficOptions();
-        } else if (preference == mLegacyDhcpClient) {
-            writeLegacyDhcpClientOptions();
         } else if (preference == mMobileDataAlwaysOn) {
             writeMobileDataAlwaysOnOptions();
         } else if (preference == mColorTemperaturePreference) {
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/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/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/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/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/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/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/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index c9cdeb8..6a50a6d 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -775,16 +775,14 @@
             userPreferences.add(pref);
         }
 
-        if (!mUserCaps.mIsGuest &&
-                (mUserCaps.mCanAddGuest || findGuest() != null || mUserCaps.mDisallowAddUser)) {
-            // Add a virtual Guest user for guest defaults
+        // Check if Guest tile should be added.
+        if (!mUserCaps.mIsGuest && (mUserCaps.mCanAddGuest || mUserCaps.mDisallowAddUser)) {
             UserPreference pref = new UserPreference(getPrefContext(), null,
                     UserPreference.USERID_GUEST_DEFAULTS,
                     mUserCaps.mIsAdmin && voiceCapable? this : null /* settings icon handler */,
                     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);
@@ -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;
     }