diff --git a/res/layout/app_notification_header.xml b/res/layout/app_header.xml
similarity index 100%
rename from res/layout/app_notification_header.xml
rename to res/layout/app_header.xml
diff --git a/res/layout/app_preferred_settings.xml b/res/layout/app_preferred_settings.xml
new file mode 100644
index 0000000..7c6a45f
--- /dev/null
+++ b/res/layout/app_preferred_settings.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
+    <LinearLayout
+        android:id="@+id/all_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <!-- Prefered activities section -->
+        <TextView android:id="@+id/auto_launch_title"
+            style="?android:attr/listSeparatorTextViewStyle"
+            android:layout_marginTop="8dip"
+            android:text="@string/auto_launch_label" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+            <TextView android:id="@+id/auto_launch"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_alignParentStart="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="6dip" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/auto_launch"
+                android:paddingTop="4dip"
+                android:orientation="horizontal">
+                <View
+                    android:layout_width="120dip"
+                    android:layout_height="0dip"
+                    android:layout_weight="0.4" />
+                <View
+                    android:layout_width="0dip"
+                    android:layout_height="0dip"
+                    android:visibility="invisible"
+                    android:layout_weight="0.2" />
+                <Button
+                    android:id="@+id/clear_activities_button"
+                    android:layout_width="120dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.4"
+                    android:text="@string/clear_activities" />
+            </LinearLayout>
+        </RelativeLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 5b923fc..ccbe105 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -16,448 +16,43 @@
 ** limitations under the License.
 */
 -->
-<ScrollView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/all_details"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:scrollbarStyle="@integer/preference_scrollbar_style">
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:orientation="vertical">
 
+    <!-- App snippet with buttons -->
     <LinearLayout
-        android:id="@+id/all_details"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingBottom="5dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:paddingTop="5dip"
+        android:paddingBottom="10dip"
         android:orientation="vertical">
 
-        <!-- App snippet with buttons -->
-        <LinearLayout
+        <!-- Application snippet label, version and icon -->
+        <include
+            layout="@layout/manage_applications_item"
+            android:id="@+id/app_snippet" />
+
+        <Space
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:orientation="vertical">
+            android:layout_height="5dp" />
 
-            <!-- Application snippet label, version and icon -->
-            <include
-                layout="@layout/manage_applications_item"
-                android:id="@+id/app_snippet" />
+        <!-- Force stop and uninstall buttons -->
+        <include
+            layout="@layout/two_buttons_panel"
+            android:id="@+id/control_buttons_panel"/>
 
-            <!-- Force stop and uninstall buttons -->
-            <include
-                layout="@layout/two_buttons_panel"
-                android:id="@+id/control_buttons_panel"/>
+        <!-- Force stop and uninstall buttons -->
+        <include
+            layout="@layout/two_buttons_panel"
+            android:id="@+id/more_control_buttons_panel"/>
 
-            <!-- Force stop and uninstall buttons -->
-            <include
-                layout="@layout/two_buttons_panel"
-                android:id="@+id/more_control_buttons_panel"/>
-
-            <!-- Ban notifications for this package -->
-            <CheckBox android:id="@+id/notification_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start"
-                android:layout_marginTop="4dip"
-                android:text="@string/app_notifications_switch_label" />
-
-        </LinearLayout>
-
-        <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:layout_marginTop="8dip"
-            android:text="@string/storage_label" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/total_size_prefix"
-                    android:text="@string/total_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/total_size_text"
-                    android:paddingTop="6dip"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/application_size_prefix"
-                    android:text="@string/application_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/application_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/external_code_size_prefix"
-                    android:text="@string/external_code_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/external_code_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/info_size"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/data_size_prefix"
-                    android:text="@string/data_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/data_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:id="@+id/external_data_size_prefix"
-                    android:text="@string/external_data_size_label"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:paddingTop="6dip" />
-                <ImageView
-                    android:id="@+id/info_size_dots"
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/external_data_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <!-- Clear data and install location buttons  -->
-            <include
-                layout="@layout/two_buttons_panel"
-                android:id="@+id/data_buttons_panel"/>
-
-        </LinearLayout>
-
-        <!-- Clear cache section -->
-        <RelativeLayout
-            android:id="@+id/cache_panel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:id="@+id/cache_header"
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:layout_marginTop="8dip"
-                android:text="@string/cache_header_label" />
-            <LinearLayout
-                android:id="@+id/cache_size"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="true"
-                android:layout_below="@id/cache_header"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:paddingTop="-1dip">
-                <TextView
-                    android:text="@string/cache_size_label"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:gravity="center_vertical" />
-                <ImageView
-                    android:src="@drawable/dotted_line_480px"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_height="1px"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="1dip"
-                    android:layout_marginEnd="1dip"
-                    android:layout_marginBottom="4dip"
-                    android:scaleType="center"
-                    android:contentDescription="@null" />
-                <TextView
-                    android:id="@+id/cache_size_text"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:paddingTop="6dip"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:maxLines="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/cache_size"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:paddingTop="4dip"
-                android:orientation="horizontal">
-                <View
-                    android:layout_width="120dip"
-                    android:layout_height="0dip"
-                    android:layout_weight="0.4" />
-                <View
-                    android:layout_width="0dip"
-                    android:layout_height="0dip"
-                    android:visibility="invisible"
-                    android:layout_weight="0.2" />
-                <Button
-                    android:id="@+id/clear_cache_button"
-                    android:layout_width="120dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.4"
-                    android:text="@string/clear_cache_btn_text" />
-            </LinearLayout>
-
-        </RelativeLayout>
-
-        <!-- Prefered activities section -->
-        <TextView android:id="@+id/auto_launch_title"
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:layout_marginTop="8dip"
-            android:text="@string/auto_launch_label" />
-
-        <RelativeLayout 
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-            <TextView android:id="@+id/auto_launch"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentStart="true"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="6dip" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/auto_launch"
-                android:paddingTop="4dip"
-                android:orientation="horizontal">
-                <View
-                    android:layout_width="120dip"
-                    android:layout_height="0dip"
-                    android:layout_weight="0.4" />
-                <View
-                    android:layout_width="0dip"
-                    android:layout_height="0dip"
-                    android:visibility="invisible"
-                    android:layout_weight="0.2" />
-                <Button
-                    android:id="@+id/clear_activities_button"
-                    android:layout_width="120dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.4"
-                    android:text="@string/clear_activities" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <!-- Screen compatibility section -->
-        <LinearLayout android:id="@+id/screen_compatibility_section"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-            <TextView
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:layout_marginTop="8dip"
-                android:text="@string/screen_compatibility_label" />
-
-            <TextView android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentStart="true"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="6dip"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:text="@string/screen_compatibility_text"/>
-            <CheckBox android:id="@+id/ask_compatibility_cb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dip"
-                android:layout_gravity="start"
-                android:text="@string/ask_compatibility" />
-            <CheckBox android:id="@+id/enable_compatibility_cb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dip"
-                android:layout_gravity="start"
-                android:text="@string/enable_compatibility" />
-        </LinearLayout>
-
-        <!-- Permissions section -->
-        <LinearLayout
-            android:id="@+id/permissions_section"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <TextView
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:layout_marginTop="8dip"
-                android:text="@string/permissions_label" />
-            <TextView android:id="@+id/security_settings_billing_desc"
-                android:text="@string/security_settings_billing_desc"
-                android:textColor="#ffffb060"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:paddingTop="6dip"
-                android:paddingBottom="6dip"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <LinearLayout
-                android:id="@+id/security_settings_billing_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/security_settings_premium_sms_desc" />
-                <Spinner
-                    android:id="@+id/security_settings_premium_sms_list"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:spinnerMode="dropdown" />
-            </LinearLayout>
-            <TextView android:id="@+id/security_settings_desc"
-                android:text="@string/security_settings_desc"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:paddingTop="6dip"
-                android:paddingBottom="6dip"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <LinearLayout
-                android:id="@+id/security_settings_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"/>
-        </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</LinearLayout>
 
diff --git a/res/layout/permission_settings.xml b/res/layout/permission_settings.xml
new file mode 100644
index 0000000..8233c81
--- /dev/null
+++ b/res/layout/permission_settings.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
+    <LinearLayout
+        android:id="@+id/all_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <!-- Permissions section -->
+        <LinearLayout
+            android:id="@+id/permissions_section"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
+                android:text="@string/permissions_label" />
+            <TextView android:id="@+id/security_settings_billing_desc"
+                android:text="@string/security_settings_billing_desc"
+                android:textColor="#ffffb060"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:paddingTop="6dip"
+                android:paddingBottom="6dip"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <LinearLayout
+                android:id="@+id/security_settings_billing_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_premium_sms_desc" />
+                <Spinner
+                    android:id="@+id/security_settings_premium_sms_list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown" />
+            </LinearLayout>
+            <TextView android:id="@+id/security_settings_desc"
+                android:text="@string/security_settings_desc"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:paddingTop="6dip"
+                android:paddingBottom="6dip"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <LinearLayout
+                android:id="@+id/security_settings_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"/>
+        </LinearLayout>
+
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/storage_settings.xml b/res/layout/storage_settings.xml
new file mode 100644
index 0000000..b8dddfd
--- /dev/null
+++ b/res/layout/storage_settings.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
+    <LinearLayout
+        android:id="@+id/all_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+
+        <TextView
+            style="?android:attr/listSeparatorTextViewStyle"
+            android:layout_marginTop="8dip"
+            android:text="@string/storage_label" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:id="@+id/total_size_prefix"
+                    android:text="@string/total_size_label"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:paddingTop="6dip" />
+                <ImageView
+                    android:id="@+id/info_size_dots"
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
+                <TextView
+                    android:id="@+id/total_size_text"
+                    android:paddingTop="6dip"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:id="@+id/application_size_prefix"
+                    android:text="@string/application_size_label"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:paddingTop="6dip" />
+                <ImageView
+                    android:id="@+id/info_size_dots"
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
+                <TextView
+                    android:id="@+id/application_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:id="@+id/external_code_size_prefix"
+                    android:text="@string/external_code_size_label"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:paddingTop="6dip" />
+                <ImageView
+                    android:id="@+id/info_size_dots"
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
+                <TextView
+                    android:id="@+id/external_code_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/info_size"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:id="@+id/data_size_prefix"
+                    android:text="@string/data_size_label"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:paddingTop="6dip" />
+                <ImageView
+                    android:id="@+id/info_size_dots"
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
+                <TextView
+                    android:id="@+id/data_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:id="@+id/external_data_size_prefix"
+                    android:text="@string/external_data_size_label"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:paddingTop="6dip" />
+                <ImageView
+                    android:id="@+id/info_size_dots"
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
+                <TextView
+                    android:id="@+id/external_data_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+            </LinearLayout>
+
+            <!-- Clear data and install location buttons  -->
+            <include
+                layout="@layout/two_buttons_panel"
+                android:id="@+id/data_buttons_panel"/>
+
+        </LinearLayout>
+
+
+        <!-- Clear cache section -->
+        <RelativeLayout
+            android:id="@+id/cache_panel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+            <TextView
+                android:id="@+id/cache_header"
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
+                android:text="@string/cache_header_label" />
+            <LinearLayout
+                android:id="@+id/cache_size"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:layout_below="@id/cache_header"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:text="@string/cache_size_label"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:gravity="center_vertical" />
+                <ImageView
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
+                <TextView
+                    android:id="@+id/cache_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/cache_size"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:paddingTop="4dip"
+                android:orientation="horizontal">
+                <View
+                    android:layout_width="120dip"
+                    android:layout_height="0dip"
+                    android:layout_weight="0.4" />
+                <View
+                    android:layout_width="0dip"
+                    android:layout_height="0dip"
+                    android:visibility="invisible"
+                    android:layout_weight="0.2" />
+                <Button
+                    android:id="@+id/clear_cache_button"
+                    android:layout_width="120dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.4"
+                    android:text="@string/clear_cache_btn_text" />
+            </LinearLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 36d0302..e210a47 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wagwoorde"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripteer tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripteer foon"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliseer helderheidsvlak vir die beskikbare lig"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skerm skakel af"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Liggingmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gebruik GPS, Wi‑Fi en sellulêre netwerke om ligging te bepaal"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gebruik Wi‑Fi en sellulêre netwerke om ligging te bepaal"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gebruik GPS om jou ligging te bepaal"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gebruik GPS om ligging te bepaal"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- en selnetwerkligging"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Laat programme Google se liggingsdiens gebruik om jou ligging vinniger te beraam. Anonieme liggingsdata sal ingesamel word en aan Google gestuur word."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ligging deur Wi-Fi vasgestel"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"skerm raakskerm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dempskerm raakskerm battery"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dempskerm raakskerm battery"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"agtergrond personaliseer pasmaak skem"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksgrootte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projek"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"spasie skyf hardeskyf toestel gebruik"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 13c8c60..611d522 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"የይለፍ ቃሎች"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ማመስጠሪያ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ስልክ አመስጥር"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"የማያ ብሩህነት አስተካክል"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"ተለማማጅ ብሩህነት"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ለሚገኘው ብርሃን የብሩህነት ደረጃ አመቻች"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"አንቀላፋ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ማያ ገጽ የሚጠፋው"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"የአካባቢ ሁነታ"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"አካባቢ ለማወቅ ጂፒኤስ፣ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ተጠቀም"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"አካባቢ ለማወቅ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ተጠቀም"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"የእርስዎን አካባቢ ለማወቅ ጂ ፒ ኤስ ይጠቀሙ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"መገኛ አካባቢን ለማወቅ ጂ ፒ ኤስ ተጠቀም"</string>
     <string name="location_network_based" msgid="6010456018401296590">"የWi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"አካባቢ በWi-Fi ይታወቃል"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ማያ ገጽ ተነኪ ማያ ገጽ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"አጨልም ማያንካ ባትሪ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"አጨልም ማያንካ ባትሪ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"በስተጀርባ ማሳያ ግላዊነት ያላብሱ ያበጁ"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"የጽሁፍ መጠን"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ፕሮጀክት"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ክፍት ቦታ ዲስክ ደረቅ አንጻፊ መሣሪያ አጠቃቀም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b286500..eeaaca1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -347,6 +347,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏تعيين موقعي، إلغاء تأمين الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"كلمات المرور"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"التشفير"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"تشفير الهاتف"</string>
@@ -798,6 +837,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"السطوع المتكيف"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"تحسين مستوى السطوع بحسب الإضاءة المتاحة"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"السكون"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"إيقاف الشاشة"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
@@ -1093,7 +1142,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"وضع الموقع"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏استخدام نظام تحديد المواقع العالمي (GPS) وشبكات Wi‑Fi وشبكات الجوّال لتحديد الموقع"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏استخدام شبكات Wi‑Fi وشبكات الجوّال لتحديد الموقع"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏استخدام نظام تحديد المواقع العالمي (GPS) لتحديد موقعك"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استخدام نظام تحديد المواقع العالمي (GPS) في تحديد الموقع"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏موقع شبكة Wi‑Fi وشبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
@@ -2340,7 +2389,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"شاشة لمس للشاشة"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"تعتيم شاشة شاشة لمس بطارية"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"تعتيم شاشة شاشة لمس بطارية"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"خلفية تخصيص التخصيص عرض"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"حجم النص"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"المشروع"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"مسافة قرص محرك أقراص ثابتة جهاز استخدام"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f2ffaf9..8cfb7d7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифроване"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифроване на таблета"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифроване на телефона"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Наглася яркостта на екрана"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивна яркост"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизиране на нивото на яркостта спрямо наличната светлина"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Спящ режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранът се изключва"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим за местоположението"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Използване на GPS, Wi‑Fi и клетъчни мрежи за определяне на местоположението"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Използване на Wi‑Fi и клетъчни мрежи за определяне на местоположението"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Използване на GPS за установяване на местоположението ви"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Използване на GPS за определяне на местоположението"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mестоп. от Wi‑Fi и клет. мрежа"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Местоположението се определя чрез Wi‑Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"екран, сензорен екран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затъмнен екран сензорен екран батерия"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затъмнен екран сензорен екран батерия"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон персонализиране персонализиране на дисплея"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер на текста"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"прожектиране"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"място диск твърд диск устройство употреба"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 595c51b..5e31246 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"পাসওয়ার্ড"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"এনক্রিপশান"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ট্যাবলেট এনক্রিপ্ট করুন"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ফোন এনক্রিপ্ট করুন"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"স্ক্রীনের উজ্জ্বলতা সামঞ্জস্য করুন"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"অভিযোজিত উজ্জ্বলতা"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"উপলব্ধ আলোর পরিপ্রেক্ষিতে উজ্জ্বলতার স্তর মানানসই করুন"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"নিদ্রা মোডে নিয়ে যাওয়া"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"স্ক্রীন বন্ধ হয়"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ধরে নিষ্ক্রিয়তার পরে"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"অবস্থান মোড"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"অবস্থান নির্ণয় করার জন্য GPS, Wi‑Fi ও সেলুলার নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"অবস্থান নির্ণয় করার জন্য Wi‑Fi ও সেলুলার নেটওয়ার্ক ব্যবহার করুন"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"আপনার অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi ও সেলুলার নেটওয়ার্ক অবস্থান"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"দ্রুত আপনার অবস্থান নির্ধারণ করতে অ্যাপ্লিকেশানগুলিকে Google অবস্থান পরিষেবা ব্যবহার করতে দিন। বেনামী অবস্থান ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi দ্বারা অবস্থান নির্ণয় করা হয়েছে"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"স্ক্রীন টাচস্ক্রীন"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"হালকা আলো টাচস্ক্রীন ব্যাটারি"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"হালকা আলো টাচস্ক্রীন ব্যাটারি"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"পটভূমি ব্যক্তিগতকৃত কাস্টমাইজ প্রদর্শন"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"পাঠ্য আকার"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"অভিক্ষেপ করুন"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"স্থান ডিস্ক হার্ড ড্রাইভ ডিভাইস ব্যবহার"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b4bf76e..841f7b7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptació"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptació de la tauleta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encripta el telèfon"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillantor automàtica"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimitza el nivell de brillantor segons la llum disponible"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Fa servir el GPS, la Wi-Fi i les xarxes mòbils per determinar la ubicació."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Fa servir la Wi-Fi i les xarxes mòbils per determinar la ubicació."</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Fa servir el GPS per calcular la ubicació."</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilitza el GPS per determinar la ubicació"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicació xarxa Wi‑Fi i mòbil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicació determinada per Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla tàctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pantalla atenuada pantalla tàctil bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"pantalla atenuada pantalla tàctil bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fons de pantalla personalitzar adaptar pantalla"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"mida del text"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projecte"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espai disc unitat de disc dur dispositiu ús"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7231976..b06c2c5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrování"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovat tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrování telefonu"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptivní jas"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovat úroveň jasu podle okolního světla"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určování polohy"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"K určení polohy použít GPS, Wi-Fi a mobilní sítě"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"K určení polohy použít Wi-Fi a mobilní sítě"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"K určení polohy použít GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"K určení polohy použít GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Poloha z Wi-Fi a mobilních sítí"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu určování polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha určená sítí Wi-Fi"</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotykový displej"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ztlumit obrazovka dotykový displej baterie"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ztlumit obrazovka dotykový displej baterie"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadí personalizace přizpůsobení displej"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost textu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekce"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"místo disk pevný disk zařízení využití"</string>
@@ -2420,7 +2472,7 @@
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokud tuto funkci nevypnete"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritní vyrušení"</string>
-    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Výpadek"</string>
+    <string name="zen_mode_downtime_category" msgid="2654477732333340290">"Pozastavení"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dny"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Žádné"</string>
     <string name="zen_mode_downtime_mode_title" msgid="7249388756365079715">"Vyrušení jsou povolena"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e5a183c..ae8a030 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Tilpasset lysstyrke"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimer lysstyrken til det omgivende lys"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Placeringstilstand"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Brug GPS, Wi-Fi- og mobilnetværk til at fastslå din placering"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Brug Wi-Fi- og mobilnetværk til at fastslå din placering"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Brug GPS-signal til at fastlægge din placering"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Brug GPS-signal til at fastslå din placering"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Placering via Wi-Fi og mobilnetværk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillad, at apps bruger Googles placeringstjeneste til at beregne din placering hurtigere. Der indsamles anonyme placeringsdata, som sendes til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Placeringen fastlægges af Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"skærm berøringsskærm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dæmpe skærm touchskærm batteri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dæmpe skærm touchskærm batteri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"baggrund personliggør tilpas visning"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"plads disk harddisk enhedsbrug"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e6b6d6d..e9ee908 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Verschlüsselung"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon verschlüsseln"</string>
@@ -771,6 +810,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive Helligkeit"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Helligkeitsstufe an Lichtverhältnisse anpassen"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Display wird ausgeschaltet."</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -1062,7 +1111,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Standortmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, WLAN- und Mobilfunknetze zur Standortbestimmung verwenden"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"WLAN- und Mobilfunknetze zur Standortbestimmung verwenden"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS zur Standortbestimmung nutzen"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS zur Standortbestimmung nutzen"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Standort per WLAN und Mobilfunk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Standort per WLAN ermittelt"</string>
@@ -2309,7 +2358,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"bildschirm touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"display dimmen touchscreen akku"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"display dimmen touchscreen akku"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"hintergrund personalisieren display anpassen"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textgröße"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projizieren"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"speicherplatz festplatte gerät nutzung gerätenutzung"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e380f66..0d3edd6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Κρυπτογράφηση"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Κρυπτογράφηση τηλεφώνου"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Προσαρμοστική φωτεινότητα"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Βελτιστοποίηση του επιπέδου φωτεινότητας για το διαθέσιμο φως"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Απουσία δραστηριότητας"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Η οθόνη απενεργοποιείται"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Λειτουργία τοποθεσίας"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Χρήση GPS, Wi‑Fi και δικτύων κινητής τηλεφωνίας για καθορισμό τοποθεσίας"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Χρήση Wi‑Fi και δεδομένων κινητής τηλεφωνίας για καθορισμό τοποθεσίας"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Χρήση του GPS για τον καθορισμό της τοποθεσίας σας"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Χρήση GPS για τον προσδιορισμό της τοποθεσίας"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi και τοποθ. δικτύου κιν. τηλ."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν την υπηρεσία τοποθεσίας της Google για γρήγορη εκτίμηση της τοποθεσίας σας. Θα συλλεχθούν ανώνυμα δεδομένα και θα αποσταλούν στην Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
@@ -2310,7 +2359,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"οθόνη αφής"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"μείωση φωτεινότητας οθόνης οθόνη αφής μπαταρία"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"μείωση φωτεινότητας οθόνης οθόνη αφής μπαταρία"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"φόντο εξατομίκευση προσαρμογή οθόνη"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"μέγεθος κειμένου"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"έργο"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"χώρος στο δίσκο σκληρός δίσκος χρήση συσκευής"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0d51dafc..a6e0666 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -343,6 +343,29 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints enrolled</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint enrolled</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="8275201068478623705">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to: \n✓ Set up your background screen lock method \n✓ Add your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Let\'s start!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Put your finger on the fingerprint sensor. Lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Great! Now repeat."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Put the same finger on the fingerprint sensor and lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
+    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Partial fingerprint detected. Please try again."</string>
+    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingerprint sensor is dirty. Please clean and try again."</string>
+    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Finger moved to fast. Please try again."</string>
+    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Finger moved to slow. Please try again."</string>
+    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Unable to process. Try again."</string>
+    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware not available."</string>
+    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingerprint can\'t be stored. Please remove an existing fingerprint."</string>
+    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Fingerprint timeout reached. Try again."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
@@ -770,6 +793,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Theme"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Light"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Dark"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1061,7 +1089,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Use GPS to determine your location"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
@@ -2308,7 +2336,8 @@
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"dark theme night mode dim screen invert brightness"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0d51dafc..a6e0666 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -343,6 +343,29 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints enrolled</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint enrolled</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="8275201068478623705">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to: \n✓ Set up your background screen lock method \n✓ Add your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Let\'s start!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Put your finger on the fingerprint sensor. Lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Great! Now repeat."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Put the same finger on the fingerprint sensor and lift after you feel a vibration."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
+    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Partial fingerprint detected. Please try again."</string>
+    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingerprint sensor is dirty. Please clean and try again."</string>
+    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Finger moved to fast. Please try again."</string>
+    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Finger moved to slow. Please try again."</string>
+    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Unable to process. Try again."</string>
+    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware not available."</string>
+    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingerprint can\'t be stored. Please remove an existing fingerprint."</string>
+    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Fingerprint timeout reached. Try again."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
@@ -770,6 +793,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Theme"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Light"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Dark"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1061,7 +1089,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Use GPS to determine your location"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
@@ -2308,7 +2336,8 @@
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dim screen touchscreen battery"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalise customise display"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"dark theme night mode dim screen invert brightness"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"background personalise customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"project"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 71ba823..d034b81 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar dispositivo"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Cuando se apaga la pantalla"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Determinar ubicación con GPS, Wi‑Fi y redes móviles"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Determinar ubicación con Wi‑Fi y redes móviles"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Determinar ubicación con GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicación de Wi-Fi y red móvil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla, pantalla táctil, batería"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar pantalla, pantalla táctil, batería"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano, personalizar, ajustar pantalla"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyectar"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espacio, disco, disco duro, uso de dispositivo"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6b4e6ab..09ac548 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Cifrado"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Cifrar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Cifrar teléfono"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla se apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Determinar ubicación con GPS, Wi‑Fi y redes móviles"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Determinar ubicación con Wi‑Fi y redes móviles"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Determinar ubicación con GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con el GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicación de red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -1084,7 +1133,7 @@
     <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
-    <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
+    <string name="terms_title" msgid="7697580845616764642">"Condiciones de uso"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"Licencia de WebView del sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fondos de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Proveedores de imágenes de satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar, patalla, pantalla táctil, batería"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar, patalla, pantalla táctil, batería"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano, personalizar, customizar, pantalla"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyecto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espacio, disco, disco duro, dispositivo, uso"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index f38254b..276fc58 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroolid"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tahvelarvuti krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoni krüpteerimine"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Reguleeri ekraani heledust"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kohanduv heledus"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Heleduse optimeerimine valgustingimuste järgi"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Unerežiim"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekraan lülitub välja"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -919,7 +968,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kaamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Võimaldab edastada fotosid kaamera tarkvara abil ja edastada mis tahes faile arvutitest, mis ei toeta MTP-d."</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"Võimaldab lubatud MIDI-ga rakendustel teie arvutis oleva MIDI-tarkvara abil töötada USB kaudu."</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"Võimaldab MIDI toega rakendustel teie arvutis oleva MIDI-tarkvara abil töötada USB kaudu."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Teised kasutajad"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Aku olek"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aku tase"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Asukoharežiim"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Asukoha määramine GPS-i, WiFi- ja mobiilsidevõrgu abil"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Asukoha määramine WiFi- ja mobiilsidevõrgu abil"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Asukoha määramine GPS-i abil"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Kasutage asukoha määramiseks GPS-i"</string>
     <string name="location_network_based" msgid="6010456018401296590">"WiFi/mobiilsidevõrgu asukoht"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Lubage rakendustel kasutada Google\'i asukohateenust, et asukohta kiiremini määrata. Kogutud anonüümsed asukohaandmed saadetakse Google\'ile."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"WiFi järgi määratud asukoht"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ekraan puutetundlik ekraan"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ekraani hämardamine puuteekraan aku"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ekraani hämardamine puuteekraan aku"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tausta isikupärastamine kuva kohandamine"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksti suurus"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruum ketas kõvaketas seadme kasutus"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index a3ce4ad..2da1705 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Pasahitzak"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkriptatzea"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkriptatu tableta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkriptatu telefonoa"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Doitu pantailaren distira"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Distira doigarria"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizatu pantailaren distira inguruko argitasunaren arabera"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -919,7 +968,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Argazkiak kamera-softwarea erabilita transferitzea ahalbidetzen dizu, baita MTP onartzen ez duten ordenagailuetan fitxategiak transferitzea ere"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"Baimendu MIDI gaitasuna duten aplikazioek USB bidez lan egitea ordenagailuko MIDI softwarearekin."</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI gaitasuna duten aplikazioei ordenagailuko MIDI softwarearekin USB bidez lan egitea baimentzen die."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Beste erabiltzaileak"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Bateriaren egoera"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Bateria-maila"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Kokapen modua"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Erabili GPS antena, Wi‑Fi sarea eta sare mugikorrak kokapena zehazteko"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Erabili Wi‑Fi sarea eta sare mugikorrak kokapena zehazteko"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Erabili GPSa kokapena zehazteko"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Erabili GPS sistema kokapena zehazteko"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi eta sare mugikor bidezko kokapena"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Utzi aplikazioei zure kokapena bizkorrago zehazteko Google-ren kokapen-zerbitzua erabiltzen. Kokapen-datu anonimoak bildu eta Google-ra bidaliko dira."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Kokapena Wi-Fi bidez zehaztuta"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ukipen pantaila"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ilundu pantaila, ukipen-pantaila, bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ilundu pantaila, ukipen-pantaila, bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"atzeko planoa, pertsonalizatu, pantaila"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"testuaren tamaina"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proiektu"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"tokia, diskoa, disko gogorra, gailua, erabilera"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f3ff93b..eb7809b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -93,7 +93,7 @@
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"زمان بیداری هنگام شارژ کردن:"</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"زمان روشن بودن صفحه:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"ناشناس"</string>
-    <string name="battery_info_status_charging" msgid="1705179948350365604">"شارژ کردن"</string>
+    <string name="battery_info_status_charging" msgid="1705179948350365604">"در حال شارژ شدن"</string>
     <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"شارژ با جریان متناوب"</string>
     <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"‏شارژ از طریق USB"</string>
     <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"شارژ به صورت بی‌سیم"</string>
@@ -343,6 +343,29 @@
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"گذرواژه‌ها"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"اثر انگشت"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one">‏<xliff:g id="COUNT_1">%1$d</xliff:g> اثر انگشت ثبت شد</item>
+      <item quantity="other">‏<xliff:g id="COUNT_1">%1$d</xliff:g> اثر انگشت ثبت شد</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"تنظیم اثر انگشت"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="8275201068478623705">"برای استفاده از اثر انگشت جهت باز کردن قفل صفحه‌نمایش یا تأیید خرید، باید: \n‏✓ روش قفل صفحه پس‌زمینه‌تان را تنظیم کنید \n‏✓ اثر انگشتتان را اضافه کنید"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"بیایید شروع کنیم."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"انگشتتان را روی حسگر اثر انگشت بگذارید. بعد از احساس لرزش آن را بردارید."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"عالی است! اکنون دوباره تکرار کنید."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"همان انگشت را روی حسگر اثر انگشت بگذارید و بعد از احساس لرزش آن را بردارید."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"اثر انگشت اضافه شد."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"افزودن"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"بعدی"</string>
+    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"بخشی از اثر انگشت شناسایی شد. لطفاً دوباره امتحان کنید."</string>
+    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"حسگر اثر انگشت کثیف است. لطفاً آن را تمیز کنید و دوباره امتحان نمایید."</string>
+    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"انگشت خیلی سریع حرکت کرد. لطفاً دوباره امتحان کنید."</string>
+    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"انگشت خیلی آهسته حرکت کرد. لطفاً دوباره امتحان کنید."</string>
+    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"پردازش ممکن نیست. دوباره امتحان کنید."</string>
+    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"سخت‌افزار در دسترس نیست."</string>
+    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ذخیره اثر انگشت ممکن نیست. لطفاً یک اثر انگشت موجود را حذف کنید."</string>
+    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"مهلت زمانی ثبت اثر انگشت به پایان رسید. دوباره امتحان کنید."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"رمزگذاری"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری رایانهٔ لوحی"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری تلفن"</string>
@@ -770,6 +793,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"تنظیم روشنایی صفحه"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"روشنایی تطبیقی"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"بهینه‌سازی سطح روشنایی برای نور در دسترس"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"طرح‌زمینه"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"روشن"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"تیره"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"خودکار"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"حالت خواب"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"صفحه نمایش خاموش می‌شود"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"پس از گذشت <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> از غیر فعال بودن"</string>
@@ -1061,7 +1089,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"حالت مکان"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏استفاده از GPS،‏ Wi-Fi و شبکه‌های تلفن همراه برای تعیین مکان"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏استفاده از Wi-Fi و شبکه‌های تلفن همراه برای تعیین مکان"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏استفاده از GPS برای تعیین مکان شما"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استفاده از GPS برای تعیین موقعیت مکانی"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏به برنامه‌ها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریع‌تر تخمین بزنند. داده‌های مکان به‌طور ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
@@ -1565,7 +1593,7 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"استفاده از باتری از زمان بازنشانی"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> در باتری"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> از زمان جدا کردن"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"شارژ کردن"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"در حال شارژ شدن"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"صفحه روشن"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"‏GPS در"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
@@ -2308,7 +2336,8 @@
     <string name="keywords_display" msgid="6709007669501628320">"صفحه نمایش صفحه لمسی"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"باتری صفحه‌لمسی صفحه کم نور"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"باتری صفحه‌لمسی صفحه کم نور"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"پس‌زمینه شخصی‌سازی سفارشی‌سازی نمایشگر"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"طرح‌زمینه تیره حالت شب تار کردن صفحه‌نمایش معکوس کردن روشنایی"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"شخصی‌سازی پس‌زمینه سفارشی کردن نمایشگر"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"اندازه نوشتار"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"پروژه"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"فضا دیسک دیسک سخت دستگاه استفاده"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4ccbf54..b825628 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -343,13 +343,52 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Salaus"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa tablet-laite"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa tabletti"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Salaa puhelin"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Voit salata tilisi, asetukset, ladatut sovellukset tietoineen, median ja muut tiedostot. Jos olet salannut puhelimesi ja kytkenyt näytön lukituksen (kuvion, PIN-koodin tai salasanan avulla), sinun pitää vapauttaa lukitus salauksen purkamiseksi aina virran kytkemisen jälkeen. Ainoa vaihtoehtoinen tapa poistaa salaus on suorittaa palautus tehdasasetuksiin, jolloin kaikki tiedot katoavat.\n\nSalaaminen kestää ainakin tunnin. Akun täytyy olla alussa ladattu, ja puhelimen pitää olla pistorasiaan kiinnitettynä koko prosessin ajan. Jos keskeytät sen, tiedot häviävät kokonaan tai osittain."</string>
     <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Voit salata tilisi, asetukset, ladatut sovellukset tietoineen, median ja muut tiedostot. Jos olet salannut puhelimesi ja kytkenyt näytön lukituksen (kuvion, PIN-koodin tai salasanan avulla), sinun pitää vapauttaa lukitus salauksen purkamiseksi aina virran kytkemisen jälkeen. Ainoa vaihtoehtoinen tapa poistaa  salaus on suorittaa palautus tehdasasetuksiin, jolloin kaikki tiedot katoavat.\n\nSalaaminen kestää ainakin tunnin. Akun täytyy olla alussa ladattu, ja puhelimen pitää olla pistorasiaan kiinnitettynä koko prosessin ajan. Jos keskeytät sen, tiedot häviävät kokonaan tai osittain."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tabletti"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Yhdistä laturi ja yritä uudelleen."</string>
@@ -357,7 +396,7 @@
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sinun on asetettava lukitusnäytön PIN-koodi tai salasana ennen salauksen aloittamista."</string>
     <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"Avaa laitteen lukitus piirtämällä lukituksenpoistokuvio."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Salataanko?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tablet-laite käynnistyy uudelleen useita kertoja."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tabletti käynnistyy uudelleen useita kertoja."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Salausta ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana puhelin käynnistyy uudelleen useita kertoja."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Salaus käynnissä"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Odota, tablet-laitetta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
@@ -534,7 +573,7 @@
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Valmis"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nimi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tabletti koskettaa toista laitetta"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Valmis lähettämään sovelluksen sisältöä NFC:n kautta"</string>
@@ -747,12 +786,12 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Puhelinta ei telakoitu"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Yhdistetyn telakan asetukset"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Telakkaa ei löydy"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Telakoi tablet-laite, jos haluat määrittää telineen äänet."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Telakoi tabletti, jos haluat määrittää telineen äänet."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Telakoi puhelin, jos haluat määrittää telineen äänet."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Telineeseen asettamisääni"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Toista ääni, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Toista ääni, kun tabletti asetetaan telakkaan tai poistetaan telakasta"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Toista ääni, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Älä toista ääntä, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Älä toista ääntä, kun tabletti asetetaan telakkaan tai poistetaan telakasta"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Älä toista ääntä, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
     <string name="account_settings" msgid="6403589284618783461">"Tilit"</string>
     <string name="category_personal" msgid="1299663247844969448">"Henkilökohtainen"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kirkkauden säätö"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimoi kirkkaustaso valotilanteen mukaan"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Virransäästö"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Näyttö sammuu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Paikannustila"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Paikanna GPS:n ja Wi-Fi- ja mobiiliverkkojen avulla"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Paikanna Wi-Fi- ja mobiiliverkkojen avulla"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Paikanna GPS:n avulla"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Paikanna sijaintisi GPS:n avulla"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- ja mobiiliverkkosijainti"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Anna sovellusten arvioida sijaintisi Googlen sijaintipalvelulla. Anonyymejä sijaintitietoja kerätään ja lähetetään Googlelle."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Sijainti on määritetty Wi-Fi-yhteyden perusteella"</string>
@@ -2246,7 +2295,7 @@
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Salli Bluetooth-parien ja -asetuksien muokkaaminen"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Salli tiedonsiirto, kun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettaa toista NFC-laitetta"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Salli tiedonsiirto, kun tabletti koskettaa toista laitetta"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Sijainti"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Anna sovellusten käyttää sijaintitietojasi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"näyttö kosketusnäyttö"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"näytön himmennys kosketusnäyttö akku"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"näytön himmennys kosketusnäyttö akku"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tausta räätälöi muokkaa näyttö"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstin koko"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"lähetys"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"levytila levy kiintolevy laite käyttö"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index add194a..99cb009 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement (ou cryptage)"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Crypter le téléphone"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosité adaptative"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliser le GPS, le Wi‑Fi et les réseaux cellulaires pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliser le Wi‑Fi et les réseaux cellulaires pour déterminer la position"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Local. par Wi-Fi et rés. cell."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"écran tactile"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile pile"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"assombrir l\'écran écran tactile pile"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"personnaliser arrière-plan personnaliser écran"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projet"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espace disque disque dur utilisation appareil"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6d031ec..dd2b6fe 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Chiffrer le téléphone"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptation de la luminosité"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliser le GPS, le Wi‑Fi et les réseaux mobiles pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliser le Wi‑Fi et les réseaux mobiles pour déterminer la position"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localisation via Wi-Fi et réseau mob."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"écran écran tactile"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile batterie"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"assombrir l\'écran écran tactile batterie"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"personnaliser arrière-plan personnaliser écran"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projet"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espace disque disque dur utilisation appareil"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index f43ba57..3d6ccbd 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasinais"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar teléfono"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Axusta o brillo da pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo adaptable"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiza o nivel de brillo en función da luz dispoñible"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensión"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A pantalla apágase"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localización"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliza GPS, wifi e redes móbiles para determinar a localización"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliza wifi e redes móbiles para determinar a localización"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utiliza o GPS para determinar a túa localización"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usa o GPS para determinar a localización"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localización por wifi e rede móbil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permite usar o servizo de localización para calcular a localización rápido. Recompilaranse datos anónimos e enviaranse a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localización determinada por wifi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla pantalla táctil batería"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"atenuar pantalla pantalla táctil batería"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano personalizar pantalla"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño do texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proxecto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espazo disco unidade de disco duro uso do dispositivo"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a167240..2c64240 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्ड"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्‍क्रिप्‍शन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की रोशनी एडजस्ट करें"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"स्क्रीन की रोशनी ठीक करें"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"अपने हिसाब से स्क्रीन की रोशनी ठीक करें"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"प्रयोग में नहीं"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद हो जाती है"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"स्थान का पता लगाने के लिए, GPS, वाई-फ़ाई और सेल्युलर नेटवर्क का उपयोग करें"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"स्थान का पता लगाने के लिए वाई-फ़ाई और सेल्युलर नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"अपना स्थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्‍थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाई-फ़ाई और सेल्युलर नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने के लिए, ऐप्स को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाई-फ़ाई  द्वारा निर्धारित किया गया स्‍थान"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन टचस्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"हल्की रोशनी वाली टचस्‍क्रीन बैटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"हल्की रोशनी वाली टचस्‍क्रीन बैटरी"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background personalize customize diplay"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"लेख का आकार"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"प्रोजेक्ट"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"space disk hard drive device usage"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 39021b8..27de210 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -344,6 +344,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripcija"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kriptiraj tablet računalo"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kriptiraj telefon"</string>
@@ -777,6 +816,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svjetlina"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje jačine osvjetljenja u odnosu na osvijetljenost okoline"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1069,7 +1118,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Upotreba GPS-a, Wi‑Fi i mobilnih mreža za utvrđivanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Upotreba Wi‑Fi i mobilnih mreža za utvrđivanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Za određivanje lokacije upotrebljava se GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Upotreba GPS-a za utvrđivanje lokacije"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokacija Wi‑Fi i mobilne mreže"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena pomoću Wi-Fi-ja"</string>
@@ -2316,7 +2365,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"zaslon dodirni zaslon"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatamnjenje zaslon dodirni zaslon baterija"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"zatamnjenje zaslon dodirni zaslon baterija"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadina personalizirati prilagoditi zaslon"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veličina teksta"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekcija"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"prostor disk tvrdi disk uređaj upotreba"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 83ceab6..cc244ec 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Titkosítás"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon titkosítása"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"A képernyő fényerejének beállítása"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Alkalmazkodó fényerő"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Fényerőszint optimalizálása a környezeti fény alapján"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A kijelző kikapcsol"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Helymeghatározási mód"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, Wi‑Fi- és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fi- és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS használata a tartózkodási hely meghatározásához"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS használata a tartózkodási hely meghatározásához"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Hely Wi‑Fi és mobil alapján"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Engedélyezze az alkalmazásoknak, hogy a Google helymeghatározó szolgáltatásával gyorsabban megbecsüljék tartózkodási helyét. A névtelen helyadatok összegyűjtés után a Google-hoz kerülnek."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Helymeghatározás Wi-Fi-vel"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"képernyő érintőképernyő"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"képernyő sötétítése érintőképernyő akkumulátor"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"képernyő sötétítése érintőképernyő akkumulátor"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"háttér személyre szabás testreszabás kijelző"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"betűméret"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"kivetítés"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"tárhely lemez merevlemez eszköz használat"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 8d78f97..9b4081a 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Գաղտնաբառեր"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Կոդավորում"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Կոդավորել գրասալիկը"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Կոդավորել հեռախոսը"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Կարգաբերել էկրանի պայծառությունը"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Հարմարողական պայծառություն"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Լույսի պայծառության մակարդակի լավարկում"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Քնել"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Էկրանը անջատվում է"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> պասիվ լինելուց հետո"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Տեղադրության ռեժիմ"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Օգտագործել GPS, Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Օգտագործել Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Օգտագործել GPS՝ դիրքը տեղորոշելու համար"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղադրությունը որոշելու համար օգտագործել GPS-ը"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi և բջջային ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Տեղադրությունը որոշված է Wi‑Fi-ի կողմից"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"հպէկրան"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"էկրանի խամրում հպէկրան մարտկոց"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"էկրանի խամրում հպէկրան մարտկոց"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"հետնաշերտ անհատականացնել հարմարեցնել էկրան"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"տեքստի չափը"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"նախագիծ"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"տարածք սկավառակ կոշտ սկավառակ սարք օգտագործում"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5ad995b..d6bc12e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsi"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripsi tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripsi ponsel"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan adaptif"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalkan tingkat kecerahan untuk cahaya yang tersedia"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Layar mati"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode lokasi"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gunakan GPS, Wi‑Fi, dan jaringan seluler untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gunakan Wi‑Fi dan jaringan seluler untuk menentukan lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gunakan GPS untuk menentukan lokasi Anda"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Menggunakan GPS untuk menentukan lokasi"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi jaringan Wi‑Fi &amp; seluler"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Izinkan aplikasi menggunakan layanan lokasi Google untuk memperkirakan lokasi Anda dengan lebih cepat. Data lokasi anonim akan dikumpulkan dan dikirim ke Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi yang ditentukan oleh Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"layar sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"layar redup layar sentuh baterai"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"layar redup layar sentuh baterai"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"latar belakang personalisasi sesuaikan tampilan"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukuran teks"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyeksi"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruang disk hard drive perangkat penggunaan"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index b89a4ea..a9e13a3 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stilla staðsetninguna mína, opnun skjás, lás skilríkjageymslu"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Aðgangsorð"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Dulkóðun"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Dulkóða spjaldtölvu"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Dulkóða síma"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Stilla birtustig skjásins"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aðlögun birtustigs"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Stilla birtustig eftir umhverfisbirtu"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Hvíld"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Slökkt er á skjánum"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Staðsetningarstilling"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Nota GPS, Wi-Fi og farsímakerfi til að ákvarða staðsetningu"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Nota Wi-Fi og farsímkerfi til að ákvarða staðsetningu"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Nota GPS til að ákvarða staðsetningu þína"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nota GPS til að ákvarða staðsetningu"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Staðsetning með Wi-Fi og farsímakerfi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leyfir forritum að nota þjónustu Google fyrir hraðvirkari staðsetningarákvörðun. Nafnlausar upplýsingar verða sendar til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi ákvarðar staðsetningu"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"skjár snertiskjár"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"myrkva skjár snertiskjár rafhlaða"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"myrkva skjár snertiskjár rafhlaða"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrunnur sérsníða sérstilla skjár"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textastærð"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"verkefni"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"pláss harður diskur drif tæki notkun"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8f39c28..b5fa3d1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Esegui crittografia telefono"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosità adattiva"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Ottimizza il livello di luminosità per la luce disponibile"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Lo schermo si spegne"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità di geolocalizzazione"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Usa reti GPS, Wi-Fi e cellulari per stabilire la posizione"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Usa reti Wi-Fi e cellulari per stabilire la posizione"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Usa GPS per stabilire la posizione"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizza il GPS per stabilire la posizione"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Posiz. Wi‑Fi e rete cellulare"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Consenti alle app di usare localizzazione Google per stabilire la tua posizione. Saranno raccolti e inviati a Google dati anonimi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posizione determinata da Wi‑Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"display touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"attenuazione schermo touchscreen batteria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"attenuazione schermo touchscreen batteria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"sfondo personalizzare personalizzazione display"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensioni testo"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"progetto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"spazio disco disco rigido dispositivo utilizzo"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 56a1a6c..485ab7c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"הצפנה"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"הצפן טאבלט"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"הצפן טלפון"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"התאם את בהירות המסך"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"בהירות מותאמת"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"התאם את רמת הבהירות ביחס לתאורה הזמינה"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"שינה"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"כיבוי מסך"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"מצב מיקום"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏השתמש ב-GPS‏, Wi‑Fi ורשתות סלולריות לקביעת המיקום"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏השתמש ב-Wi-Fi ורשתות סלולריות לקביעת המיקום"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏השתמש ב-GPS לקביעת המיקום"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏השתמש ב-GPS לקביעת המיקום"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏מיקום עם Wi‑Fi ורשת סלולרית"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏המיקום נקבע באמצעות Wi-Fi"</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"מסך מגע"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"מסך עמום סוללה מסך מגע"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"מסך עמום סוללה מסך מגע"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"התאם אישית רקע התאמה אישית תצוגה"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"גודל טקסט"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"הקרן"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"שטח דיסק כונן קשיח מכשיר שימוש"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 988432e..e0568e5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"暗号化"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"タブレットの暗号化"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"端末の暗号化"</string>
@@ -772,6 +811,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"明るさの自動調節"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"周囲に合わせて明るさを最適化する"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -1063,7 +1112,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置情報モード"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS、Wi‑Fi、モバイルネットワークで現在地を特定する"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fiとモバイルネットワークで現在地を特定する"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPSで現在地を特定する"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPSで現在地を特定する"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fiで検出される現在地"</string>
@@ -2314,7 +2363,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"画面 タッチスクリーン"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"暗くする 画面 タッチスクリーン 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"暗くする 画面 タッチスクリーン 電池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 パーソナライズ カスタマイズ 表示"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字 サイズ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"プロジェクト"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"容量 ディスク ハード ドライブ 端末 使用量"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index df2a560..ec80037 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"პაროლები"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"დაშიფვრა"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ტაბლეტის დაშიფრვა"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ტელეფონის დაშიფვრა"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"ეკრანის სინათლის შესწორება"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"მორგებადი სიკაშკაშე"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"სიკაშკაშის არსებულ სინათლეზე მორგება"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"ძილი"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ეკრანი გამოირთვება"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> განმავლობაში უმოქმედობის შემდეგ"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"მდებარეობის რეჟიმი"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"მდებარეობის დასადგენად GPS, Wi‑Fi და ფიჭური ქსელების გამოყენება"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"მდებარეობის დასადგენად Wi‑Fi-ს და ფიჭური ქსელების გამოყენება"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"თქვენი მდებარეობის დასადგენად GPS-ის გამოყენება"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ადგილმდებარეობის განსაზღვრისათვის, გამოიყენეთ GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ფიჭური ქსელის მდებარეობა"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"თქვენი ადგილმდებარეობის უფრო სწრაფად დასადგენად დართეთ აპებს ნება, გამოიყენონ Google-ის მდებარეობის სერვისი. ანონიმური მდებარეობის მომაცემები შეგროვდება და გაეგზავნება Google-ს."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi-ს მიერ დადგენილი ადგილმდებარეობა"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ეკრანის სენსორი"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ეკრანის ჩაბნელება სენსორული ეკრანი ბატარეა"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ეკრანის ჩაბნელება სენსორული ეკრანი ბატარეა"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ფონი პერსონალიზაცია მორგება დისპლეი"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ტექსტის ზომა"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"პროექტი"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"დივრცე დისკი მყარი დისკი მოწყობილობა გამოყენება"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index c5c225e..4591052 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын бекіту, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Кілтсөздер"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Кодтау"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Планшетті кодтау"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Телефонды кодтау"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Экранның жарықтығын реттеу"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Бейімделгіш жарықтық"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Қол жетімді жарық үшін жарықтық деңгейін оңтайландыру"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Ұйқы"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өшеді"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> уақыт қолданыстан тыс болғаннан кейін"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Аймақ режимі"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Орынды анықтау үшін GPS, Wi‑Fi және ұялы желілерді пайдалану"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Орынды анықтау үшін Wi‑Fi және ұялы желілерді пайдалану"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Аймақты анықтау үшін GPS қолдану"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Орынды анықтау үшін GPS пайдаланыңыз"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi және ұялы желі арқылы орынды анықтау"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Аймағыңызды жылдамырақ анықтау үшін қолданбаларға Google\' аймақтар қызметін қолдануға рұқсат етіңіз. Аймақ туралы деректер анонимді түрде жинақталып, Google-ға жіберіледі."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Аймақ Wi‑Fi арқылы анықталды"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"сенсорлы экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"экранды күңгірттеу сенсорлы экран батарея"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"экранды күңгірттеу сенсорлы экран батарея"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон жекелендіру теңшеу дисплей"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"мәтін өлшемі"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"жоба"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"бос орын диск қатты диск құрылғы пайдалану"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 415eb15..83211d2 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ពាក្យ​សម្ងាត់"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ការ​ដាក់​លេខ​កូដ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ដាក់​លេខ​កូដ​ទូរស័ព្ទ"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"កែ​ពន្លឺ​អេក្រង់"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"ពន្លឺ​​ដែល​សម្រប​ដោយ​ស្វ័យប្រវត្តិ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ធ្វើ​ឲ្យ​កម្រិត​ពន្លឺ​សម្រប​តាម​ពន្លឺ​ដែល​មាន"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"ដេក"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"អេក្រង់​បិទ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"បន្ទាប់​ពី​អសកម្ម <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1061,7 +1110,8 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"របៀបកំណត់​ទីតាំង"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ប្រើ ជីភីអេស, វ៉ាយហ្វាយ និង​បណ្ដាញ​ចល័ត ដើម្បី​កំណត់​ទីតាំង"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ប្រើ​វ៉ាយហ្វាយ និង​បណ្ដាញ​ចល័ត ដើម្បី​កំណត់​ទីតាំង"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ប្រើ​ជីភីអេស ដើម្បី​កំណត់​ទីតាំង​របស់​អ្នក"</string>
+    <!-- no translation found for location_mode_sensors_only_description (788127681455735699) -->
+    <skip />
     <string name="location_network_based" msgid="6010456018401296590">"ទីតាំងបណ្ដាញចល័ត &amp; វ៉ាយហ្វាយ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ឲ្យ​កម្មវិធី​ប្រើ​សេវាកម្ម​ទីតាំង​របស់ Google ដើម្បី​ស្មាន​ទីតាំង​របស់​អ្នក​កាន់តែ​លឿន។ ទិន្នន័យ​ទីតាំង​អនាមិក​នឹង​ត្រូវ​បាន​ប្រមូល​ រួច​ផ្ញើ​ទៅ Google ។"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ទីតាំង​បាន​កំណត់​ដោយ​វ៉ាយហ្វាយ"</string>
@@ -2308,7 +2358,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"អេក្រង់ ប៉ះ​អេក្រង់"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ធ្វើ​ផ្ទៃ​ខាង​ក្រោយ​តាម​បុគ្គល​ប្ដូរ​ការ​បង្ហាញ​តាម​បំណង"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ទំហំ​អត្ថបទ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"គម្រោង"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ទំហំ ថាស​រឹង ដ្រាយ ឧបករណ៍ ការ​ប្រើ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 2a91586..a919a48 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳು"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ಎನ್‌ಕ್ರಿಪ್ಷನ್"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡು"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡು"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"ಪರದೆಯ ಪ್ರಖರತೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"ಹೊಂದಾಣಿಕೆಯ ಪ್ರಖರತೆ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ಲಭ್ಯವಿರುವ ಬೆಳಕಿನ ಪ್ರಖರತೆಯ ಮಟ್ಟವನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡು"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"ಸ್ಲೀಪ್‌"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ಪರದೆ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ನಿಷ್ಕ್ರಿಯತೆಯ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ರ ಬಳಿಕ"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ಸ್ಥಾನ ಮೋಡ್"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS, Wi-Fi ಮತ್ತು ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು Wi-Fi ಮತ್ತು ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್ ಸ್ಥಾನ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಾನ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ಡಿಮ್‌‌ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್ ಬ್ಯಾಟರಿ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ಡಿಮ್‌‌ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್ ಬ್ಯಾಟರಿ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ಹಿನ್ನೆಲೆ ವೈಯಕ್ತೀಕರಿಸು ಕಸ್ಟಮೈಸ್ ಪ್ರದರ್ಶನ"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ಪಠ್ಯದ ಗಾತ್ರ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ಪ್ರಾಜೆಕ್ಟ್"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ಸ್ಥಳ ಡಿಸ್ಕ್ ಹಾರ್ಡ್ ಡ್ರೈವ್ ಸಾಧನ ಬಳಕೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c414b6e..938d561 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"태블릿 암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"휴대전화 암호화"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"밝기 자동 조절"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"빛의 양에 따라 밝기 수준 최적화"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"절전 모드"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"화면이 꺼짐"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"위치 모드"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, Wi‑Fi 및 이동통신망을 사용하여 위치를 찾습니다."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fi와 이동통신망을 사용하여 위치를 찾습니다."</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS를 사용하여 내 위치를 찾습니다."</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS를 사용하여 위치를 찾습니다."</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi 및 이동통신망 위치"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 파악하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi에서 측정된 위치"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"화면 터치스크린"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"화면 어둡게 하기 터치스크린 배터리"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"화면 어둡게 하기 터치스크린 배터리"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"백그라운드 맞춤설정 맞춤설정 디스플레이"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"텍스트 크기"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"프로젝트"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"공간 디스크 하드 드라이브 기기 사용"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 6bd9ee6..49281b1 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -533,6 +533,45 @@
     <skip />
     <!-- no translation found for security_passwords_title (2930627259125138363) -->
     <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
@@ -1103,6 +1142,16 @@
     <skip />
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ыңгайлаштырылуучу жарык"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Жарык деңгээлин учурдагы жарыкка ыңгайлаштыруу"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Уктоо"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өчөт"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> колдонулбагандан кийин"</string>
@@ -1544,7 +1593,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Жайгашуу тартиби"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi жана уюктук тармактарды колдонуңуз"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Жайгашкан жерди аныктоо үчүн Wi‑Fi жана уюктук тармактарды колдонуңуз"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Жайгашууңузду GPS менен аныктоо"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Жайгашкан жерди аныктоо үчүн GPS колдонуңуз"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; уюкт тарм жайг жер"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Колдонмолорго Google жайгаштыруу м-н ордуңузду тактоого жол берүү. Жайгашуу берилиштери аноним. чогултулат ж-а Google\'га берилет."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Жайгашуу Wi‑Fi аркылуу аныкталды"</string>
@@ -3183,7 +3232,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"экран, сенсордук экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"күңүрт экран сенсордук экран батарея"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"күңүрт экран сенсордук экран батарея"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон жекечелештирүү өзгөчөлөштүрүү дисплей"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текст өлчөмү"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"долбоор"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"бош орун диск катуу диск түзмөк колдонуу"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index c2359ba..0dd7025 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ລະ​ຫັດ​ຜ່ານ"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ການເຂົ້າລະຫັດ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ເຂົ້າລະຫັດແທັບເລັດ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ເຂົ້າລະຫັດໂທລະສັບ"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"ປັບແຕ່ງຄວາມແຈ້ງຂອງໜ້າຈໍ"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"ປັບ​ຄວາມ​ແຈ້ງ​ອັດຕະໂນມັດ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ປັບແຕ່ງ​ລະດັບ​ຄວາມແຈ້ງ​ຂອງ​ໜ້າ​ຈໍ​ໃຫ້​ເໝາະ​ສົມ​ກັບ​ແສງໄຟ​ຈາກ​ພາຍ​ນອກ"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"ເວລາປິດໜ້າຈໍ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"​ປິດ​ໜ້າ​ຈໍ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ຫຼັງຈາກ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ທີ່ບໍ່ໄດ້ເຮັດຫຍັງ"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ໂຫມດຂໍ້ມູນສະຖານທີ່"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ໃຊ້ GPS, Wi‑Fi ແລະ​ເຄືອ​ຂ່າຍ​ມື​ຖືເພື່ອ​ລະ​ບຸ​ຕຳ​ແໜ່ງ​ທີ່​ຢູ່"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ໃຊ້ເຄືອ​ຂ່າຍ Wi‑Fi ແລະ​ມື​ຖື​ເພື່ອ​ລະ​ບຸ​ຕຳ​ແໜ່ງ​ທີ່​ຢູ່"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ນຳໃຊ້ GPS ເພື່ອລະບຸຂໍ້ມູນສະຖານທີ່ຂອງທ່ານ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ໃຊ້ GPS ເພື່ອກຳ​ນົດ​ທີ່​ຕັ້ງຂອງທ່ານ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ທີ່​ຢູ່​ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ໃຫ້ແອັບຯຕ່າງໆໃຊ້ບໍລິການສະຖານທີ່ຂອງ Google ເພື່ອປະເມີນສະຖານທີ່ຂອງທ່ານໄດ້ໄວຂຶ້ນ. ຂໍ້ມູນສະຖານທີ່ທີ່ບໍ່ລະບຸໂຕຕົນຈະຖືກເກັບກຳ ແລະສົ່ງໃຫ້ Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ສະຖານທີ່ທີ່ລະບຸໂດຍ Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ໜ້າຈໍ ໜ້າຈໍສຳຜັດ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"​ຄ່ອຍ​ແສງ​ໜ້າ​ຈໍ ໜ້າ​ຈໍ​ແຕະ ແບັດ​ເຕີ​ຣີ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"​ຄ່ອຍ​ແສງ​ໜ້າ​ຈໍ ໜ້າ​ຈໍ​ແຕະ ແບັດ​ເຕີ​ຣີ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"​ພາບ​ພື້ນຫຼັງ ປັບ​ແຕ່ງ​ສ່ວນ​ຕົວ ປັບ​ແຕ່ງ ການ​ສະ​ແດງ​ຜົນ"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ຂະ​ໜາດ​ໂຕ​ອັກ​ສອນ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ໂປຣເຈັກ"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"​ພື້ນ​ທີ່​ວ່າງ ດິສ ບ່ອນ​ເກັບ​ຂໍ້​ມູນ ອຸ​ປະ​ກອນ ນຳ​ໃຊ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 5998e63..d35add2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifruotė"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifruoti telefoną"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano šviesumą"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prisitaikantis šviesumas"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizuoti šviesumo lygį pagal esamą šviesą"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranas išjungiamas"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Vietovės režimas"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Naudoti GPS, „Wi‑Fi“ ir korinį tinklą vietovei nustatyti"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Naudoti „Wi‑Fi“ ir korinį tinklą vietovei nustatyti"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Vietovę nustatyti naudojant GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nustatyti vietovę naudojant GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"„Wi‑Fi“ ir kor. tinkl. vietov."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leisti programoms naud. „Google“ viet. pasl., kad viet. būtų nustatoma greičiau. Anonim. viet. duom. bus renk. ir siunč. „Google“."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vietą nustatė „Wi-Fi“"</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ekranas jutiklinis ekranas"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fonas suasmeninti tinkinti pateikti"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksto dydis"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projektas"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"vieta diskas standusis diskas įrenginys naudojimas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6cf6801..7686ca2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -344,6 +344,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrējums"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Tālruņa šifrēšana"</string>
@@ -777,6 +816,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptīvs spilgtums"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizēt spilgtuma līmeni atbilstoši pieejamajam apgaismojumam"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrāns tiek izslēgts"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -1069,7 +1118,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Atrašanās vietas režīms"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Izmantojiet GPS, Wi-Fi un mobilos tīklus, lai noteiktu atrašanās vietu."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Izmantojiet Wi-Fi un mobilos tīklus, lai noteiktu atrašanās vietu."</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Lietot GPS atrašanās vietas noteikšanai"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Lietot GPS atrašanās vietas noteikšanai"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi un mobilo tīklu atr. vieta"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ļaut lietotnēm izmantot Google atrašanās vietas pakalpojumu, lai ātrāk noteiktu jūsu atrašanās vietu. Tiks apkopoti un nosūtīti uz Google serveriem anonīmi atrašanās vietas dati."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi noteikta atrašanās vieta"</string>
@@ -2316,7 +2365,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ekrāns skārienekrāns"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tumšs ekrāns skārienekrāns akumulators"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"tumšs ekrāns skārienekrāns akumulators"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fons personalizēt pielāgot displejs"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksta lielums"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projicēt"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"vieta disks cietai disks ierīce lietojums"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 976167b..cf2ee3e 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подеси „Моја локација“, отклучување на екран, заклучување на СИМ картичка, заклучување на меморија со акредитиви"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подеси „Моја локација“, отклучување на екран, заклучување на меморија за акредитиви"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинки"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрирање"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрирај таблет"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифрирај телефон"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Прилагоди ја осветленоста на екранот"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Приспособлива осветленост"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизирање ниво на осветленост за достапното светло"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Режим на штедење"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранот се исклучува"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"По <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> на неактивност"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим на локација"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Користи мрежи на GPS, на Wi‑Fi и на мобилен за да утврдиш локација"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Користи мрежи на Wi‑Fi и на мобилен за да утврдиш локација"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Користи ГПС за да се утврди локацијата"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користи ГПС за да се утврди локацијата"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на мр. на Wi‑Fi и на моб."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"За брза процена, овозможи услуга за локација на Google. Анонимните податоци за локација се собираат и се испраќаат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локацијата е утврдена со Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"екран екран на допир"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемни екран екран на допир батерија"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затемни екран екран на допир батерија"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"заднина персонализирај приспособи екран"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"големина на текст"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проектирај"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"простор диск тврд диск уред употреба"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 2c1c2c5..85c4344 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, ക്രെഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"പാ‌സ്‌വേഡുകൾ"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"എൻ‌ക്രിപ്ഷൻ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ടാ‌ബ്‌ലെറ്റ് എൻ‌ക്രിപ്റ്റുചെയ്യുക"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ഫോൺ എൻ‌ക്രിപ്റ്റുചെയ്യുക"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"സ്‌ക്രീനിന്റെ തെളിച്ചം ക്രമീകരിക്കുക"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"അനുയോജ്യമായ തെളിച്ചം"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ലഭ്യമായ പ്രകാശത്തിനായി തെളിച്ചനില അനുരൂപമാക്കുക"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"സുഷുപ്തിയിലാക്കുക"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"സ്ക്രീൻ ഓഫാക്കുന്നു"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"നിഷ്ക്രിയത്വത്തിന് <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> കഴിഞ്ഞ്"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ലൊക്കേഷൻ മോഡ്"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS, Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുക"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുക"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"നിങ്ങളുടെ ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS ഉപയോഗിക്കുക"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS ഉപയോഗിക്കുക"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലൊക്കേഷൻ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"നിങ്ങളുടെ ലൊക്കേഷൻ വേഗത്തിൽ നിർണ്ണയിക്കാൻ Google-ന്റെ ലൊക്കേഷൻ സേവനം ഉപയോഗിക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുക. അജ്ഞാത ലൊക്കേഷൻ ഡാറ്റ ശേഖരിച്ച് Google-ന് അയയ്‌ക്കും."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi നിർണ്ണയിച്ച ലൊക്കേഷൻ"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"സ്ക്രീൻ ടച്ച്സ്ക്രീൻ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്‌ക്രീൻ ബാറ്ററി"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്‌ക്രീൻ ബാറ്ററി"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"പശ്‌ചാത്തലം വ്യക്തിഗതമാക്കുക ഇഷ്‌ടാനുസൃതമാക്കുക ഡിസ്‌പ്ലേ"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"പ്രോജക്റ്റ്"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ഇടം ഡിസ്‌ക് ഹാർഡ് ഡ്രൈവ് ഉപകരണം ഉപയോഗം"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 87551c5..67d0f3b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Нууц үг"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрлэлт"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Таблетыг шифрлэх"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Утсыг шифрлэх"</string>
@@ -760,6 +799,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Дэлгэцийн тодролыг тохируулах"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Зохицогч гэрэлтүүлэг"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Боломжит гэрэлд тохируулан гэрэлтүүлгийг зохицуулах"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Идэвхгүй"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
@@ -1051,7 +1100,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Байршлын горим"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Байршил тодорхойлоход GPS, Wi‑Fi, болон үүрэн сүлжээ ашиглах"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Байршил тодорхойлоход Wi‑Fi болон үүрэн сүлжээ ашиглах"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Өөрийн байршлыг тодорхойлохын тулд GPS ашиглах"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Байршлыг тогтоохын тулд GPS ашиглах"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; үүрэн сүлжээний байршил"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Апп-уудад Google-н байршлын үйлчилгээ ашиглан таны байршлыг хурдан олохыг зөвшөөрөх. Нэргүй байршлын мэдээлэл цуглуулагдаж Google рүү илгээгдэх болно."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi-р тодорхойлогдсон байршил"</string>
@@ -2298,7 +2347,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"дэлгэц мэдрэгчтэй"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"бүдэг дэлгэц мэдрэгчтэй дэлгэц тэжээл"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"бүдэг дэлгэц мэдрэгчтэй дэлгэц тэжээл"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"Дэвсгэр тохируулах дэлгэц тохируулах"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текстийн хэмжээ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"төсөл"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"орон зай диск хатуу диск төхөөрөмж хэрэглээ"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 6ee4c51..9917750 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"संकेतशब्द"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"कूटबद्धीकरण"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टॅब्लेट कूटबद्ध करा"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन कूटबद्ध करा"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"स्क्रीनची चकाकी समायोजित करा"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"अनुकूलित चकाकी"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"उपलब्ध प्रकाशासाठी चकाकी स्तर ऑप्टिमाइझ करा"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद होते"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"निष्क्रियतेच्या <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> नंतर"</string>
@@ -919,7 +968,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"कॅमेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"आपल्याला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फायली स्थानांतर करू देते"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम असलेल्या अनुप्रयोगांना आपल्या संगणकावर MIDI  सॉफ्टवेअरसह USB वर कार्य करू द्या."</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम असलेल्या अनुप्रयोगांना आपल्या संगणकावर MIDI सॉफ्टवेअरसह USB वर कार्य करू द्या."</string>
     <string name="storage_other_users" msgid="808708845102611856">"इतर वापरकर्ते"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"बॅटरी स्थिती"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बॅटरी पातळी"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"स्थान निर्धारित करण्यासाठी GPS, वाय-फाय, आणि सेल्युलर नेटवर्क वापरा"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"स्थान निर्धारित करण्यासाठी वाय-फाय आणि सेल्युलर नेटवर्क वापरा"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"आपले स्थान निर्धारीत करण्यासाठी GPS चा वापर करा"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारीत करण्यासाठी GPS चा वापर करा"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाय-फाय आणि सेल्युलर नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी अॅप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाय-फाय द्वारे निर्धारीत केलेले स्थान"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन स्पर्श स्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मंद स्क्रीन टचस्क्रीन बॅटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"मंद स्क्रीन टचस्क्रीन बॅटरी"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"पार्श्वभूमी वैयक्तिकृत सानुकूल प्रदर्शन"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"मजकूर आकार"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"प्रोजेक्ट"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"स्थान डिस्क हार्ड ड्राइव्ह डिव्हाइस वापर"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 0b3b7d5..6c15d17 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -343,6 +343,29 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Kata laluan"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Cap jari"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> cap jari didaftarkan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> cap jari didaftarkan</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Persediaan cap jari"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="8275201068478623705">"Bagi menggunakan cap jari anda untuk membuka kunci skrin atau mengesahkan pembelian, kami perlu: \n✓ Sediakan kaedah kunci skrin latar belakang anda \n✓ Tambahkan cap jari anda"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Mari mulakan!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Letakkan jari anda pada penderia cap jari. Angkat jari selepas merasa getaran."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Bagus! Sekarang ulang."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Letakkan jari yang sama pada penderia cap jari dan angkat jari anda selepas merasa getaran."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Cap jari ditambahkan!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Apabila anda melihat ikon ini, anda boleh menggunakan cap jari untuk pengenalan atau membenarkan pembelian."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Tambah"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seterusnya"</string>
+    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Cap jari separa dikesan. Sila cuba lagi."</string>
+    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Penderia cap jari kotor. Sila bersihkan dan cuba lagi."</string>
+    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Jari digerakkan terlalu cepat. Sila cuba lagi."</string>
+    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Jari digerakkan terlalu perlahan. Sila cuba lagi."</string>
+    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Tidak dapat memproses. Cuba lagi."</string>
+    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Perkakasan tidak tersedia."</string>
+    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Cap jari tidak dapat disimpan. Sila alih keluar cap jari sedia ada."</string>
+    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Tamat masa cap jari dicapai. Cuba lagi."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Penyulitan"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Sulitkan tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Sulitkan telefon"</string>
@@ -770,6 +793,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Laraskan kecerahan skrin"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan mudah suai"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimumkan tahap kecerahan untuk cahaya yang tersedia"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Tema"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Cerah"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Gelap"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Automatik"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrin dimatikan"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -1061,7 +1089,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod lokasi"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gunakan GPS, Wi-Fi dan rangkaian selular untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gunakan Wi-Fi dan rangkaian selular untuk menentukan lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gunakan GPS untuk menentukan lokasi anda"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gunakan GPS untuk menentukan lokasi"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi Wi-Fi &amp; selular"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Biar apl guna perkhidmatan lokasi Google utk anggar lokasi lebih cepat. Data lokasi tanpa nama dikumpul dan dihantar kpd Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi ditentukan oleh Wi-Fi"</string>
@@ -2308,7 +2336,8 @@
     <string name="keywords_display" msgid="6709007669501628320">"skrin skrin sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"skrin malap skrin sentuh bateri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"skrin malap skrin sentuh bateri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"latar belakang peribadikan suaikan paparan"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"tema gelap mod malam malapkan skrin terbalikkan kecerahan"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"latar belakang peribadikan suaikan paparan"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"saiz teks"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projek"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruang cakera pemacu keras peranti penggunaan"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 5ed26e8..c1ae246 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"စကားဝှက်များ"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"လျှို့ဝှက်အသွင်ပြောင်းခြင်း"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"တက်ပလက်ကိုလျှို့ဝှက်အသွင်ပြောင်းရန်"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"လျှို့ဝှက်အသွင်ပြောင်းထားသောဖုန်း"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"စကရင်၏ အလင်းကိုချိန်ရန်"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"အလိုက်သင့် တောက်ပမှု"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ရှိတဲ့ အလင်းရောင်ပေါ် မှုတည်ပြီး တောက်ပမှု ချိန်ညှိမယ်"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"နားခြင်း"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"မျက်နှာပြင်များကို ပိတ်ထား"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>နောက်ပိုင်း လှုပ်ရှားမှုမရှိခြင်း"</string>
@@ -1062,7 +1111,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"တည်နေရာပြစနစ်"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"တည်နေရာကို ဆုံးဖြတ်ရန် ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ကြိုးမဲ့ &amp; ဆယ်လူလာ ကွန်ရက် တည်နေရာ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"သင့်တည်နေရာကို ခန့်မှန်းရာတွင် ပိုမြန်စေရန် အပလီကေးရှင်းကို ဂူဂယ်လ်၏ တည်နေရာဝန်ဆောင်မှု အသုံးပြုပါစေ။ အမည်မသိ တည်နေရာ အချက်အလက်များကို စု၍ ဂူဂဲလ်သို့ ပို့ပေးပါမည်။"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ဝိုင်ဖိုင်မှ ဆုံးဖြတ်သော တည်နေရာ"</string>
@@ -2309,7 +2358,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"မျက်နှာပြင် တာ့ချမျက်နှာပြင်"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"မြင်ကွင်းမိန်ခြင်း ထိတွေ့မြင်ကွင်း ဘတ်ထရီ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"မြင်ကွင်းမိန်ခြင်း ထိတွေ့မြင်ကွင်း ဘတ်ထရီ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"အသုံးပြုသူစိတ်ကြိုက် ပြုလုပ်ထားသည့် နောက်ခံဖော်ပြချက်"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"စာလုံးအရွယ်အစား"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"စီမံကိန်း"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"နေရာ ဒစ် ဟက်ဒရိုက် စက်ပစ္စည်း အသုံးပြုမှု"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 07b24cb..530c418 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptér nettbrettet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptér telefonen"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Lysstyrken tilpasser seg"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliser lysstyrkenivået for tilgjengelig lys"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skjermen slås av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Posisjonsmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Bruk GPS, Wi-Fi, og mobilnettverk til å fastslå posisjon"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Bruk Wi-Fi og mobilnettverk til å fastslå posisjon"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Bruk GPS til å fastslå posisjonen din"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Bruk GPS til å fastslå posisjonen din"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi- og mobilnettverksposisjon"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillat at apper bruker posisjonstjenesten fra Google til å finne posisjonen din raskere. Anonym posisjonsdata blir samlet inn og sendt til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posisjon fastsatt av Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"berøringsskjerm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimme skjerm berøringsskjerm batteri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dimme skjerm berøringsskjerm batteri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrunn gi personlig preg tilpasse skjerm"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"prosjekt"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"plass disk harddisk enhetsbruk"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 19c1f73..73925ba 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -343,6 +343,29 @@
     <string name="security_settings_summary" msgid="967393342537986570">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्डहरू"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"औंठाछाप"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> औठाछापहरू नामाङ्कन गरियो</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> औठाछाप नामाङ्कन गरियो</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"औँठाछाप सेटअप"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="8275201068478623705">"तपाईँको स्क्रिन अनलक गर्न वा खरीदहरू पुष्टि गर्नको लागि तपाईँको औंठाछाप प्रयोग गर्न, हामीलाई निम्न आवश्यक छ: \n ✓ तपाईँको पृष्ठभूमि स्क्रिन लक विधि सेट अप गर्नुहोस् \n ✓ तपाईँको औंठाछाप थप्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"सुरु गरौं!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"औठाछाप सेन्सरमा तपाईँको औंला राख्नुहोस्। तपाईंले एक कम्पन महसुस गर्नुभएपछि उठाउनुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"उत्तम! अब दोहोर्‍याउनुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"औंठाछाप सेन्सरमा उही औंला राख्नुहोस् र तपाईंले एक कम्पन महसुस गर्नुभएपछि औंला उठाउनुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"औँठाछाप थपियो!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईं यस प्रतिमा जहिले देख्नुहुन्छ, तपाईं पहिचानको लागि वा एक खरीद अधिकारको निम्ति आफ्नो औठाछाप प्रयोग गर्न सक्नुहुन्छ।"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"थप्नुहोस्"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"अर्को"</string>
+    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"आंशिक औठाछाप पत्ता लाग्यो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"औँठाछाप सेन्सर फोहोर छ। कृपया सफा गरेर फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"औंला निकै छिटो सारियो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"औंला निकै ढिला सारियो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"प्रक्रिया गर्न असमर्थ। फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"हार्डवेयर उपलब्ध छैन।"</string>
+    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"औँठाछाप भण्डारण गर्न सकिँदैन। कृपया अवस्थित औठाछाप हटाउनुहोस्।"</string>
+    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"औँठाछापको समय सकिएको छ। फेरि प्रयास गर्नुहोस्।"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्क्रिप्सन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"इन्क्रिप्ट ट्याब्लेट"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन इन्क्रिप्ट गर्नुहोस्"</string>
@@ -770,6 +793,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"स्क्रिनको उज्यालोपना मिलाउनुहोस्"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"अनुकूलीत चमक"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"उपलब्ध प्रकाशका लागि चमक तह प्रभावकारी बनाउँछ"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"विषयवस्तु"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"लाइट"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"गाढा"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"स्वचालित"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रिन बन्द हुन्छ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रियता पछि"</string>
@@ -919,7 +947,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"क्यामेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"तपाईँलाई क्यामेरा सफ्टवेयर प्रयोग गरेर फोटाहरू स्थानान्तरण गर्न, र MTP समर्थन नगर्ने कम्प्युटरमा कुनै पनि फाइलहरू स्थानान्तरण दिन्छ।"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI द्वारा सक्रिय अनुप्रयोगहरूलाई तपाईंको कम्प्यूटरमा USB मार्फत MIDI सफ्टवेयरसँग काम गर्न दिन्छ।"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI द्वारा सक्रिय अनुप्रयोगहरूलाई तपाईंको कम्प्युटरमा USB मार्फत MIDI सफ्टवेयरसँग काम गर्न दिन्छ।"</string>
     <string name="storage_other_users" msgid="808708845102611856">"अन्य प्रयोगकर्ताहरू"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ब्याट्रि स्थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ब्याट्रि स्तर"</string>
@@ -1061,7 +1089,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"स्थान निर्धारण गर्न GPS, वाइफाइ र सेलुलर सञ्जाल प्रयोग गर्नुहोस्"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"स्थान निर्धारण गर्न वाइफाइ र सेलुलर सञ्जाल प्रयोग गर्नुहोस्"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"स्थान अनुमानका लागि GPS प्रयोग गर्नुहोस्"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारण गर्न GPS प्रयोग गर्नुहोस्"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाइफाइ र सेलुलर सञ्जाल स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न अनुप्रयोगहरूलाई गुगल स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र गुगलमा पठाइने छ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाइ-फाइद्वारा निर्धारित स्थान"</string>
@@ -2266,7 +2294,7 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"डेटा SIM चयन गर्न छुनुहोस्"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"सधैं यो कलको लागि प्रयोग गर्नुहोस्"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"डेटाको लागि सिम चयन गर्नुहोस्"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"डाटा सिम स्विच गर्दै, यसलाई करिब एक मिनेट लाग्न सक्छ ..."</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"डेटा SIM स्विच गर्दै, यसलाई करिब एक मिनेट लाग्न सक्छ ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"संग कल"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM कार्ड चयन गर्नुहोस्"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -2308,7 +2336,8 @@
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रिन टचस्क्रिन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मधुरो स्क्रिन छोएर चल्ने स्क्रिन ब्याट्री"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"मधुरो स्क्रिन छोएर चल्ने स्क्रिन ब्याट्री"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"व्यक्तिगत अनुकूलित प्रदर्शन पृष्ठभूमि"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"अँध्यारो विषयवस्तु रात मोड मधुरो स्क्रिन इन्भर्ट चमक"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"पृष्ठभूमि व्यक्तिगत अनुकूलन प्रदर्शन"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"पाठ आकार"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"परियोजना"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ठाउँ डिस्क हार्ड ड्राइभ उपकरण उपयोग"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 969ca6e..1afee3f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryptie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet versleutelen"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon versleutelen"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Helderheidsniveau optimaliseren voor beschikbaar licht"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Locatiemodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"GPS gebruiken om uw locatie te bepalen"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS gebruiken om locatie te bepalen"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Locatie via wifi en mob. netw."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps toestaan de locatieservice van Google te gebruiken om uw locatie sneller te schatten. Anonieme locatiegegevens worden verzameld en verzonden naar Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locatie bepaald via wifi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"scherm touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimmen scherm touchscreen accu"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"dimmen scherm touchscreen accu"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"achtergrond personaliseren aanpassen weergave"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstgrootte"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projecteren"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruimte schijf harde schijf apparaat gebruik"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1bb3a52..4660922 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych logowania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Zaszyfruj telefon"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Automatyczna jasność"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Dostosuj poziom jasności do oświetlenia"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Określaj lokalizację przez GPS, Wi-Fi i sieci komórkowe"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Określaj lokalizację przez Wi-Fi i sieci komórkowe"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Określaj lokalizację przez GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Określaj lokalizację przez GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Sieć komórkowa i Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokalizacja określona na podstawie Wi-Fi"</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ekran dotykowy"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"przyciemnij ekran ekran dotykowy bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"przyciemnij ekran ekran dotykowy bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"tło personalizuj dostosuj wyświetlacz"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"rozmiar tekstu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekcja"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"miejsce dysk dysk twardy urządzenie użycie"</string>
@@ -2364,7 +2416,7 @@
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Nie zezwalaj na żadne dźwięki"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Domyślny dzwonek powiadomień"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja podczas połączeń"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja przy połączeniach"</string>
     <string name="notification_section_header" msgid="95661783916799134">"Powiadomienia"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
     <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Gdy urządzenie jest zablokowane"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index bc39cfc..07b256f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar telefone"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosidade adaptável"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar o nível de luminosidade de acordo com a luz disponível"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"O ecrã desliga-se"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utilizar redes móveis, Wi-Fi e GPS para determinar localização"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utilizar redes móveis e Wi-Fi para determinar localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utilizar GPS para determinar a sua localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizar o GPS para determinar a localização"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi e localiz. de rede móvel"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ecrã tátil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"esbater ecrã ecrã tátil bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"esbater ecrã ecrã tátil bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fundo personalizar visor"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projeto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espaço disco disco rígido dispositivo utilização"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9cc8ce7..3493cdb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar telefone"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brilho adaptável"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar nível de brilho de acordo com a luz disponível"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Usar GPS, Wi‑Fi e redes celulares para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Usar Wi-Fi e redes celulares para determinar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Usar GPS para determinar a localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localiz. por Wi-Fi e rede cel."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que apps usem o serviço de localização do Google para determinar seu local mais rapidamente. Dados de localização anônimos serão coletados e enviados ao Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"tela touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"escurecer tela touchscreen bateria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"escurecer tela touchscreen bateria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"segundo plano personalizar personalizar exibir"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projeto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espaço em disco disco rígido uso do dispositivo"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0e4a438..7c5ae16 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -344,6 +344,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setaţi Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptare"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptaţi tableta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptaţi telefonul"</string>
@@ -777,6 +816,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustaţi luminozitatea ecranului"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminozitate adaptivă"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizați nivelul de luminozitate pentru lumina disponibilă"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ecranul se dezactivează"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
@@ -1069,7 +1118,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod de localizare"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utilizează GPS, Wi-Fi și rețelele mobile pentru determinarea locației"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utilizează rețelele Wi-Fi și mobile pentru determinarea locației"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Utilizează GPS-ul pentru determinarea locației"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Folosiți GPS-ul pentru a stabili locația"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localizare prin Wi-Fi și mobil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplicaţiile estimează mai rapid locaţia cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locație stabilită prin Wi-Fi"</string>
@@ -2317,7 +2366,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ecran tactil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"reduceți luminozitatea ecranului ecran tactil baterie"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"reduceți luminozitatea ecranului ecran tactil baterie"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"fundal personalizați afișare"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensiunea textului"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proiect"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"spațiu pe disc hard disk utilizarea dispozitivului"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 77b3108..f0bb16e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрование"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Зашифровать данные"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Зашифровать данные"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивная регулировка"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Настройка яркости с учетом уровня освещенности"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Спящий режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Отключение экрана"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Определение местоположения"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Использовать GPS, Wi‑Fi и мобильные сети для определения местоположения"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Использовать Wi‑Fi и мобильные сети для определения местоположения"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Использовать GPS для определения местоположения"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Использовать GPS для определения местоположения"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi и мобильные сети"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"С помощью Wi-Fi"</string>
@@ -1900,7 +1949,7 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Синхронизация включена"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхронизация выключена"</string>
     <string name="sync_error" msgid="5060969083117872149">"Ошибка синхронизации"</string>
-    <string name="last_synced" msgid="4242919465367022234">"Последняя синхронизация: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Синхронизировано <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Синхронизация…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Создать резервную копию настроек"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Резервная копия настроек."</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"экран сенсорный экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"яркость сенсорный экран батарея"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"яркость сенсорный экран батарея"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон настройка пользовательский"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер шрифта"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проект"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"пространство диск жесткий устройство использование"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index c0a703f..841e72f 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"මගේ ස්ථානය, තිර අගුළු ඇරීම, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"මුරපද"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"සංකේතනය"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"කේතන වගුව"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"දුරකථනය සංකේතනය කිරීම"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"තිරයේ දීප්තිය සීරු මාරු කරන්න"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"අනුවර්තක දීප්තිය"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"පවතින ආලෝකය සඳහා දීප්තිමත් මට්ටම"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"නිද්‍රාව"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"තිරය අක්‍රිය කරන්න"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"අක්‍රියතාවයෙන් <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> පසු"</string>
@@ -919,7 +968,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"කැමරාව (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"කැමරා මෘදුකාංගයක් භාවිතා කර පරිශීලකයාට ඡායාරූප හුවමාරු කිරීමට ඉඩදෙන්න, ඊට අමතරව MTP සහාය නොදක්වන ඕනෑම ගොනුවක් හුවමාරු කිරීම දෙන්න"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI සබල කළ යෙදුම්වලට,USB  ඔස්සේ ඔබගේ පරිගණකයේ ඇති MIDI මෘදුකාංග සමග ක්‍රියා කිරීමට ඉඩ ලබා දෙන්න ."</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI සබල කළ යෙදුම්වලට,USB  ඔස්සේ ඔබගේ පරිගණකයේ ඇති MIDI මෘදුකාංග සමග ක්‍රියා කිරීමට ඉඩ ලබා දෙන්න."</string>
     <string name="storage_other_users" msgid="808708845102611856">"වෙනත් පරිශීලකයින්"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"බැටරි තත්වය"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"බැටරි මට්ටම"</string>
@@ -1063,7 +1112,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ස්ථාන ආකාරය"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ස්ථානය නිමානය කිරීමට GPS, Wi-Fi සහ සෙලියුලර් ජාල භාවිතා කරන්න"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ස්ථානය නිමානය කිරීමට Wi-Fi සහ සෙලියුලර් ජාල භාවිතා කරන්න"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ඔබේ ස්ථානය නිමානය කිරීමට GPS භාවිතා කරන්න"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ඔබේ පිහිටීම නිර්ණය කිරීමට GPS භාවිත කරන්න"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi සහ සෙලියුලර් ජාල ස්ථාන"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ඔබගේ ස්ථානය ඉක්මනින් තීරණය කිරීමට යෙදුම් හට Google හි ස්ථාන සේවා භාවිතා කිරීමට ඉඩ දෙන්න. නිර්නාමික ස්ථාන දත්ත එකතු කර Google වෙත යැවෙනු ඇත."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi මඟින් ස්ථානය හඳුනාගන්නා ලදි"</string>
@@ -2310,7 +2359,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"තිරය ස්පර්ශ තිරයකි"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"අඳුරු තීරය ස්පර්ෂ තීරය බැටරිය"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"අඳුරු තීරය ස්පර්ෂ තීරය බැටරිය"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"පසුබිම පෞද්ගලීකරණය අභිරුචිකරණය දර්ශනය"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"පෙළ ප්‍රමාණය"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ව්‍යාපෘතිය"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ඩිස්කය ඉඩ දෘඨ තැටිය උපාංගයේ භාවිතය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a195304..dc29b39 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovať tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovať telefón"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prispôsobenie jasu"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovať úroveň jasu podľa dostupného svetla"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutie obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určovania polohy"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Na určenie polohy používať technológiu GPS, sieť Wi-Fi a mobilné siete"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Na určenie polohy používať sieť Wi-Fi a mobilné siete"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Určovať polohu pomocou GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Určovať polohu pomocou GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Urč. polohy pomocou Wi-Fi a mobil. siete"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi-Fi"</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotyková obrazovka"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"stlmiť displej dotyková obrazovka batéria"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"stlmiť displej dotyková obrazovka batéria"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"pozadie personalizácia prispôsobenie displej"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veľkosť textu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"miesto disk pevný disk zariadenie využitie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0769234..6c9655f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriraj telefon"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svetlost"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje ravni svetlosti glede na razpoložljivo svetlobo"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se izklopi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način ugotavljanja lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Uporaba GPS-ja, Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Uporaba Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Uporaba GPS-a za določanje lokacije"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Uporaba GPS-ja za določanje lokacije"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokac. z Wi-Fi-jem in mob. om."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplikacijam omogočite hitrejše določanje lokacije z Googlovo storitvijo za določanje lokacije. Anonimni podatki o lokaciji bodo zbrani in poslani Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Določanje lokacije z Wi‑Fi-jem"</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"zaslon zaslon na dotik"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatemnitev zaslona zaslon na dotik akumulator"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"zatemnitev zaslona zaslon na dotik akumulator"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"ozadje prilagajanje prilagajanje po meri zaslon"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost besedila"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"prostor disk trdi disk uporaba naprave"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ab44c01..e9600b2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -344,6 +344,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифровање"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифруј таблет"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифруј телефон"</string>
@@ -777,6 +816,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Прилагођавање осветљености екрана"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Прилагодљива осветљеност"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизује ниво осветљености према доступном светлу"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Спавај"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екран се искључује"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
@@ -1069,7 +1118,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локације"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Коришћење GPS-а, Wi‑Fi-ја и мобилних мрежа за одређивање локације"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Коришћење Wi‑Fi-ја и мобилних мрежа за одређивање локације"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Користите GPS за одређивање локације"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користите GPS за одређивање локације"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на осн. Wi-Fi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локација се одређује помоћу Wi-Fi-ја"</string>
@@ -2316,7 +2365,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"екран додирни екран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затамнити екран додирни екран батерија"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затамнити екран додирни екран батерија"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"позадина персонализовати прилагодити екран"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"величина текста"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"пребацити"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"простор диск хард диск уређај коришћење"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f3d4550..522590e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Anpassad ljusstyrka"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimera ljusstyrkan efter det tillgängliga ljuset"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skärmen stängs av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Platsläge"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Använd GPS, Wi-Fi och mobilnät för att bestämma plats"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Använd Wi-Fi och mobilnät för att bestämma plats"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Ange plats med hjälp av GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Avgör plats med hjälp av GPS"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi- och mobilnätsplats"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ge appar möjlighet att snabbare se var du är med Googles platstjänst. Anonym platsinformation samlas in och skickas till Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Platsen fastställs via Wi-Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"skärm pekskärm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tona ned skärm pekskärm batteri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"tona ned skärm pekskärm batteri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"bakgrund anpassa skärm"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textstorlek"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"projekt"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"utrymme disk hårddisk enhet användning"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 30ba655..a1de120 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Manenosiri"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Usimbaji fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Simba kompyuta kibao kwa njia fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Simba simu"</string>
@@ -774,6 +813,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Rekebisha mwangaza wa skrini"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Mwangaza uliorekebishwa"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Boresha kiwango cha ung\'avu cha mwanga unaopatikana"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -1067,7 +1116,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Hali ya eneo"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Tumia GPS, Wi-Fi na mitandao ya simu kutambua mahali"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Tumia Wi-Fi na mitandao ya simu kutambua mahali"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Tumia GPS kutambua eneo lako"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Tumia GPS kutambua eneo"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mahali pa mtandao wa Wi-Fi na simu za mkononi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kutambua eneo ili kukadiria mahali ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
@@ -2314,7 +2363,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"skrini ya kugusa"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"fifiliza skrini skrini ya kugusa betri"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"fifiliza skrini skrini ya kugusa betri"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"mandhari weka mapendeleo geuza ikufae onyesho"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukubwa wa maandishi"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"mradi"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"nafasi diski diski kuu kifaa matumizi"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index babbeaa..870ee5b 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"கடவுச்சொற்கள்"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"முறைமையாக்கம்"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"டேப்லெட்டை முறைமையாக்கு"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"மொபைலை முறைமையாக்கு"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"திரையின் ஒளிர்வைச் சரிசெய்யவும்"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"ஒளிர்வைத் தானாகச் சரிசெய்தல்"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"கிடைக்கும் ஒளிக்கான ஒளிர்வு நிலையை மேம்படுத்து"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"உறக்கநிலையிலிரு"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"திரை முடக்கப்படும்"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> செயல்படாமல் இருப்பின்"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"இருப்பிடப் பயன்முறை"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"இடத்தைக் கண்டறிய GPS, வைஃபை மற்றும் செல்லுலார் நெட்வொர்க்குகளைப் பயன்படுத்தவும்"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"இடத்தைக் கண்டறிய, வைஃபை மற்றும் செல்லுலார் நெட்வொர்க்குகளைப் பயன்படுத்தவும்"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"உங்கள் இருப்பிடத்தைக் கண்டறிய, GPS ஐப் பயன்படுத்தவும்"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"இருப்பிடத்தைக் கண்டறிய, GPSஐப் பயன்படுத்தவும்"</string>
     <string name="location_network_based" msgid="6010456018401296590">"வைஃபை &amp; செல்லுலார் நெட்வொர்க் இடம்"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"உங்கள் இருப்பிடத்தை விரைவாகக் கணிக்கும் வகையில் பயன்பாடுகள், Google இன் இருப்பிடச் சேவையைப் பயன்படுத்தலாம். அநாமதேய இருப்பிடத் தரவு சேகரிக்கப்பட்டு Google க்கு அனுப்பப்படும்."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"வைஃபை மூலம் இருப்பிடம் கண்டறியப்பட்டது"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"திரை டச்ஸ்கிரீன்"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"பின்னணி தனிப்பட்ட தனிப்பயனாக்கு காட்சி"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"உரை அளவு"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"பரிமாற்றம்"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"இடம் டிஸ்க் வட்டு இயக்ககம் சாதனம் பயன்பாடு"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 54f9cff..49bc7fb 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయండి"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"పాస్‌వర్డ్‌లు"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"గుప్తీకరణ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"టాబ్లెట్‌ను గుప్తీకరించండి"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ఫోన్‌ను గుప్తీకరించండి"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"స్క్రీన్ ప్రకాశాన్ని సర్దుబాటు చేయండి"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"అనుకూల ప్రకాశం"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"అందుబాటులో ఉన్న కాంతికి ప్రకాశం స్థాయిని అనుకూలీకరించండి"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"నిద్రావస్థ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"స్క్రీన్‌ను ఆఫ్ చేయాల్సిన సమయం"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"నిష్క్రియంగా ఉన్న <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> తర్వాత"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"స్థానం మోడ్"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"స్థానాన్ని గుర్తించడానికి GPS, Wi‑Fi, మరియు సెల్యులార్ నెట్‌వర్క్‌లను ఉపయోగించండి"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"స్థానాన్ని గుర్తించడానికి Wi‑Fi మరియు సెల్యులార్ నెట్‌వర్క్‌లను ఉపయోగించండి"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"మీ స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగించండి"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగించండి"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; సెల్యులార్ నెట్‌వర్క్ స్థానం"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"మీ స్థానాన్ని వేగవంతంగా అంచనా వేయడం కోసం Google స్థాన సేవను ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి. అనామక స్థాన డేటా సేకరించబడుతుంది మరియు Googleకు పంపబడుతుంది."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"స్థానం Wi‑Fi ద్వారా గుర్తించబడింది"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"స్క్రీన్‌లో టచ్‌స్క్రీన్ భాగం"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"కాంతివిహీన స్క్రీన్ టచ్‌స్క్రీన్ బ్యాటరీ"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"కాంతివిహీన స్క్రీన్ టచ్‌స్క్రీన్ బ్యాటరీ"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"నేపథ్యం వ్యక్తిగతీకరించు అనుకూలీకరించు ప్రదర్శించు"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"వచన పరిమాణం"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ప్రాజెక్ట్"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"స్థలం డిస్క్ హార్డ్ డిస్క్ పరికరం వినియోగం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0065c09..2cce1d8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -343,6 +343,29 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ลายนิ้วมือ"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="other">ลงทะเบียนแล้ว <xliff:g id="COUNT_1">%1$d</xliff:g> ลายนิ้วมือ</item>
+      <item quantity="one">ลงทะเบียนแล้ว <xliff:g id="COUNT_0">%1$d</xliff:g> ลายนิ้วมือ</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"การตั้งค่าลายนิ้วมือ"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="8275201068478623705">"หากต้องการใช้ลายนิ้วมือเพื่อปลดล็อกหน้าจอหรือยืนยันการซื้อ เราจะต้อง: \n✓ ตั้งค่าวิธีการล็อกหน้าจอพื้นหลัง \n✓ เพิ่มลายนิ้วมือของคุณ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"มาเริ่มต้นกันเลย!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"วางนิ้วมือบนเซ็นเซอร์ลายนิ้วมือ แล้วยกขึ้นหลังจากที่คุณรู้สึกว่ามีการสั่น"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"เยี่ยม! ทำซ้ำเลย"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"วางนิ้วมือเดียวกันบนเซ็นเซอร์ลายนิ้วมือและยกขึ้นหลังจากที่คุณรู้สึกว่ามีการสั่น"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"เพิ่มลายนิ้วมือแล้ว!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"เมื่อใดก็ตามที่คุณเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุญาตการซื้อได้"</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"เพิ่ม"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ถัดไป"</string>
+    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"ตรวจพบลายนิ้วมือเพียงบางส่วน โปรดลองอีกครั้ง"</string>
+    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"เซ็นเซอร์ลายนิ้วมือไม่สะอาด โปรดทำความสะอาดและลองอีกครั้ง"</string>
+    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"เคลื่อนนิ้วเร็วเกินไป โปรดลองอีกครั้ง"</string>
+    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"เคลื่อนนิ้วช้าเกินไป โปรดลองอีกครั้ง"</string>
+    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ไม่สามารถดำเนินการได้ โปรดลองอีกครั้ง"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ฮาร์ดแวร์ไม่พร้อมใช้งาน"</string>
+    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ไม่สามารถเก็บลายนิ้วมือได้ โปรดนำลายนิ้วมือที่มีอยู่ออก"</string>
+    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"หมดเวลาใช้ลายนิ้วมือแล้ว โปรดลองอีกครั้ง"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"การเข้ารหัส"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"เข้ารหัสแท็บเล็ต"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"เข้ารหัสโทรศัพท์"</string>
@@ -770,6 +793,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"ปรับความสว่างหน้าจอ"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ปรับระดับความสว่างให้เหมาะกับแสงที่มีอยู่"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"ธีม"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"สีสว่าง"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"สีมืด"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"อัตโนมัติ"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"สลีป"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"หน้าจอปิด"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1061,7 +1089,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"โหมดตำแหน่ง"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ใช้ GPS, Wi-Fi และเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ใช้ Wi-Fi และเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"ใช้ GPS เพื่อหาตำแหน่งของคุณ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ใช้ GPS เพื่อระบุตำแหน่ง"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ตำแหน่ง Wi-Fi และเครือข่าย"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ตำแหน่งที่กำหนดโดย WiFi"</string>
@@ -2308,7 +2336,8 @@
     <string name="keywords_display" msgid="6709007669501628320">"หน้าจอ หน้าจอสัมผัส"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"พื้นหลัง ปรับเปลี่ยนในแบบของคุณ กำหนดค่า หน้าจอ"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"ธีมสีมืด โหมดกลางคืน หน้าจอสลัว สลับความสว่าง"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"พื้นหลัง ปรับเปลี่ยนในแบบของคุณ กำหนดค่า การแสดงผล"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ขนาดข้อความ"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"ฉาย"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ที่ว่าง ดิสก์ ฮาร์ดไดร์ฟ อุปกรณ์ การใช้"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index f5314e3..ce549ce 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -452,8 +452,8 @@
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"I-off"</item>
-    <item msgid="675719912558941285">"Draw non-rectangular clip region in blue"</item>
-    <item msgid="1064373276095698656">"Highlight tested drawing commands in green"</item>
+    <item msgid="675719912558941285">"Iguhit ang non-rectangular clip region sa asul"</item>
+    <item msgid="1064373276095698656">"I-higlight nang berde ang tested drawing commands"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Naka-off"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1922c72..9e3adc0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Pag-encrypt"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"I-encrypt ang telepono"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"I-optimize ang antas ng brightness para sa available na ilaw"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pag-off ng screen"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode ng lokasyon"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gumamit ng GPS, Wi‑Fi at mga cellular network upang matukoy ang lokasyon"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gumamit ng Wi-Fi at cellular network upang matukoy ang lokasyon"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Gamitin ang GPS upang matukoy ang iyong lokasyon"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gamitin ang GPS upang matukoy ang lokasyon"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasyon ng Wi-Fi at cellular network"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ipagamit sa apps ang serbisyo ng lok. ng Google para mabilis na itantya ang iyong lok.  Kokolektahin at ipapadala sa Google ang mga di alam na data ng lok."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Natukoy ng Wi-Fi ang lokasyon"</string>
@@ -1112,7 +1161,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kumpirmahin ang naka-save na pattern"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Subukang muli:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kunin ang naka-unlock pattern"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Gumawa ng pattern sa pag-unlock"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pindutin ang Menu para sa tulong."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"I-angat ang daliri kapag tapos na"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli."</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"screen na touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"i-dim ang screen touchscreen baterya"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"i-dim ang screen touchscreen baterya"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"background i-personalize i-customize ang display"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"laki ng text"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proyekto"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"espasyo disk hard drive device paggamit"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a64b455..752d3eb 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifreleme"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tableti şifrele"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonu şifreleme"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Uyarlanan parlaklık"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Parlaklık düzeyini mevcut ışık koşullarına göre ayarla"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran kapanır"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -919,7 +968,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Kamera yazılımını kullanarak fotoğrafları ve MTP\'yi desteklemeyen bilgisayarlardaki her türlü dosyayı aktarmanıza olanak sağlar."</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI özellikli uygulamaların bilgisayarınızda MIDI yazılımla USB üzerinden çalışmasına olanak verir."</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI özellikli uygulamaların bilgisayarınızda MIDI yazılımıyla USB üzerinden çalışmasına olanak verir."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Diğer kullanıcılar"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Pil düzeyi"</string>
@@ -1059,9 +1108,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Yüksek pil kullanımı"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Düşük pil kullanımı"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Konum modu"</string>
-    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Konumu belirlemek için GPS, Kablosuz ve hücresel ağları kullanın"</string>
-    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Konumu belirlemek için Kablosuz ve hücresel ağları kullanın"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Konumunuzu belirlemek için GPS kullanın"</string>
+    <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Konumu belirlemek için GPS, Kablosuz ve hücresel ağlar kullanılır"</string>
+    <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Konumu belirlemek için Kablosuz ve hücresel ağlar kullanılır"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Konumu belirlemek için GPS kullanılır"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Kablosuz ve hücresel ağ konumu"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Uygulamalar konumunuzu daha hızlı tahmin edebilmek için Google\'ın konum bilgilerini kullanabilsin. Anonim konum bilgileri toplanıp Google\'a gönderilir."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Konum, Kablosuz tarafından belirlendi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ekran dokunmatik ekran"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"karartma ekran dokunmatik ekran pil"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"karartma ekran dokunmatik ekran pil"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"arka plan kişiselleştirme özelleştirme ekran"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"metin boyutu"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"proje"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"alan disk sabit sürücü cihaz kullanım"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 406f16f..3092c73 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -345,6 +345,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрування"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифрувати телефон"</string>
@@ -784,6 +823,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Регульована яскравість"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимізація рівня яскравості з урахуванням умов освітлення"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Вимикати екран"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
@@ -1077,7 +1126,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локації"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Використовувати GPS, Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Використовувати Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Використовувати GPS для визначення місцезнаходження"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Використовувати GPS для визначення місцезнаходження"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Локація Wi‑Fi і моб. мереж"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Місцезнаходження, визначене Wi-Fi"</string>
@@ -2324,7 +2373,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"сенсорний екран дисплея"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемнити дисплей сенсорний екран акумулятор"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"затемнити дисплей сенсорний екран акумулятор"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"фон персоналізувати налаштувати дисплей"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"розмір шрифту"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"проект"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"місце на диску жорсткий диск використання пристрою"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 78aaf3b..a89c9e3 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"میرا مقام، اسکرین ان لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"پاس ورڈز"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"مرموز کاری"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ٹیبلٹ کی مرموز کاری کریں"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"فون کی مرموز کاری کریں"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"اسکرین کی چمک کو ایڈجسٹ کریں"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"تغیر پذیر چمک"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"دستیاب روشنی کیلئے چمک کی سطح کو بہتر بنائیں"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"سلیپ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"اسکرین آف ہوجاتی ہے"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"غیر فعالیت کے <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> بعد"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"مقام وضع"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏مقام کا تعین کرنے کیلئے GPS, Wi‑Fi اور سیلولر نیٹ ورکس کا استعمال کریں"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏مقام کا تعین کرنے کیلئے Wi‑Fi اور سیلولر نیٹ ورکس کا استعمال کریں"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"‏اپنے مقام کا تعین کرنے کیلئے GPS کا استعمال کریں"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏مقام کا تعین کرنے کیلئے GPS استعمال کریں"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏Wi‑Fi و سیلولر نیٹ ورک کا مقام"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏اپنے مقام کا تیزی سے اندازہ لگانے کیلئے ایپس کو Google کی مقام کی سروس کا استعمال کرنے دیں۔ گمنام مقام کا ڈیٹا جمع کیا جائے گا اور Google کو بھیجا جائے گا۔"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏Wi‑Fi کے ذریعہ مقام کا تعین کیا گیا"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"اسکرین ٹچ اسکرین"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"مدھم اسکرین ٹچ اسکرین بیٹری"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"مدھم اسکرین ٹچ اسکرین بیٹری"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"پس منظر ذاتی نوعیت کا بنائیں حسب ضرورت بنائیں ڈسپلے"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"متن کا سائز"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"پروجیکٹ"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"اسپیس ڈسک ہارڈ ڈرائیو آلہ کا استعمال"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index a1c556b..8ea7863 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Shifrlash"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Planshetni shifrlash"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonni shifrlash"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ekran yorqinligini moslash"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Moslashuvchan yorqinlik"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Yorqinlik darajasini mavjud yorug‘likka qarab optimallashtirish"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Uxlash"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Faolsiz <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> holatdan keyin"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Joylashuv rejimi"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Joylashuvni aniqlash uchun GPS, Wi‑Fi va mobil tarmoqlardan foydalanish"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Joylashuvni aniqlash uchun Wi‑Fi va mobil tarmoqlardan foydalanish"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Joylashuvingizni aniqlash uchun GPS‘dan foydalanish"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Joylashuvni GPS yordamida aniqlash"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi va mobil tarmoq"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Joylashuvingizni tezroq aniqlash uchun ilovalarga Google joylashuv xizmatlaridan foydalanishga ruxsat berish. Joylashuv haqida anonim ma‘lumot to‘planib, Google‘ga yuboriladi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi orqali aniqlangan joylashuv"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"ekran tegish ekrani"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"xira, ekran, sensorli ekran, batareya"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"xira, ekran, sensorli ekran, batareya"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"orqa fon, moslashtirish, ekran"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"matn o\'lchami"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"loyiha"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"joy, disk, qattiq disk, qurilmadan foydalanish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ae4b707..1a898a6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Mã hóa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Mã hóa điện thoại"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"Điều chỉnh độ sáng của màn hình"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Độ sáng thích nghi"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Tối ưu hóa độ sáng cho ánh sáng có sẵn"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Thời gian sáng"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Chế độ vị trí"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Sử dụng mạng GPS, Wi-Fi và di động để xác định vị trí"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Sử dụng mạng di động và Wi-Fi để xác định vị trí"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Sử dụng GPS để xác định vị trí của bạn"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sử dụng GPS để xác định vị trí"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Vị trí mạng di động và Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Cho phép ứng dụng dùng DV vị trí của Google để ước đoán vị trí nhanh hơn. Dữ liệu vị trí ẩn danh sẽ được thu thập và gửi tới Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vị trí được xác định bằng Wi‑Fi"</string>
@@ -2308,7 +2357,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"màn hình màn hình cảm ứng"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"làm mờ màn hình màn hình cảm ứng pin"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"làm mờ màn hình màn hình cảm ứng pin"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"nền cá nhân hóa tùy chỉnh màn hình"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"kích thước văn bản"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"chiếu"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"dung lượng đĩa ổ đĩa cứng thiết bị sử dụng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4e117da..a92c778 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"自动调节亮度"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"根据环境光线情况优化亮度"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"屏幕关闭"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"无操作<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
@@ -1061,7 +1110,8 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置信息模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用GPS、WLAN和移动网络确定位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用WLAN和移动网络确定位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用GPS确定位置"</string>
+    <!-- no translation found for location_mode_sensors_only_description (788127681455735699) -->
+    <skip />
     <string name="location_network_based" msgid="6010456018401296590">"WLAN和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用Google位置信息服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过WLAN确定位置"</string>
@@ -2308,7 +2358,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"屏幕 触摸屏"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"变暗 调暗 屏幕 触摸屏 电池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"变暗 调暗 屏幕 触摸屏 电池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 墙纸 个性化 自定义 显示 显示屏"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"字体大小"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影 投射"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"空间 磁盘 硬盘 设备 使用量 使用情况"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4a7a5f0..1bc4916 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"對平板電腦進行加密"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"調校螢幕亮度"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"自動調校亮度"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"按環境光線優化亮度"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -919,7 +968,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"相機 (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"讓您使用相機軟件傳送照片，並在不支援 MTP 的電腦上傳送任何檔案"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"讓已啟用 MIDI 的應用程式透過 USB 您電腦上的 MIDI 軟件運作。"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"讓已啟用 MIDI 的應用程式透過 USB 與電腦上的 MIDI 軟件運作。"</string>
     <string name="storage_other_users" msgid="808708845102611856">"其他使用者"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電量"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用 GPS、Wi-Fi 和流動網絡確定位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用 Wi-Fi 和流動網絡確定位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 確定您的位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 確定位置"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和流動網絡位置資料"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的位置資訊服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 確定位置"</string>
@@ -2312,7 +2361,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"觸控式螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"變暗 螢幕 觸控螢幕 電池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 個人化 自訂 顯示"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"空間 磁碟 硬碟 裝置 使用量"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7acab8d..8d8b34c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -343,6 +343,45 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
+    <!-- no translation found for security_settings_fingerprint_preference_title (2488725232406204350) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_preference_summary (4776063289827470602) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_title (4735546436672054254) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (8275201068478623705) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (1063375657071124812) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_start_message (6294541599045187369) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (3732060789409510229) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (8846866512704467036) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (4798692662828257300) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (835496875787664316) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_add (9087063833311608281) -->
+    <skip />
+    <!-- no translation found for fingerprint_enroll_button_next (6247009337616342759) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_try_again (3543246847519773670) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_imager_dirty (1069333738311915876) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_fast (4068036120000203641) -->
+    <skip />
+    <!-- no translation found for fingerprint_acquired_too_slow (1030658686087736299) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_unable_to_process (3695170439991347449) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_hw_not_available (3535489559110151108) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_no_space (7350970359618153619) -->
+    <skip />
+    <!-- no translation found for fingerprint_error_timeout (7509454501138740556) -->
+    <skip />
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密保護平板電腦"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
@@ -770,6 +809,16 @@
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"自動調整亮度"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"根據環境光源調整最佳亮度"</string>
+    <!-- no translation found for night_mode_title (6928425617491943384) -->
+    <skip />
+    <!-- no translation found for night_mode_summary (9196605054622017193) -->
+    <skip />
+    <!-- no translation found for night_mode_no (7682792841791457238) -->
+    <skip />
+    <!-- no translation found for night_mode_yes (4847655033618591567) -->
+    <skip />
+    <!-- no translation found for night_mode_auto (7508348175804304327) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1061,7 +1110,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用 GPS、Wi-Fi 和行動網路判斷位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用 Wi-Fi 和行動網路判斷位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"使用 GPS 判斷您的位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 判斷您的所在位置"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和行動網路位置資訊"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 判定位置"</string>
@@ -2312,7 +2361,10 @@
     <string name="keywords_display" msgid="6709007669501628320">"螢幕 觸控式螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"變暗 螢幕 觸控螢幕 電池"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"背景 個人化 自訂 顯示"</string>
+    <!-- no translation found for keywords_display_night_mode (7652025075378505346) -->
+    <skip />
+    <!-- no translation found for keywords_display_wallpaper (7778443098569037063) -->
+    <skip />
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"投影"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"空間 磁碟 硬碟 裝置 使用量"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ae7715c..71fd965 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -343,6 +343,29 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Amaphasiwedi"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Izigxivizo zeminwe"</string>
+    <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> izigxivizo zeminwe zibhalisiwe</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> izigxivizo zeminwe zibhalisiwe</item>
+    </plurals>
+    <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Ukusetha kwezigxivizo zeminwe"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="8275201068478623705">"Ukuze usebenzise izigxivizo zakho zeminwe ukuze uvule isikrini sakho noma uqinisekise ukuthenga, kuzomele: \n✓ Setha indlela yakho engemuva yesikrini sokukhiya \n✓ Engeza izigxivizo zeminwe"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="1063375657071124812">"Asiqalise!"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="6294541599045187369">"Faka umunwe wakho kunzwa yezigxivizo zeminwe. Phakamisa ngemuva kokuzwa ukudlidlizela."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="3732060789409510229">"Kuhle! Manje phinda."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Faka umunwe ofanayo kunzwa yezigxivizo zeminwe uphinde uphakamise ukuze uzozwa ukudlidlizela."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Izigxivizo zeminwe zingeziwe!"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Noma kunini lapho ubona khona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe noma ugunyaze ukuthenga."</string>
+    <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Engeza"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Okulandelayo"</string>
+    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Izigxivizo zeminwe esincane sitholiwe. Sicela uzame futhi."</string>
+    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Inzwa yezigxivizo zeminwe ingcolile. Sicela uyihlanze uphinde uzame futhi."</string>
+    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Umunwe uhanjiswe ngokushesha kakhulu. Sicela uzame futhi."</string>
+    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Umunwe uhanjiswe kancane kakhulu. Sicela uzame futhi."</string>
+    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Ayikwazi ukucubungula. Zama futhi."</string>
+    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Izingxenyekazi zekhompyutha azitholakali."</string>
+    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Izigxivizo zeminwe azikwazi ukugcinwa. Sicela ususe izigxivizo zeminwe ezikhona."</string>
+    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Kufinyelelwe isikhathi sokuvala sezigxivizo zeminwe. Zama futhi."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Ukubethelwa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Bethela ifoni"</string>
@@ -770,6 +793,11 @@
     <string name="brightness_summary" msgid="838917350127550703">"Lungisa ukukhanya kwesikrini"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ukukhanya okuguqukayo"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Lungiselela izinga lokukhanya ekukhanyeni okutholakalayo"</string>
+    <string name="night_mode_title" msgid="6928425617491943384">"Itimu"</string>
+    <string name="night_mode_summary" msgid="9196605054622017193">"%s"</string>
+    <string name="night_mode_no" msgid="7682792841791457238">"Ukukhanya"</string>
+    <string name="night_mode_yes" msgid="4847655033618591567">"Kumnyama"</string>
+    <string name="night_mode_auto" msgid="7508348175804304327">"Okuzenzakalelayo"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Lala"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Isikrini siyavaleka"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -1062,7 +1090,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Imodi yendawo"</string>
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Sebenzisa i-GPS, Wi‑Fi namanethiwekhi weselula ukucacisa indawo"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Sebenzisa i-Wi‑Fi namanethiwekhi weselula ukucacisa indawo"</string>
-    <string name="location_mode_sensors_only_description" msgid="7178415350457794366">"Sebenzisa i-GPS ukuze uthole indawo yakho"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sebenzisa i-GPS ukuze unqume indawo"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Indawo ye-Wi‑Fi nenethiwekhi yeselula"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Vumela izinhlelo zokusebenza zisebenzise isevisi yendawo yakwa-Google ukucabangela indawo yakho ngokushesha. Idatha yendawo engaziwa izoqoqwa futhi ithunyelwe kwa-Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Indawo etholwe i-Wi-Fi"</string>
@@ -2315,7 +2343,8 @@
     <string name="keywords_display" msgid="6709007669501628320">"isikrini sesikrini sokuthinta"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ibhethri lesikrini esithintwayo lokucisha isikrini"</string>
     <string name="keywords_display_auto_brightness" msgid="8357056338746666901">"ibhethri lesikrini esithintwayo lokucisha isikrini"</string>
-    <string name="keywords_display_wallpaper" msgid="6043033055096511751">"isibonisi sokwenza ngezifiso okwsemuva"</string>
+    <string name="keywords_display_night_mode" msgid="7652025075378505346">"itimu emnyama imodi yasebusuku fiphalisa isikrini guqula ukukhanya"</string>
+    <string name="keywords_display_wallpaper" msgid="7778443098569037063">"ingemuva yenza kube ngokwakho yenza ngokwezifiso isibonisi"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"usayizi wombhalo"</string>
     <string name="keywords_display_cast_screen" msgid="8887412173792143329">"iphrojekthi"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"isikhala idiski eliqinile ukusetshenziswa kwedivayisi"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18de05e..01fa8da 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5550,6 +5550,7 @@
     <string name="keywords_display">screen touchscreen</string>
     <string name="keywords_display_brightness_level">dim screen touchscreen battery</string>
     <string name="keywords_display_auto_brightness">dim screen touchscreen battery</string>
+    <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
     <string name="keywords_display_night_mode">dark theme night mode dim screen invert brightness</string>
     <string name="keywords_display_wallpaper">background personalize customize display</string>
     <string name="keywords_display_font_size">text size</string>
@@ -5989,4 +5990,37 @@
    <string name="imei_information_summary">IMEI relative information</string>
    <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
 
+   <!-- New strings needed for App Info 2 -->
+   <!-- Preference label for app default launch settings -->
+   <string name="launch_by_default">Launch by default</string>
+
+   <!-- Summary for app storage preference -->
+   <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>
+   <!-- Internal storage label -->
+   <string name="storage_type_internal">internal memory</string>
+   <!-- External storage label -->
+   <string name="storage_type_external">external memory</string>
+
+   <!-- App notification summary with notifications enabled -->
+   <string name="notifications_enabled">On</string>
+   <!-- App notification summary with notifications disabled -->
+   <string name="notifications_disabled">Block</string>
+   <!-- App notification summary with notifications sensitive -->
+   <string name="notifications_sensitive">Sensitive</string>
+   <!-- App notification summary with notifications priority -->
+   <string name="notifications_priority">Priority</string>
+   <!-- App notification summary with notifications priority and sensitive -->
+   <string name="notifications_priority_sensitive">Priority &amp; Sensitive</string>
+
+   <!-- Permissions preference summary -->
+   <plurals name="permissions_summary">
+       <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
+       <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
+   </plurals>
+
+   <!-- Launch defaults preference summary with some set -->
+   <string name="launch_defaults_some">Some defaults set</string>
+   <!-- Launch defaults preference summary with none set -->
+   <string name="launch_defaults_none">No defaults set</string>
+
 </resources>
diff --git a/res/xml/installed_app_details.xml b/res/xml/installed_app_details.xml
new file mode 100644
index 0000000..05bea5c
--- /dev/null
+++ b/res/xml/installed_app_details.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/application_info_label">
+    <com.android.settings.applications.HeaderPreference
+        android:key="header_view"
+        android:layout="@layout/installed_app_details" />
+
+    <Preference
+        android:key="notification_settings"
+        android:title="@string/notification_section_header"
+        android:selectable="true" />
+
+    <Preference
+        android:key="storage_settings"
+        android:title="@string/storage_settings"
+        android:selectable="true" />
+
+    <Preference
+        android:key="permission_settings"
+        android:title="@string/permissions_label"
+        android:selectable="true" />
+
+    <Preference
+        android:key="data_settings"
+        android:title="@string/data_size_label"
+        android:selectable="true" />
+
+    <Preference
+        android:key="preferred_settings"
+        android:title="@string/launch_by_default"
+        android:selectable="true" />
+</PreferenceScreen>
diff --git a/src/com/android/settings/AppHeader.java b/src/com/android/settings/AppHeader.java
new file mode 100644
index 0000000..5cd126a
--- /dev/null
+++ b/src/com/android/settings/AppHeader.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class AppHeader {
+
+    public static void createAppHeader(final Activity activity, Drawable icon, CharSequence label,
+            final Intent settingsIntent) {
+        final View content = activity.findViewById(R.id.main_content);
+        final ViewGroup contentParent = (ViewGroup) content.getParent();
+        final View bar = activity.getLayoutInflater().inflate(R.layout.app_header,
+                contentParent, false);
+
+        final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon);
+        appIcon.setImageDrawable(icon);
+
+        final TextView appName = (TextView) bar.findViewById(R.id.app_name);
+        appName.setText(label);
+
+        final View appSettings = bar.findViewById(R.id.app_settings);
+        if (settingsIntent == null) {
+            appSettings.setVisibility(View.GONE);
+        } else {
+            appSettings.setClickable(true);
+            appSettings.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    activity.startActivity(settingsIntent);
+                }
+            });
+        }
+        contentParent.addView(bar, 0);
+    }
+
+}
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 60803dc..45d3d11 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -135,7 +135,13 @@
                 handleUnlockOrInstall();
             }
         } else {
-            finish();
+            // Users can set a screen lock if there is none even if they can't modify the
+            // credentials store.
+            if (ACTION_UNLOCK.equals(action) && mKeyStore.state() == KeyStore.State.UNINITIALIZED) {
+                ensureKeyGuard();
+            } else {
+                finish();
+            }
         }
     }
 
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
new file mode 100644
index 0000000..2203a21
--- /dev/null
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.hardware.usb.IUsbManager;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.os.UserManager;
+import android.preference.PreferenceFragment;
+import android.util.Log;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+
+import java.util.ArrayList;
+
+public abstract class AppInfoBase extends PreferenceFragment
+        implements ApplicationsState.Callbacks {
+
+    public static final String ARG_PACKAGE_NAME = "package";
+
+    protected static final String TAG = AppInfoBase.class.getSimpleName();
+    protected static final boolean localLOGV = false;
+
+    protected boolean mAppControlRestricted = false;
+
+    protected ApplicationsState mState;
+    private ApplicationsState.Session mSession;
+    protected ApplicationsState.AppEntry mAppEntry;
+    protected PackageInfo mPackageInfo;
+    protected String mPackageName;
+
+    protected IUsbManager mUsbManager;
+    protected DevicePolicyManager mDpm;
+    protected UserManager mUserManager;
+    protected PackageManager mPm;
+
+    // Dialog identifiers used in showDialog
+    protected static final int DLG_BASE = 0;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mState = ApplicationsState.getInstance(getActivity().getApplication());
+        mSession = mState.newSession(this);
+        Context context = getActivity();
+        mDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mPm = context.getPackageManager();
+        IBinder b = ServiceManager.getService(Context.USB_SERVICE);
+        mUsbManager = IUsbManager.Stub.asInterface(b);
+
+        // Need to make sure we have loaded applications at this point.
+        mSession.resume();
+
+        retrieveAppEntry();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mAppControlRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL);
+        mSession.resume();
+
+        if (!refreshUi()) {
+            setIntentAndFinish(true, true);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSession.pause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSession.release();
+    }
+
+    protected String retrieveAppEntry() {
+        final Bundle args = getArguments();
+        mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
+        if (mPackageName == null) {
+            Intent intent = (args == null) ?
+                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
+            if (intent != null) {
+                mPackageName = intent.getData().getSchemeSpecificPart();
+            }
+        }
+        mAppEntry = mState.getEntry(mPackageName);
+        if (mAppEntry != null) {
+            // Get application info again to refresh changed properties of application
+            try {
+                mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
+                        PackageManager.GET_DISABLED_COMPONENTS |
+                        PackageManager.GET_UNINSTALLED_PACKAGES |
+                        PackageManager.GET_SIGNATURES);
+            } catch (NameNotFoundException e) {
+                Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
+            }
+        } else {
+            Log.w(TAG, "Missing AppEntry; maybe reinstalling?");
+            mPackageInfo = null;
+        }
+
+        return mPackageName;
+    }
+
+    protected void setIntentAndFinish(boolean finish, boolean appChanged) {
+        if (localLOGV) Log.i(TAG, "appChanged="+appChanged);
+        Intent intent = new Intent();
+        intent.putExtra(ManageApplications.APP_CHG, appChanged);
+        SettingsActivity sa = (SettingsActivity)getActivity();
+        sa.finishPreferencePanel(this, Activity.RESULT_OK, intent);
+    }
+
+    protected void showDialogInner(int id, int moveErrorCode) {
+        DialogFragment newFragment = new MyAlertDialogFragment(id, moveErrorCode);
+        newFragment.setTargetFragment(this, 0);
+        newFragment.show(getFragmentManager(), "dialog " + id);
+    }
+
+    protected abstract boolean refreshUi();
+    protected abstract AlertDialog createDialog(int id, int errorCode);
+
+    @Override
+    public void onRunningStateChanged(boolean running) { }
+    @Override
+    public void onRebuildComplete(ArrayList<AppEntry> apps) { }
+    @Override
+    public void onPackageIconChanged() { }
+    @Override
+    public void onPackageSizeChanged(String packageName) { }
+    @Override
+    public void onAllSizesComputed() { }
+
+    @Override
+    public void onPackageListChanged() {
+        refreshUi();
+    }
+
+    public class MyAlertDialogFragment extends DialogFragment {
+        public MyAlertDialogFragment(int id, int errorCode) {
+            Bundle args = new Bundle();
+            args.putInt("id", id);
+            args.putInt("moveError", errorCode);
+            setArguments(args);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            int id = getArguments().getInt("id");
+            int errorCode = getArguments().getInt("moveError");
+            Dialog dialog = createDialog(id, errorCode);
+            if (dialog == null) {
+                throw new IllegalArgumentException("unknown id " + id);
+            }
+            return dialog;
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
new file mode 100644
index 0000000..f7546f2
--- /dev/null
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.settings.AppHeader;
+
+public abstract class AppInfoWithHeader extends AppInfoBase {
+
+    private boolean mCreated;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        if (mCreated) {
+            Log.w(TAG, "onActivityCreated: ignoring duplicate call");
+            return;
+        }
+        mCreated = true;
+        if (mPackageInfo == null) return;
+        AppHeader.createAppHeader(getActivity(), mPackageInfo.applicationInfo.loadIcon(mPm),
+                mPackageInfo.applicationInfo.loadLabel(mPm), null);
+    }
+}
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
new file mode 100644
index 0000000..6379102
--- /dev/null
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.app.AlertDialog;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.hardware.usb.IUsbManager;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.style.BulletSpan;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener {
+
+    private Button mActivitiesButton;
+    private AppWidgetManager mAppWidgetManager;
+
+    private View mRootView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.app_preferred_settings, container, false);
+
+        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
+        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+
+        mActivitiesButton = (Button) view.findViewById(R.id.clear_activities_button);
+        mRootView = view;
+
+        return view;
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
+        boolean hasBindAppWidgetPermission =
+                mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);
+
+        TextView autoLaunchTitleView = (TextView) mRootView.findViewById(R.id.auto_launch_title);
+        TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+        boolean autoLaunchEnabled = hasPreferredActivities(mPm, mPackageName)
+                || hasUsbDefaults(mUsbManager, mPackageName);
+        if (!autoLaunchEnabled && !hasBindAppWidgetPermission) {
+            resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
+        } else {
+            boolean useBullets = hasBindAppWidgetPermission && autoLaunchEnabled;
+
+            if (hasBindAppWidgetPermission) {
+                autoLaunchTitleView.setText(R.string.auto_launch_label_generic);
+            } else {
+                autoLaunchTitleView.setText(R.string.auto_launch_label);
+            }
+
+            CharSequence text = null;
+            int bulletIndent = getResources()
+                    .getDimensionPixelSize(R.dimen.installed_app_details_bullet_offset);
+            if (autoLaunchEnabled) {
+                CharSequence autoLaunchEnableText = getText(R.string.auto_launch_enable_text);
+                SpannableString s = new SpannableString(autoLaunchEnableText);
+                if (useBullets) {
+                    s.setSpan(new BulletSpan(bulletIndent), 0, autoLaunchEnableText.length(), 0);
+                }
+                text = (text == null) ?
+                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
+            }
+            if (hasBindAppWidgetPermission) {
+                CharSequence alwaysAllowBindAppWidgetsText =
+                        getText(R.string.always_allow_bind_appwidgets_text);
+                SpannableString s = new SpannableString(alwaysAllowBindAppWidgetsText);
+                if (useBullets) {
+                    s.setSpan(new BulletSpan(bulletIndent),
+                            0, alwaysAllowBindAppWidgetsText.length(), 0);
+                }
+                text = (text == null) ?
+                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
+            }
+            autoLaunchView.setText(text);
+            mActivitiesButton.setEnabled(true);
+            mActivitiesButton.setOnClickListener(this);
+        }
+        return true;
+    }
+
+    private void resetLaunchDefaultsUi(TextView title, TextView autoLaunchView) {
+        title.setText(R.string.auto_launch_label);
+        autoLaunchView.setText(R.string.auto_launch_disable_text);
+        // Disable clear activities button
+        mActivitiesButton.setEnabled(false);
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        // No dialogs for preferred launch settings.
+        return null;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mActivitiesButton) {
+            if (mUsbManager != null) {
+                mPm.clearPackagePreferredActivities(mPackageName);
+                try {
+                    mUsbManager.clearDefaults(mPackageName, UserHandle.myUserId());
+                } catch (RemoteException e) {
+                    Log.e(TAG, "mUsbManager.clearDefaults", e);
+                }
+                mAppWidgetManager.setBindAppWidgetPermission(mPackageName, false);
+                TextView autoLaunchTitleView =
+                        (TextView) mRootView.findViewById(R.id.auto_launch_title);
+                TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+                resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
+            }
+        }
+    }
+
+    private static boolean hasUsbDefaults(IUsbManager usbManager, String packageName) {
+        try {
+            if (usbManager != null) {
+                return usbManager.hasDefaults(packageName, UserHandle.myUserId());
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "mUsbManager.hasDefaults", e);
+        }
+        return false;
+    }
+
+    private static boolean hasPreferredActivities(PackageManager pm, String packageName) {
+        // Get list of preferred activities
+        List<ComponentName> prefActList = Collections.emptyList();
+        // Intent list cannot be null. so pass empty list
+        List<IntentFilter> intentList = Collections.emptyList();
+        pm.getPreferredActivities(intentList, prefActList, packageName);
+        if (localLOGV) {
+            Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
+        }
+        return prefActList.size() > 0;
+    }
+
+    public static CharSequence getSummary(AppEntry appEntry, IUsbManager usbManager,
+            PackageManager pm, Context context) {
+        String packageName = appEntry.info.packageName;
+        boolean hasPreferred = hasPreferredActivities(pm, packageName)
+                || hasUsbDefaults(usbManager, packageName);
+        return context.getString(hasPreferred
+                ? R.string.launch_defaults_some
+                : R.string.launch_defaults_none);
+    }
+
+}
diff --git a/src/com/android/settings/applications/AppPermissionSettings.java b/src/com/android/settings/applications/AppPermissionSettings.java
new file mode 100644
index 0000000..a5b4895
--- /dev/null
+++ b/src/com/android/settings/applications/AppPermissionSettings.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AppSecurityPermissions;
+import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.internal.telephony.ISms;
+import com.android.internal.telephony.SmsUsageMonitor;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+
+import java.util.ArrayList;
+
+public class AppPermissionSettings extends AppInfoWithHeader {
+
+    private ISms mSmsManager;
+    private View mRootView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.permission_settings, container, false);
+
+        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
+        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+
+        mRootView = view;
+        return view;
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
+        // Security permissions section
+        LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
+        AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), mPackageName);
+        int premiumSmsPermission = getPremiumSmsPermission(mPackageName);
+        // Premium SMS permission implies the app also has SEND_SMS permission, so the original
+        // application permissions list doesn't have to be shown/hidden separately. The premium
+        // SMS subsection should only be visible if the app has tried to send to a premium SMS.
+        if (asp.getPermissionCount() > 0
+                || premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
+            permsView.setVisibility(View.VISIBLE);
+        } else {
+            permsView.setVisibility(View.GONE);
+        }
+        // Premium SMS permission subsection
+        TextView securityBillingDesc = (TextView) permsView.findViewById(
+                R.id.security_settings_billing_desc);
+        LinearLayout securityBillingList = (LinearLayout) permsView.findViewById(
+                R.id.security_settings_billing_list);
+        if (premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
+            // Show the premium SMS permission selector
+            securityBillingDesc.setVisibility(View.VISIBLE);
+            securityBillingList.setVisibility(View.VISIBLE);
+            Spinner spinner = (Spinner) permsView.findViewById(
+                    R.id.security_settings_premium_sms_list);
+            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
+                    R.array.security_settings_premium_sms_values,
+                    android.R.layout.simple_spinner_item);
+            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            spinner.setAdapter(adapter);
+            // List items are in the same order as SmsUsageMonitor constants, offset by 1.
+            spinner.setSelection(premiumSmsPermission - 1);
+            spinner.setOnItemSelectedListener(new PremiumSmsSelectionListener(
+                    mPackageName, mSmsManager));
+        } else {
+            // Hide the premium SMS permission selector
+            securityBillingDesc.setVisibility(View.GONE);
+            securityBillingList.setVisibility(View.GONE);
+        }
+        // App permissions subsection
+        if (asp.getPermissionCount() > 0) {
+            // Make the security sections header visible
+            LinearLayout securityList = (LinearLayout) permsView.findViewById(
+                    R.id.security_settings_list);
+            securityList.removeAllViews();
+            securityList.addView(asp.getPermissionsViewWithRevokeButtons());
+            // If this app is running under a shared user ID with other apps,
+            // update the description to explain this.
+            String[] packages = mPm.getPackagesForUid(mPackageInfo.applicationInfo.uid);
+            if (packages != null && packages.length > 1) {
+                ArrayList<CharSequence> pnames = new ArrayList<CharSequence>();
+                for (int i=0; i<packages.length; i++) {
+                    String pkg = packages[i];
+                    if (mPackageInfo.packageName.equals(pkg)) {
+                        continue;
+                    }
+                    try {
+                        ApplicationInfo ainfo = mPm.getApplicationInfo(pkg, 0);
+                        pnames.add(ainfo.loadLabel(mPm));
+                    } catch (PackageManager.NameNotFoundException e) {
+                    }
+                }
+                final int N = pnames.size();
+                if (N > 0) {
+                    final Resources res = getActivity().getResources();
+                    String appListStr;
+                    if (N == 1) {
+                        appListStr = pnames.get(0).toString();
+                    } else if (N == 2) {
+                        appListStr = res.getString(R.string.join_two_items, pnames.get(0),
+                                pnames.get(1));
+                    } else {
+                        appListStr = pnames.get(N-2).toString();
+                        for (int i=N-3; i>=0; i--) {
+                            appListStr = res.getString(i == 0 ? R.string.join_many_items_first
+                                    : R.string.join_many_items_middle, pnames.get(i), appListStr);
+                        }
+                        appListStr = res.getString(R.string.join_many_items_last,
+                                appListStr, pnames.get(N-1));
+                    }
+                    TextView descr = (TextView) mRootView.findViewById(
+                            R.id.security_settings_desc);
+                    descr.setText(res.getString(R.string.security_settings_desc_multi,
+                            mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
+                }
+            }
+        }
+        return true;
+    }
+
+    private int getPremiumSmsPermission(String packageName) {
+        try {
+            if (mSmsManager != null) {
+                return mSmsManager.getPremiumSmsPermission(packageName);
+            }
+        } catch (RemoteException ex) {
+            // ignored
+        }
+        return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        // No dialogs for Permissions screen.
+        return null;
+    }
+
+    public static CharSequence getSummary(AppEntry appEntry, Context context) {
+        AppSecurityPermissions asp = new AppSecurityPermissions(context,
+                appEntry.info.packageName);
+        int count = asp.getPermissionCount();
+        return context.getResources().getQuantityString(R.plurals.permissions_summary,
+                count, count);
+    }
+
+    private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
+        private final String mPackageName;
+        private final ISms mSmsManager;
+
+        PremiumSmsSelectionListener(String packageName, ISms smsManager) {
+            mPackageName = packageName;
+            mSmsManager = smsManager;
+        }
+
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View view, int position,
+                long id) {
+            if (position >= 0 && position < 3) {
+                if (localLOGV) Log.d(TAG, "Selected premium SMS policy " + position);
+                setPremiumSmsPermission(mPackageName, (position + 1));
+            } else {
+                Log.e(TAG, "Error: unknown premium SMS policy " + position);
+            }
+        }
+
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+            // Ignored
+        }
+
+        private void setPremiumSmsPermission(String packageName, int permission) {
+            try {
+                if (mSmsManager != null) {
+                    mSmsManager.setPremiumSmsPermission(packageName, permission);
+                }
+            } catch (RemoteException ex) {
+                // ignored
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
new file mode 100644
index 0000000..5ae5e8f
--- /dev/null
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -0,0 +1,501 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageDataObserver;
+import android.content.pm.IPackageMoveObserver;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.Callbacks;
+
+public class AppStorageSettings extends AppInfoWithHeader implements OnClickListener, Callbacks {
+    private static final String TAG = "AppStorageSettings";
+
+    //internal constants used in Handler
+    private static final int OP_SUCCESSFUL = 1;
+    private static final int OP_FAILED = 2;
+    private static final int MSG_CLEAR_USER_DATA = 1;
+    private static final int MSG_CLEAR_CACHE = 3;
+    private static final int MSG_PACKAGE_MOVE = 4;
+
+    // invalid size value used initially and also when size retrieval through PackageManager
+    // fails for whatever reason
+    private static final int SIZE_INVALID = -1;
+
+    // Result code identifiers
+    public static final int REQUEST_MANAGE_SPACE = 2;
+
+    private static final int DLG_CLEAR_DATA = DLG_BASE + 1;
+    private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 2;
+    private static final int DLG_MOVE_FAILED = DLG_BASE + 3;
+
+    private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
+    private TextView mTotalSize;
+    private TextView mAppSize;
+    private TextView mDataSize;
+    private TextView mExternalCodeSize;
+    private TextView mExternalDataSize;
+
+    // Views related to cache info
+    private TextView mCacheSize;
+    private Button mClearDataButton;
+    private Button mClearCacheButton;
+    private Button mMoveAppButton;
+    private boolean mMoveInProgress = false;
+
+    private boolean mCanClearData = true;
+    private boolean mHaveSizes = false;
+
+    private long mLastCodeSize = -1;
+    private long mLastDataSize = -1;
+    private long mLastExternalCodeSize = -1;
+    private long mLastExternalDataSize = -1;
+    private long mLastCacheSize = -1;
+    private long mLastTotalSize = -1;
+
+    private ClearCacheObserver mClearCacheObserver;
+    private ClearUserDataObserver mClearDataObserver;
+    private PackageMoveObserver mPackageMoveObserver;
+
+    // Resource strings
+    private CharSequence mInvalidSizeStr;
+    private CharSequence mComputingStr;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.storage_settings, container, false);
+
+        final ViewGroup allDetails = (ViewGroup)view.findViewById(R.id.all_details);
+        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+        mComputingStr = getActivity().getText(R.string.computing_size);
+        mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
+
+        // Set default values on sizes
+        mTotalSize = (TextView)view.findViewById(R.id.total_size_text);
+        mAppSize = (TextView)view.findViewById(R.id.application_size_text);
+        mDataSize = (TextView)view.findViewById(R.id.data_size_text);
+        mExternalCodeSize = (TextView)view.findViewById(R.id.external_code_size_text);
+        mExternalDataSize = (TextView)view.findViewById(R.id.external_data_size_text);
+
+        if (Environment.isExternalStorageEmulated()) {
+            ((View)mExternalCodeSize.getParent()).setVisibility(View.GONE);
+            ((View)mExternalDataSize.getParent()).setVisibility(View.GONE);
+        }
+
+        // Initialize clear data and move install location buttons
+        View data_buttons_panel = view.findViewById(R.id.data_buttons_panel);
+        mMoveAppButton = (Button) data_buttons_panel.findViewById(R.id.left_button);
+
+        // Cache section
+        mCacheSize = (TextView)view.findViewById(R.id.cache_size_text);
+        mClearCacheButton = (Button)view.findViewById(R.id.clear_cache_button);
+        mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
+
+        return view;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mClearCacheButton) {
+            // Lazy initialization of observer
+            if (mClearCacheObserver == null) {
+                mClearCacheObserver = new ClearCacheObserver();
+            }
+            mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver);
+        } else if(v == mClearDataButton) {
+            if (mAppEntry.info.manageSpaceActivityName != null) {
+                if (!Utils.isMonkeyRunning()) {
+                    Intent intent = new Intent(Intent.ACTION_DEFAULT);
+                    intent.setClassName(mAppEntry.info.packageName,
+                            mAppEntry.info.manageSpaceActivityName);
+                    startActivityForResult(intent, REQUEST_MANAGE_SPACE);
+                }
+            } else {
+                showDialogInner(DLG_CLEAR_DATA, 0);
+            }
+        } else if (v == mMoveAppButton) {
+            if (mPackageMoveObserver == null) {
+                mPackageMoveObserver = new PackageMoveObserver();
+            }
+            int moveFlags = (mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0 ?
+                    PackageManager.MOVE_INTERNAL : PackageManager.MOVE_EXTERNAL_MEDIA;
+            mMoveInProgress = true;
+            refreshButtons();
+            mPm.movePackage(mAppEntry.info.packageName, mPackageMoveObserver, moveFlags);
+        }
+    }
+
+    private String getSizeStr(long size) {
+        if (size == SIZE_INVALID) {
+            return mInvalidSizeStr.toString();
+        }
+        return Formatter.formatFileSize(getActivity(), size);
+    }
+
+    private void refreshSizeInfo() {
+        if (mAppEntry.size == ApplicationsState.SIZE_INVALID
+                || mAppEntry.size == ApplicationsState.SIZE_UNKNOWN) {
+            mLastCodeSize = mLastDataSize = mLastCacheSize = mLastTotalSize = -1;
+            if (!mHaveSizes) {
+                mAppSize.setText(mComputingStr);
+                mDataSize.setText(mComputingStr);
+                mCacheSize.setText(mComputingStr);
+                mTotalSize.setText(mComputingStr);
+            }
+            mClearDataButton.setEnabled(false);
+            mClearCacheButton.setEnabled(false);
+
+        } else {
+            mHaveSizes = true;
+            long codeSize = mAppEntry.codeSize;
+            long dataSize = mAppEntry.dataSize;
+            if (Environment.isExternalStorageEmulated()) {
+                codeSize += mAppEntry.externalCodeSize;
+                dataSize +=  mAppEntry.externalDataSize;
+            } else {
+                if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
+                    mLastExternalCodeSize = mAppEntry.externalCodeSize;
+                    mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
+                }
+                if (mLastExternalDataSize !=  mAppEntry.externalDataSize) {
+                    mLastExternalDataSize =  mAppEntry.externalDataSize;
+                    mExternalDataSize.setText(getSizeStr( mAppEntry.externalDataSize));
+                }
+            }
+            if (mLastCodeSize != codeSize) {
+                mLastCodeSize = codeSize;
+                mAppSize.setText(getSizeStr(codeSize));
+            }
+            if (mLastDataSize != dataSize) {
+                mLastDataSize = dataSize;
+                mDataSize.setText(getSizeStr(dataSize));
+            }
+            long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
+            if (mLastCacheSize != cacheSize) {
+                mLastCacheSize = cacheSize;
+                mCacheSize.setText(getSizeStr(cacheSize));
+            }
+            if (mLastTotalSize != mAppEntry.size) {
+                mLastTotalSize = mAppEntry.size;
+                mTotalSize.setText(getSizeStr(mAppEntry.size));
+            }
+
+            if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
+                mClearDataButton.setEnabled(false);
+            } else {
+                mClearDataButton.setEnabled(true);
+                mClearDataButton.setOnClickListener(this);
+            }
+            if (cacheSize <= 0) {
+                mClearCacheButton.setEnabled(false);
+            } else {
+                mClearCacheButton.setEnabled(true);
+                mClearCacheButton.setOnClickListener(this);
+            }
+        }
+        if (mAppControlRestricted) {
+            mClearCacheButton.setEnabled(false);
+            mClearDataButton.setEnabled(false);
+        }
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
+        refreshButtons();
+        refreshSizeInfo();
+        return true;
+    }
+
+    private void refreshButtons() {
+        if (!mMoveInProgress) {
+            initMoveButton();
+            initDataButtons();
+        } else {
+            mMoveAppButton.setText(R.string.moving);
+            mMoveAppButton.setEnabled(false);
+        }
+    }
+
+    private void initDataButtons() {
+        // If the app doesn't have its own space management UI
+        // And it's a system app that doesn't allow clearing user data or is an active admin
+        // Then disable the Clear Data button.
+        if (mAppEntry.info.manageSpaceActivityName == null
+                && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
+                        | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
+                        == ApplicationInfo.FLAG_SYSTEM
+                        || mDpm.packageHasActiveAdmins(mPackageName))) {
+            mClearDataButton.setText(R.string.clear_user_data_text);
+            mClearDataButton.setEnabled(false);
+            mCanClearData = false;
+        } else {
+            if (mAppEntry.info.manageSpaceActivityName != null) {
+                mClearDataButton.setText(R.string.manage_space_text);
+            } else {
+                mClearDataButton.setText(R.string.clear_user_data_text);
+            }
+            mClearDataButton.setOnClickListener(this);
+        }
+
+        if (mAppControlRestricted) {
+            mClearDataButton.setEnabled(false);
+        }
+    }
+
+    private void initMoveButton() {
+        if (Environment.isExternalStorageEmulated()) {
+            mMoveAppButton.setVisibility(View.INVISIBLE);
+            return;
+        }
+        boolean dataOnly = (mPackageInfo == null) && (mAppEntry != null);
+        boolean moveDisable = true;
+        if (dataOnly) {
+            mMoveAppButton.setText(R.string.move_app);
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+            mMoveAppButton.setText(R.string.move_app_to_internal);
+            // Always let apps move to internal storage from sdcard.
+            moveDisable = false;
+        } else {
+            mMoveAppButton.setText(R.string.move_app_to_sdcard);
+            mCanBeOnSdCardChecker.init();
+            moveDisable = !mCanBeOnSdCardChecker.check(mAppEntry.info);
+        }
+        if (moveDisable || mAppControlRestricted) {
+            mMoveAppButton.setEnabled(false);
+        } else {
+            mMoveAppButton.setOnClickListener(this);
+            mMoveAppButton.setEnabled(true);
+        }
+    }
+
+    /*
+     * Private method to initiate clearing user data when the user clicks the clear data
+     * button for a system package
+     */
+    private void initiateClearUserData() {
+        mClearDataButton.setEnabled(false);
+        // Invoke uninstall or clear user data based on sysPackage
+        String packageName = mAppEntry.info.packageName;
+        Log.i(TAG, "Clearing user data for package : " + packageName);
+        if (mClearDataObserver == null) {
+            mClearDataObserver = new ClearUserDataObserver();
+        }
+        ActivityManager am = (ActivityManager)
+                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        boolean res = am.clearApplicationUserData(packageName, mClearDataObserver);
+        if (!res) {
+            // Clearing data failed for some obscure reason. Just log error for now
+            Log.i(TAG, "Couldnt clear application user data for package:"+packageName);
+            showDialogInner(DLG_CANNOT_CLEAR_DATA, 0);
+        } else {
+            mClearDataButton.setText(R.string.recompute_size);
+        }
+    }
+
+    private void processMoveMsg(Message msg) {
+        int result = msg.arg1;
+        String packageName = mAppEntry.info.packageName;
+        // Refresh the button attributes.
+        mMoveInProgress = false;
+        if (result == PackageManager.MOVE_SUCCEEDED) {
+            Log.i(TAG, "Moved resources for " + packageName);
+            // Refresh size information again.
+            mState.requestSize(mAppEntry.info.packageName);
+        } else {
+            showDialogInner(DLG_MOVE_FAILED, result);
+        }
+        refreshUi();
+    }
+
+    /*
+     * Private method to handle clear message notification from observer when
+     * the async operation from PackageManager is complete
+     */
+    private void processClearMsg(Message msg) {
+        int result = msg.arg1;
+        String packageName = mAppEntry.info.packageName;
+        mClearDataButton.setText(R.string.clear_user_data_text);
+        if(result == OP_SUCCESSFUL) {
+            Log.i(TAG, "Cleared user data for package : "+packageName);
+            mState.requestSize(mAppEntry.info.packageName);
+        } else {
+            mClearDataButton.setEnabled(true);
+        }
+    }
+
+    private CharSequence getMoveErrMsg(int errCode) {
+        switch (errCode) {
+            case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
+                return getActivity().getString(R.string.insufficient_storage);
+            case PackageManager.MOVE_FAILED_DOESNT_EXIST:
+                return getActivity().getString(R.string.does_not_exist);
+            case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
+                return getActivity().getString(R.string.app_forward_locked);
+            case PackageManager.MOVE_FAILED_INVALID_LOCATION:
+                return getActivity().getString(R.string.invalid_location);
+            case PackageManager.MOVE_FAILED_SYSTEM_PACKAGE:
+                return getActivity().getString(R.string.system_package);
+            case PackageManager.MOVE_FAILED_INTERNAL_ERROR:
+                return "";
+        }
+        return "";
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        switch (id) {
+            case DLG_CLEAR_DATA:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.clear_data_dlg_title))
+                        .setMessage(getActivity().getText(R.string.clear_data_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Clear user data here
+                                initiateClearUserData();
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case DLG_CANNOT_CLEAR_DATA:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
+                        .setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
+                        .setNeutralButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                mClearDataButton.setEnabled(false);
+                                //force to recompute changed value
+                                setIntentAndFinish(false, false);
+                            }
+                        })
+                        .create();
+            case DLG_MOVE_FAILED:
+                CharSequence msg = getActivity().getString(R.string.move_app_failed_dlg_text,
+                        getMoveErrMsg(errorCode));
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
+                        .setMessage(msg)
+                        .setNeutralButton(R.string.dlg_ok, null)
+                        .create();
+        }
+        return null;
+    }
+
+    @Override
+    public void onPackageSizeChanged(String packageName) {
+        if (packageName.equals(mAppEntry.info.packageName)) {
+            refreshSizeInfo();
+        }
+    }
+
+    private final Handler mHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            if (getView() == null) {
+                return;
+            }
+            switch (msg.what) {
+                case MSG_CLEAR_USER_DATA:
+                    processClearMsg(msg);
+                    break;
+                case MSG_CLEAR_CACHE:
+                    // Refresh size info
+                    mState.requestSize(mPackageName);
+                    break;
+                case MSG_PACKAGE_MOVE:
+                    processMoveMsg(msg);
+                    break;
+            }
+        }
+    };
+
+    public static CharSequence getSummary(AppEntry appEntry, Context context) {
+        if (appEntry.size == ApplicationsState.SIZE_INVALID
+                || appEntry.size == ApplicationsState.SIZE_UNKNOWN) {
+            return context.getText(R.string.computing_size);
+        } else {
+            CharSequence storageType = context.getString(
+                    (appEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0
+                    ? R.string.storage_type_external
+                    : R.string.storage_type_internal);
+            return context.getString(R.string.storage_summary_format,
+                    getSize(appEntry, context), storageType);
+        }
+    }
+
+    private static CharSequence getSize(AppEntry appEntry, Context context) {
+        long size = appEntry.size;
+        if (size == SIZE_INVALID) {
+            return context.getText(R.string.invalid_size_value);
+        }
+        return Formatter.formatFileSize(context, size);
+    }
+
+    class ClearCacheObserver extends IPackageDataObserver.Stub {
+        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
+            final Message msg = mHandler.obtainMessage(MSG_CLEAR_CACHE);
+            msg.arg1 = succeeded ? OP_SUCCESSFUL : OP_FAILED;
+            mHandler.sendMessage(msg);
+        }
+    }
+
+    class ClearUserDataObserver extends IPackageDataObserver.Stub {
+       public void onRemoveCompleted(final String packageName, final boolean succeeded) {
+           final Message msg = mHandler.obtainMessage(MSG_CLEAR_USER_DATA);
+           msg.arg1 = succeeded?OP_SUCCESSFUL:OP_FAILED;
+           mHandler.sendMessage(msg);
+        }
+    }
+
+    class PackageMoveObserver extends IPackageMoveObserver.Stub {
+        public void packageMoved(String packageName, int returnCode) throws RemoteException {
+            final Message msg = mHandler.obtainMessage(MSG_PACKAGE_MOVE);
+            msg.arg1 = returnCode;
+            mHandler.sendMessage(msg);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/applications/HeaderPreference.java b/src/com/android/settings/applications/HeaderPreference.java
new file mode 100644
index 0000000..57fe9f3
--- /dev/null
+++ b/src/com/android/settings/applications/HeaderPreference.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+public class HeaderPreference extends Preference {
+
+    private View mRootView;
+
+    public HeaderPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, com.android.internal.R.styleable.Preference, 0, 0);
+        int layoutResource = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
+                0);
+        if (layoutResource == 0) {
+            throw new IllegalArgumentException("HeaderPreference requires a layout to be defined");
+        }
+        // Need to create view now so that findViewById can be called immediately.
+        final View view = LayoutInflater.from(getContext())
+                .inflate(layoutResource, null, false);
+
+        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
+        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+        mRootView = view;
+    }
+
+    @Override
+    protected View onCreateView(ViewGroup parent) {
+        return mRootView;
+    }
+
+    public View findViewById(int id) {
+        return mRootView.findViewById(id);
+    }
+
+}
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3aa948d..d77d63f 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -16,74 +16,46 @@
 
 package com.android.settings.applications;
 
-import com.android.internal.telephony.ISms;
-import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.applications.ApplicationsState.AppEntry;
-
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.app.INotificationManager;
-import android.app.admin.DevicePolicyManager;
-import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageDataObserver;
-import android.content.pm.IPackageMoveObserver;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.hardware.usb.IUsbManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.UserHandle;
-import android.os.UserManager;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.format.Formatter;
-import android.text.style.BulletSpan;
-import android.util.Log;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.provider.Settings;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.notification.NotificationAppList;
+import com.android.settings.notification.NotificationAppList.AppRow;
+import com.android.settings.notification.NotificationAppList.Backend;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AppSecurityPermissions;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-import android.widget.TextView;
 
 /**
  * Activity to display application information from Settings. This activity presents
@@ -94,227 +66,48 @@
  * For non-system applications, there is no option to clear data. Instead there is an option to
  * uninstall the application.
  */
-public class InstalledAppDetails extends Fragment
-        implements View.OnClickListener, CompoundButton.OnCheckedChangeListener,
-        ApplicationsState.Callbacks {
-    private static final String TAG="InstalledAppDetails";
-    private static final boolean localLOGV = false;
-    
-    public static final String ARG_PACKAGE_NAME = "package";
-
-    private PackageManager mPm;
-    private UserManager mUserManager;
-    private IUsbManager mUsbManager;
-    private AppWidgetManager mAppWidgetManager;
-    private DevicePolicyManager mDpm;
-    private ISms mSmsManager;
-    private ApplicationsState mState;
-    private ApplicationsState.Session mSession;
-    private ApplicationsState.AppEntry mAppEntry;
-    private boolean mInitialized;
-    private boolean mShowUninstalled;
-    private PackageInfo mPackageInfo;
-    private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
-    private View mRootView;
-    private Button mUninstallButton;
-    private View mMoreControlButtons;
-    private Button mSpecialDisableButton;
-    private boolean mMoveInProgress = false;
-    private boolean mUpdatedSysApp = false;
-    private Button mActivitiesButton;
-    private View mScreenCompatSection;
-    private CheckBox mAskCompatibilityCB;
-    private CheckBox mEnableCompatibilityCB;
-    private boolean mCanClearData = true;
-    private boolean mAppControlRestricted = false;
-    private TextView mAppVersion;
-    private TextView mTotalSize;
-    private TextView mAppSize;
-    private TextView mDataSize;
-    private TextView mExternalCodeSize;
-    private TextView mExternalDataSize;
-    private ClearUserDataObserver mClearDataObserver;
-    // Views related to cache info
-    private TextView mCacheSize;
-    private Button mClearCacheButton;
-    private ClearCacheObserver mClearCacheObserver;
-    private Button mForceStopButton;
-    private Button mClearDataButton;
-    private Button mMoveAppButton;
-    private CompoundButton mNotificationSwitch;
-
-    private PackageMoveObserver mPackageMoveObserver;
-
-    private final HashSet<String> mHomePackages = new HashSet<String>();
-
-    private boolean mDisableAfterUninstall;
-
-    private boolean mHaveSizes = false;
-    private long mLastCodeSize = -1;
-    private long mLastDataSize = -1;
-    private long mLastExternalCodeSize = -1;
-    private long mLastExternalDataSize = -1;
-    private long mLastCacheSize = -1;
-    private long mLastTotalSize = -1;
-    
-    //internal constants used in Handler
-    private static final int OP_SUCCESSFUL = 1;
-    private static final int OP_FAILED = 2;
-    private static final int CLEAR_USER_DATA = 1;
-    private static final int CLEAR_CACHE = 3;
-    private static final int PACKAGE_MOVE = 4;
-    
-    // invalid size value used initially and also when size retrieval through PackageManager
-    // fails for whatever reason
-    private static final int SIZE_INVALID = -1;
-    
-    // Resource strings
-    private CharSequence mInvalidSizeStr;
-    private CharSequence mComputingStr;
-    
-    // Dialog identifiers used in showDialog
-    private static final int DLG_BASE = 0;
-    private static final int DLG_CLEAR_DATA = DLG_BASE + 1;
-    private static final int DLG_FACTORY_RESET = DLG_BASE + 2;
-    private static final int DLG_APP_NOT_FOUND = DLG_BASE + 3;
-    private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 4;
-    private static final int DLG_FORCE_STOP = DLG_BASE + 5;
-    private static final int DLG_MOVE_FAILED = DLG_BASE + 6;
-    private static final int DLG_DISABLE = DLG_BASE + 7;
-    private static final int DLG_DISABLE_NOTIFICATIONS = DLG_BASE + 8;
-    private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 9;
+public class InstalledAppDetails extends AppInfoBase
+        implements View.OnClickListener, OnPreferenceClickListener {
 
     // Menu identifiers
     public static final int UNINSTALL_ALL_USERS_MENU = 1;
 
     // Result code identifiers
-    public static final int REQUEST_UNINSTALL = 1;
-    public static final int REQUEST_MANAGE_SPACE = 2;
+    public static final int REQUEST_UNINSTALL = 0;
+    private static final int SUB_INFO_FRAGMENT = 1;
 
-    private Handler mHandler = new Handler() {
-        public void handleMessage(Message msg) {
-            // If the fragment is gone, don't process any more messages.
-            if (getView() == null) {
-                return;
-            }
-            switch (msg.what) {
-                case CLEAR_USER_DATA:
-                    processClearMsg(msg);
-                    break;
-                case CLEAR_CACHE:
-                    // Refresh size info
-                    mState.requestSize(mAppEntry.info.packageName);
-                    break;
-                case PACKAGE_MOVE:
-                    processMoveMsg(msg);
-                    break;
-                default:
-                    break;
-            }
-        }
-    };
-    
-    class ClearUserDataObserver extends IPackageDataObserver.Stub {
-       public void onRemoveCompleted(final String packageName, final boolean succeeded) {
-           final Message msg = mHandler.obtainMessage(CLEAR_USER_DATA);
-           msg.arg1 = succeeded?OP_SUCCESSFUL:OP_FAILED;
-           mHandler.sendMessage(msg);
-        }
-    }
-    
-    class ClearCacheObserver extends IPackageDataObserver.Stub {
-        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
-            final Message msg = mHandler.obtainMessage(CLEAR_CACHE);
-            msg.arg1 = succeeded ? OP_SUCCESSFUL:OP_FAILED;
-            mHandler.sendMessage(msg);
-         }
-     }
+    private static final int DLG_FORCE_STOP = DLG_BASE + 1;
+    private static final int DLG_DISABLE = DLG_BASE + 2;
+    private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 3;
+    private static final int DLG_FACTORY_RESET = DLG_BASE + 4;
 
-    class PackageMoveObserver extends IPackageMoveObserver.Stub {
-        public void packageMoved(String packageName, int returnCode) throws RemoteException {
-            final Message msg = mHandler.obtainMessage(PACKAGE_MOVE);
-            msg.arg1 = returnCode;
-            mHandler.sendMessage(msg);
-        }
-    }
-    
-    private String getSizeStr(long size) {
-        if (size == SIZE_INVALID) {
-            return mInvalidSizeStr.toString();
-        }
-        return Formatter.formatFileSize(getActivity(), size);
-    }
-    
-    private void initDataButtons() {
-        // If the app doesn't have its own space management UI
-        // And it's a system app that doesn't allow clearing user data or is an active admin
-        // Then disable the Clear Data button.
-        if (mAppEntry.info.manageSpaceActivityName == null
-                && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
-                        | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
-                        == ApplicationInfo.FLAG_SYSTEM
-                        || mDpm.packageHasActiveAdmins(mPackageInfo.packageName))) {
-            mClearDataButton.setText(R.string.clear_user_data_text);
-            mClearDataButton.setEnabled(false);
-            mCanClearData = false;
-        } else {
-            if (mAppEntry.info.manageSpaceActivityName != null) {
-                mClearDataButton.setText(R.string.manage_space_text);
-            } else {
-                mClearDataButton.setText(R.string.clear_user_data_text);
-            }
-            mClearDataButton.setOnClickListener(this);
-        }
+    private static final String KEY_HEADER = "header_view";
+    private static final String KEY_NOTIFICATION = "notification_settings";
+    private static final String KEY_STORAGE = "storage_settings";
+    private static final String KEY_PERMISSION = "permission_settings";
+    private static final String KEY_DATA = "data_settings";
+    private static final String KEY_LAUNCH = "preferred_settings";
 
-        if (mAppControlRestricted) {
-            mClearDataButton.setEnabled(false);
-        }
-    }
+    private final HashSet<String> mHomePackages = new HashSet<String>();
 
-    private CharSequence getMoveErrMsg(int errCode) {
-        switch (errCode) {
-            case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
-                return getActivity().getString(R.string.insufficient_storage);
-            case PackageManager.MOVE_FAILED_DOESNT_EXIST:
-                return getActivity().getString(R.string.does_not_exist);
-            case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
-                return getActivity().getString(R.string.app_forward_locked);
-            case PackageManager.MOVE_FAILED_INVALID_LOCATION:
-                return getActivity().getString(R.string.invalid_location);
-            case PackageManager.MOVE_FAILED_SYSTEM_PACKAGE:
-                return getActivity().getString(R.string.system_package);
-            case PackageManager.MOVE_FAILED_INTERNAL_ERROR:
-                return "";
-        }
-        return "";
-    }
+    private boolean mInitialized;
+    private boolean mShowUninstalled;
+    private HeaderPreference mHeader;
+    private Button mUninstallButton;
+    private View mMoreControlButtons;
+    private Button mSpecialDisableButton;
+    private boolean mUpdatedSysApp = false;
+    private TextView mAppVersion;
+    private Button mForceStopButton;
+    private Preference mNotificationPreference;
+    private Preference mStoragePreference;
+    private Preference mPermissionsPreference;
+    private Preference mLaunchPreference;
+    private Preference mDataPreference;
 
-    private void initMoveButton() {
-        if (Environment.isExternalStorageEmulated()) {
-            mMoveAppButton.setVisibility(View.INVISIBLE);
-            return;
-        }
-        boolean dataOnly = false;
-        dataOnly = (mPackageInfo == null) && (mAppEntry != null);
-        boolean moveDisable = true;
-        if (dataOnly) {
-            mMoveAppButton.setText(R.string.move_app);
-        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
-            mMoveAppButton.setText(R.string.move_app_to_internal);
-            // Always let apps move to internal storage from sdcard.
-            moveDisable = false;
-        } else {
-            mMoveAppButton.setText(R.string.move_app_to_sdcard);
-            mCanBeOnSdCardChecker.init();
-            moveDisable = !mCanBeOnSdCardChecker.check(mAppEntry.info);
-        }
-        if (moveDisable || mAppControlRestricted) {
-            mMoveAppButton.setEnabled(false);
-        } else {
-            mMoveAppButton.setOnClickListener(this);
-            mMoveAppButton.setEnabled(true);
-        }
-    }
+    private boolean mDisableAfterUninstall;
+    // Used for updating notification preference.
+    private final Backend mBackend = new Backend();
 
     private boolean handleDisableable(Button button) {
         boolean disableable = false;
@@ -407,108 +200,48 @@
         }
     }
 
-    private void initNotificationButton() {
-        INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        boolean enabled = true; // default on
-        try {
-            enabled = nm.areNotificationsEnabledForPackage(mAppEntry.info.packageName,
-                    mAppEntry.info.uid);
-        } catch (android.os.RemoteException ex) {
-            // this does not bode well
-        }
-        mNotificationSwitch.setChecked(enabled);
-        if (Utils.isSystemPackage(mPm, mPackageInfo)) {
-            mNotificationSwitch.setEnabled(false);
-        } else if ((mPackageInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
-            // App is not installed on the current user
-            mNotificationSwitch.setEnabled(false);
-        } else {
-            mNotificationSwitch.setEnabled(true);
-            mNotificationSwitch.setOnCheckedChangeListener(this);
-        }
-    }
-
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mState = ApplicationsState.getInstance(getActivity().getApplication());
-        mSession = mState.newSession(this);
-        mPm = getActivity().getPackageManager();
-        mUserManager = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
-        IBinder b = ServiceManager.getService(Context.USB_SERVICE);
-        mUsbManager = IUsbManager.Stub.asInterface(b);
-        mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
-        mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
-        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
-
-        mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
-
-        // Need to make sure we have loaded applications at this point.
-        mSession.resume();
-
-        retrieveAppEntry();
-
         setHasOptionsMenu(true);
+        addPreferencesFromResource(R.xml.installed_app_details);
     }
 
-    @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.installed_app_details, container, false);
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        handleHeader();
 
-        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
-        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+        mNotificationPreference = findPreference(KEY_NOTIFICATION);
+        mNotificationPreference.setOnPreferenceClickListener(this);
+        mStoragePreference = findPreference(KEY_STORAGE);
+        mStoragePreference.setOnPreferenceClickListener(this);
+        mPermissionsPreference = findPreference(KEY_PERMISSION);
+        mPermissionsPreference.setOnPreferenceClickListener(this);
+        mLaunchPreference = findPreference(KEY_LAUNCH);
+        mLaunchPreference.setOnPreferenceClickListener(this);
+        mDataPreference = findPreference(KEY_DATA);
+        mDataPreference.setOnPreferenceClickListener(this);
+        // Data isn't ready, lets just pull it for now.
+        getPreferenceScreen().removePreference(mDataPreference);
+    }
 
-        mRootView = view;
-        mComputingStr = getActivity().getText(R.string.computing_size);
-        
-        // Set default values on sizes
-        mTotalSize = (TextView) view.findViewById(R.id.total_size_text);
-        mAppSize = (TextView) view.findViewById(R.id.application_size_text);
-        mDataSize = (TextView) view.findViewById(R.id.data_size_text);
-        mExternalCodeSize = (TextView) view.findViewById(R.id.external_code_size_text);
-        mExternalDataSize = (TextView) view.findViewById(R.id.external_data_size_text);
-
-        if (Environment.isExternalStorageEmulated()) {
-            ((View)mExternalCodeSize.getParent()).setVisibility(View.GONE);
-            ((View)mExternalDataSize.getParent()).setVisibility(View.GONE);
-        }
+    private void handleHeader() {
+        mHeader = (HeaderPreference) findPreference(KEY_HEADER);
 
         // Get Control button panel
-        View btnPanel = view.findViewById(R.id.control_buttons_panel);
-        mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
+        View btnPanel = mHeader.findViewById(R.id.control_buttons_panel);
+        mForceStopButton = (Button) btnPanel.findViewById(R.id.right_button);
         mForceStopButton.setText(R.string.force_stop);
-        mUninstallButton = (Button) btnPanel.findViewById(R.id.right_button);
+        mUninstallButton = (Button) btnPanel.findViewById(R.id.left_button);
         mForceStopButton.setEnabled(false);
-        
+
         // Get More Control button panel
-        mMoreControlButtons = view.findViewById(R.id.more_control_buttons_panel);
-        mMoreControlButtons.findViewById(R.id.left_button).setVisibility(View.INVISIBLE);
-        mSpecialDisableButton = (Button) mMoreControlButtons.findViewById(R.id.right_button);
+        mMoreControlButtons = mHeader.findViewById(R.id.more_control_buttons_panel);
+        mMoreControlButtons.findViewById(R.id.right_button).setVisibility(View.INVISIBLE);
+        mSpecialDisableButton = (Button) mMoreControlButtons.findViewById(R.id.left_button);
         mMoreControlButtons.setVisibility(View.GONE);
-        
-        // Initialize clear data and move install location buttons
-        View data_buttons_panel = view.findViewById(R.id.data_buttons_panel);
-        mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
-        mMoveAppButton = (Button) data_buttons_panel.findViewById(R.id.left_button);
-        
-        // Cache section
-        mCacheSize = (TextView) view.findViewById(R.id.cache_size_text);
-        mClearCacheButton = (Button) view.findViewById(R.id.clear_cache_button);
-
-        mActivitiesButton = (Button) view.findViewById(R.id.clear_activities_button);
-        
-        // Screen compatibility control
-        mScreenCompatSection = view.findViewById(R.id.screen_compatibility_section);
-        mAskCompatibilityCB = (CheckBox) view.findViewById(R.id.ask_compatibility_cb);
-        mEnableCompatibilityCB = (CheckBox) view.findViewById(R.id.enable_compatibility_cb);
-        
-        mNotificationSwitch = (CompoundButton) view.findViewById(R.id.notification_switch);
-
-        return view;
     }
 
     @Override
@@ -572,8 +305,9 @@
 
     // Utility method to set application label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
-        final View appSnippet = mRootView.findViewById(R.id.app_snippet);
-        appSnippet.setPaddingRelative(0, appSnippet.getPaddingTop(), 0, appSnippet.getPaddingBottom());
+        final View appSnippet = mHeader.findViewById(R.id.app_snippet);
+        appSnippet.setPaddingRelative(0, appSnippet.getPaddingTop(), 0,
+                appSnippet.getPaddingBottom());
 
         ImageView icon = (ImageView) appSnippet.findViewById(R.id.app_icon);
         mState.ensureIcon(mAppEntry);
@@ -593,86 +327,6 @@
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        
-        mAppControlRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL);
-        mSession.resume();
-        if (!refreshUi()) {
-            setIntentAndFinish(true, true);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mSession.pause();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mSession.release();
-    }
-
-    @Override
-    public void onAllSizesComputed() {
-    }
-
-    @Override
-    public void onPackageIconChanged() {
-    }
-
-    @Override
-    public void onPackageListChanged() {
-        refreshUi();
-    }
-
-    @Override
-    public void onRebuildComplete(ArrayList<AppEntry> apps) {
-    }
-
-    @Override
-    public void onPackageSizeChanged(String packageName) {
-        if (packageName.equals(mAppEntry.info.packageName)) {
-            refreshSizeInfo();
-        }
-    }
-
-    @Override
-    public void onRunningStateChanged(boolean running) {
-    }
-
-    private String retrieveAppEntry() {
-        final Bundle args = getArguments();
-        String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
-        if (packageName == null) {
-            Intent intent = (args == null) ?
-                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
-            if (intent != null) {
-                packageName = intent.getData().getSchemeSpecificPart();
-            }
-        }
-        mAppEntry = mState.getEntry(packageName);
-        if (mAppEntry != null) {
-            // Get application info again to refresh changed properties of application
-            try {
-                mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
-                        PackageManager.GET_DISABLED_COMPONENTS |
-                        PackageManager.GET_UNINSTALLED_PACKAGES |
-                        PackageManager.GET_SIGNATURES);
-            } catch (NameNotFoundException e) {
-                Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
-            }
-        } else {
-            Log.w(TAG, "Missing AppEntry; maybe reinstalling?");
-            mPackageInfo = null;
-        }
-
-        return packageName;
-    }
-
     private boolean signaturesMatch(String pkg1, String pkg2) {
         if (pkg1 != null && pkg2 != null) {
             try {
@@ -688,12 +342,9 @@
         return false;
     }
 
-    private boolean refreshUi() {
-        if (mMoveInProgress) {
-            return true;
-        }
-        final String packageName = retrieveAppEntry();
-
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
         if (mAppEntry == null) {
             return false; // onCreate must have failed, make sure to exit
         }
@@ -721,175 +372,18 @@
             }
         }
 
-        // Get list of preferred activities
-        List<ComponentName> prefActList = new ArrayList<ComponentName>();
-        
-        // Intent list cannot be null. so pass empty list
-        List<IntentFilter> intentList = new ArrayList<IntentFilter>();
-        mPm.getPreferredActivities(intentList, prefActList, packageName);
-        if (localLOGV)
-            Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
-        boolean hasUsbDefaults = false;
-        try {
-            if (mUsbManager != null) {
-                hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "mUsbManager.hasDefaults", e);
-        }
-        boolean hasBindAppWidgetPermission =
-                mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);
-
-        TextView autoLaunchTitleView = (TextView) mRootView.findViewById(R.id.auto_launch_title);
-        TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
-        boolean autoLaunchEnabled = prefActList.size() > 0 || hasUsbDefaults;
-        if (!autoLaunchEnabled && !hasBindAppWidgetPermission) {
-            resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
-        } else {
-            boolean useBullets = hasBindAppWidgetPermission && autoLaunchEnabled;
-
-            if (hasBindAppWidgetPermission) {
-                autoLaunchTitleView.setText(R.string.auto_launch_label_generic);
-            } else {
-                autoLaunchTitleView.setText(R.string.auto_launch_label);
-            }
-
-            CharSequence text = null;
-            int bulletIndent = getResources()
-                    .getDimensionPixelSize(R.dimen.installed_app_details_bullet_offset);
-            if (autoLaunchEnabled) {
-                CharSequence autoLaunchEnableText = getText(R.string.auto_launch_enable_text);
-                SpannableString s = new SpannableString(autoLaunchEnableText);
-                if (useBullets) {
-                    s.setSpan(new BulletSpan(bulletIndent), 0, autoLaunchEnableText.length(), 0);
-                }
-                text = (text == null) ?
-                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
-            }
-            if (hasBindAppWidgetPermission) {
-                CharSequence alwaysAllowBindAppWidgetsText =
-                        getText(R.string.always_allow_bind_appwidgets_text);
-                SpannableString s = new SpannableString(alwaysAllowBindAppWidgetsText);
-                if (useBullets) {
-                    s.setSpan(new BulletSpan(bulletIndent),
-                            0, alwaysAllowBindAppWidgetsText.length(), 0);
-                }
-                text = (text == null) ?
-                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
-            }
-            autoLaunchView.setText(text);
-            mActivitiesButton.setEnabled(true);
-            mActivitiesButton.setOnClickListener(this);
-        }
-
-        // Screen compatibility section.
-        ActivityManager am = (ActivityManager)
-                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-        int compatMode = am.getPackageScreenCompatMode(packageName);
-        // For now these are always off; this is the old UI model which we
-        // are no longer using.
-        if (false && (compatMode == ActivityManager.COMPAT_MODE_DISABLED
-                || compatMode == ActivityManager.COMPAT_MODE_ENABLED)) {
-            mScreenCompatSection.setVisibility(View.VISIBLE);
-            mAskCompatibilityCB.setChecked(am.getPackageAskScreenCompat(packageName));
-            mAskCompatibilityCB.setOnCheckedChangeListener(this);
-            mEnableCompatibilityCB.setChecked(compatMode == ActivityManager.COMPAT_MODE_ENABLED);
-            mEnableCompatibilityCB.setOnCheckedChangeListener(this);
-        } else {
-            mScreenCompatSection.setVisibility(View.GONE);
-        }
-
-        // Security permissions section
-        LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
-        AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), packageName);
-        int premiumSmsPermission = getPremiumSmsPermission(packageName);
-        // Premium SMS permission implies the app also has SEND_SMS permission, so the original
-        // application permissions list doesn't have to be shown/hidden separately. The premium
-        // SMS subsection should only be visible if the app has tried to send to a premium SMS.
-        if (asp.getPermissionCount() > 0
-                || premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
-            permsView.setVisibility(View.VISIBLE);
-        } else {
-            permsView.setVisibility(View.GONE);
-        }
-        // Premium SMS permission subsection
-        TextView securityBillingDesc = (TextView) permsView.findViewById(
-                R.id.security_settings_billing_desc);
-        LinearLayout securityBillingList = (LinearLayout) permsView.findViewById(
-                R.id.security_settings_billing_list);
-        if (premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
-            // Show the premium SMS permission selector
-            securityBillingDesc.setVisibility(View.VISIBLE);
-            securityBillingList.setVisibility(View.VISIBLE);
-            Spinner spinner = (Spinner) permsView.findViewById(
-                    R.id.security_settings_premium_sms_list);
-            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
-                    R.array.security_settings_premium_sms_values,
-                    android.R.layout.simple_spinner_item);
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            spinner.setAdapter(adapter);
-            // List items are in the same order as SmsUsageMonitor constants, offset by 1.
-            spinner.setSelection(premiumSmsPermission - 1);
-            spinner.setOnItemSelectedListener(new PremiumSmsSelectionListener(
-                    packageName, mSmsManager));
-        } else {
-            // Hide the premium SMS permission selector
-            securityBillingDesc.setVisibility(View.GONE);
-            securityBillingList.setVisibility(View.GONE);
-        }
-        // App permissions subsection
-        if (asp.getPermissionCount() > 0) {
-            // Make the security sections header visible
-            LinearLayout securityList = (LinearLayout) permsView.findViewById(
-                    R.id.security_settings_list);
-            securityList.removeAllViews();
-            securityList.addView(asp.getPermissionsViewWithRevokeButtons());
-            // If this app is running under a shared user ID with other apps,
-            // update the description to explain this.
-            String[] packages = mPm.getPackagesForUid(mPackageInfo.applicationInfo.uid);
-            if (packages != null && packages.length > 1) {
-                ArrayList<CharSequence> pnames = new ArrayList<CharSequence>();
-                for (int i=0; i<packages.length; i++) {
-                    String pkg = packages[i];
-                    if (mPackageInfo.packageName.equals(pkg)) {
-                        continue;
-                    }
-                    try {
-                        ApplicationInfo ainfo = mPm.getApplicationInfo(pkg, 0);
-                        pnames.add(ainfo.loadLabel(mPm));
-                    } catch (PackageManager.NameNotFoundException e) {
-                    }
-                }
-                final int N = pnames.size();
-                if (N > 0) {
-                    final Resources res = getActivity().getResources();
-                    String appListStr;
-                    if (N == 1) {
-                        appListStr = pnames.get(0).toString();
-                    } else if (N == 2) {
-                        appListStr = res.getString(R.string.join_two_items, pnames.get(0),
-                                pnames.get(1));
-                    } else {
-                        appListStr = pnames.get(N-2).toString();
-                        for (int i=N-3; i>=0; i--) {
-                            appListStr = res.getString(i == 0 ? R.string.join_many_items_first
-                                    : R.string.join_many_items_middle, pnames.get(i), appListStr);
-                        }
-                        appListStr = res.getString(R.string.join_many_items_last,
-                                appListStr, pnames.get(N-1));
-                    }
-                    TextView descr = (TextView) mRootView.findViewById(
-                            R.id.security_settings_desc);
-                    descr.setText(res.getString(R.string.security_settings_desc_multi,
-                            mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
-                }
-            }
-        }
-        
         checkForceStop();
         setAppLabelAndIcon(mPackageInfo);
-        refreshButtons();
-        refreshSizeInfo();
+        initUninstallButtons();
+
+        // Update the preference summaries.
+        Activity context = getActivity();
+        mStoragePreference.setSummary(AppStorageSettings.getSummary(mAppEntry, context));
+        mPermissionsPreference.setSummary(AppPermissionSettings.getSummary(mAppEntry, context));
+        mLaunchPreference.setSummary(AppLaunchSettings.getSummary(mAppEntry, mUsbManager,
+                mPm, context));
+        mNotificationPreference.setSummary(getNotificationSummary(mAppEntry, context,
+                mBackend));
 
         if (!mInitialized) {
             // First time init: are we displaying an uninstalled app?
@@ -899,7 +393,7 @@
             // All other times: if the app no longer exists then we want
             // to go away.
             try {
-                ApplicationInfo ainfo = getActivity().getPackageManager().getApplicationInfo(
+                ApplicationInfo ainfo = context.getPackageManager().getApplicationInfo(
                         mAppEntry.info.packageName, PackageManager.GET_UNINSTALLED_PACKAGES
                         | PackageManager.GET_DISABLED_COMPONENTS);
                 if (!mShowUninstalled) {
@@ -916,344 +410,63 @@
         return true;
     }
 
-    private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
-        private final String mPackageName;
-        private final ISms mSmsManager;
-
-        PremiumSmsSelectionListener(String packageName, ISms smsManager) {
-            mPackageName = packageName;
-            mSmsManager = smsManager;
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        switch (id) {
+            case DLG_DISABLE:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.app_disable_dlg_title))
+                        .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Disable the app
+                                new DisableChanger(InstalledAppDetails.this, mAppEntry.info,
+                                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
+                                .execute((Object)null);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case DLG_SPECIAL_DISABLE:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.app_special_disable_dlg_title))
+                        .setMessage(getActivity().getText(R.string.app_special_disable_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Clear user data here
+                                uninstallPkg(mAppEntry.info.packageName,
+                                        false, true);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case DLG_FORCE_STOP:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.force_stop_dlg_title))
+                        .setMessage(getActivity().getText(R.string.force_stop_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Force stop
+                                forceStopPackage(mAppEntry.info.packageName);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case DLG_FACTORY_RESET:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title))
+                        .setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Clear user data here
+                                uninstallPkg(mAppEntry.info.packageName,
+                                        false, false);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
         }
-
-        @Override
-        public void onItemSelected(AdapterView<?> parent, View view, int position,
-                long id) {
-            if (position >= 0 && position < 3) {
-                Log.d(TAG, "Selected premium SMS policy " + position);
-                setPremiumSmsPermission(mPackageName, (position + 1));
-            } else {
-                Log.e(TAG, "Error: unknown premium SMS policy " + position);
-            }
-        }
-
-        @Override
-        public void onNothingSelected(AdapterView<?> parent) {
-            // Ignored
-        }
-
-        private void setPremiumSmsPermission(String packageName, int permission) {
-            try {
-                if (mSmsManager != null) {
-                    mSmsManager.setPremiumSmsPermission(packageName, permission);
-                }
-            } catch (RemoteException ex) {
-                // ignored
-            }
-        }
-    }
-    
-    private void resetLaunchDefaultsUi(TextView title, TextView autoLaunchView) {
-        title.setText(R.string.auto_launch_label);
-        autoLaunchView.setText(R.string.auto_launch_disable_text);
-        // Disable clear activities button
-        mActivitiesButton.setEnabled(false);
-    }
-
-    private void setIntentAndFinish(boolean finish, boolean appChanged) {
-        if(localLOGV) Log.i(TAG, "appChanged="+appChanged);
-        Intent intent = new Intent();
-        intent.putExtra(ManageApplications.APP_CHG, appChanged);
-        SettingsActivity sa = (SettingsActivity)getActivity();
-        sa.finishPreferencePanel(this, Activity.RESULT_OK, intent);
-    }
-    
-    private void refreshSizeInfo() {
-        if (mAppEntry.size == ApplicationsState.SIZE_INVALID
-                || mAppEntry.size == ApplicationsState.SIZE_UNKNOWN) {
-            mLastCodeSize = mLastDataSize = mLastCacheSize = mLastTotalSize = -1;
-            if (!mHaveSizes) {
-                mAppSize.setText(mComputingStr);
-                mDataSize.setText(mComputingStr);
-                mCacheSize.setText(mComputingStr);
-                mTotalSize.setText(mComputingStr);
-            }
-            mClearDataButton.setEnabled(false);
-            mClearCacheButton.setEnabled(false);
-            
-        } else {
-            mHaveSizes = true;
-            long codeSize = mAppEntry.codeSize;
-            long dataSize = mAppEntry.dataSize;
-            if (Environment.isExternalStorageEmulated()) {
-                codeSize += mAppEntry.externalCodeSize;
-                dataSize +=  mAppEntry.externalDataSize;
-            } else {
-                if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
-                    mLastExternalCodeSize = mAppEntry.externalCodeSize;
-                    mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
-                }
-                if (mLastExternalDataSize !=  mAppEntry.externalDataSize) {
-                    mLastExternalDataSize =  mAppEntry.externalDataSize;
-                    mExternalDataSize.setText(getSizeStr( mAppEntry.externalDataSize));
-                }
-            }
-            if (mLastCodeSize != codeSize) {
-                mLastCodeSize = codeSize;
-                mAppSize.setText(getSizeStr(codeSize));
-            }
-            if (mLastDataSize != dataSize) {
-                mLastDataSize = dataSize;
-                mDataSize.setText(getSizeStr(dataSize));
-            }
-            long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
-            if (mLastCacheSize != cacheSize) {
-                mLastCacheSize = cacheSize;
-                mCacheSize.setText(getSizeStr(cacheSize));
-            }
-            if (mLastTotalSize != mAppEntry.size) {
-                mLastTotalSize = mAppEntry.size;
-                mTotalSize.setText(getSizeStr(mAppEntry.size));
-            }
-            
-            if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
-                mClearDataButton.setEnabled(false);
-            } else {
-                mClearDataButton.setEnabled(true);
-                mClearDataButton.setOnClickListener(this);
-            }
-            if (cacheSize <= 0) {
-                mClearCacheButton.setEnabled(false);
-            } else {
-                mClearCacheButton.setEnabled(true);
-                mClearCacheButton.setOnClickListener(this);
-            }
-        }
-        if (mAppControlRestricted) {
-            mClearCacheButton.setEnabled(false);
-            mClearDataButton.setEnabled(false);
-        }
-    }
-    
-    /*
-     * Private method to handle clear message notification from observer when
-     * the async operation from PackageManager is complete
-     */
-    private void processClearMsg(Message msg) {
-        int result = msg.arg1;
-        String packageName = mAppEntry.info.packageName;
-        mClearDataButton.setText(R.string.clear_user_data_text);
-        if(result == OP_SUCCESSFUL) {
-            Log.i(TAG, "Cleared user data for package : "+packageName);
-            mState.requestSize(mAppEntry.info.packageName);
-        } else {
-            mClearDataButton.setEnabled(true);
-        }
-        checkForceStop();
-    }
-
-    private void refreshButtons() {
-        if (!mMoveInProgress) {
-            initUninstallButtons();
-            initDataButtons();
-            initMoveButton();
-            initNotificationButton();
-        } else {
-            mMoveAppButton.setText(R.string.moving);
-            mMoveAppButton.setEnabled(false);
-            mUninstallButton.setEnabled(false);
-            mSpecialDisableButton.setEnabled(false);
-        }
-    }
-
-    private void processMoveMsg(Message msg) {
-        int result = msg.arg1;
-        String packageName = mAppEntry.info.packageName;
-        // Refresh the button attributes.
-        mMoveInProgress = false;
-        if (result == PackageManager.MOVE_SUCCEEDED) {
-            Log.i(TAG, "Moved resources for " + packageName);
-            // Refresh size information again.
-            mState.requestSize(mAppEntry.info.packageName);
-        } else {
-            showDialogInner(DLG_MOVE_FAILED, result);
-        }
-        refreshUi();
-    }
-
-    /*
-     * Private method to initiate clearing user data when the user clicks the clear data 
-     * button for a system package
-     */
-    private  void initiateClearUserData() {
-        mClearDataButton.setEnabled(false);
-        // Invoke uninstall or clear user data based on sysPackage
-        String packageName = mAppEntry.info.packageName;
-        Log.i(TAG, "Clearing user data for package : " + packageName);
-        if (mClearDataObserver == null) {
-            mClearDataObserver = new ClearUserDataObserver();
-        }
-        ActivityManager am = (ActivityManager)
-                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-        boolean res = am.clearApplicationUserData(packageName, mClearDataObserver);
-        if (!res) {
-            // Clearing data failed for some obscure reason. Just log error for now
-            Log.i(TAG, "Couldnt clear application user data for package:"+packageName);
-            showDialogInner(DLG_CANNOT_CLEAR_DATA, 0);
-        } else {
-            mClearDataButton.setText(R.string.recompute_size);
-        }
-    }
-    
-    private void showDialogInner(int id, int moveErrorCode) {
-        DialogFragment newFragment = MyAlertDialogFragment.newInstance(id, moveErrorCode);
-        newFragment.setTargetFragment(this, 0);
-        newFragment.show(getFragmentManager(), "dialog " + id);
-    }
-    
-    public static class MyAlertDialogFragment extends DialogFragment {
-
-        public static MyAlertDialogFragment newInstance(int id, int moveErrorCode) {
-            MyAlertDialogFragment frag = new MyAlertDialogFragment();
-            Bundle args = new Bundle();
-            args.putInt("id", id);
-            args.putInt("moveError", moveErrorCode);
-            frag.setArguments(args);
-            return frag;
-        }
-
-        InstalledAppDetails getOwner() {
-            return (InstalledAppDetails)getTargetFragment();
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            int id = getArguments().getInt("id");
-            int moveErrorCode = getArguments().getInt("moveError");
-            switch (id) {
-                case DLG_CLEAR_DATA:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.clear_data_dlg_title))
-                    .setMessage(getActivity().getText(R.string.clear_data_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Clear user data here
-                            getOwner().initiateClearUserData();
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_FACTORY_RESET:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Clear user data here
-                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName,
-                                    false, false);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_APP_NOT_FOUND:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_not_found_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_not_found_dlg_title))
-                    .setNeutralButton(getActivity().getText(R.string.dlg_ok),
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            //force to recompute changed value
-                            getOwner().setIntentAndFinish(true, true);
-                        }
-                    })
-                    .create();
-                case DLG_CANNOT_CLEAR_DATA:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
-                    .setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
-                    .setNeutralButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            getOwner().mClearDataButton.setEnabled(false);
-                            //force to recompute changed value
-                            getOwner().setIntentAndFinish(false, false);
-                        }
-                    })
-                    .create();
-                case DLG_FORCE_STOP:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.force_stop_dlg_title))
-                    .setMessage(getActivity().getText(R.string.force_stop_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                        new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Force stop
-                            getOwner().forceStopPackage(getOwner().mAppEntry.info.packageName);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_MOVE_FAILED:
-                    CharSequence msg = getActivity().getString(R.string.move_app_failed_dlg_text,
-                            getOwner().getMoveErrMsg(moveErrorCode));
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
-                    .setMessage(msg)
-                    .setNeutralButton(R.string.dlg_ok, null)
-                    .create();
-                case DLG_DISABLE:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_disable_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                        new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Disable the app
-                            new DisableChanger(getOwner(), getOwner().mAppEntry.info,
-                                    PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
-                            .execute((Object)null);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-                case DLG_DISABLE_NOTIFICATIONS:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_disable_notifications_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_disable_notifications_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                        new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Disable the package's notifications
-                            getOwner().setNotificationsEnabled(false);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel,
-                        new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Re-enable the checkbox
-                            getOwner().mNotificationSwitch.setChecked(true);
-                        }
-                    })
-                    .create();
-                case DLG_SPECIAL_DISABLE:
-                    return new AlertDialog.Builder(getActivity())
-                    .setTitle(getActivity().getText(R.string.app_special_disable_dlg_title))
-                    .setMessage(getActivity().getText(R.string.app_special_disable_dlg_text))
-                    .setPositiveButton(R.string.dlg_ok,
-                            new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Clear user data here
-                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName,
-                                    false, true);
-                        }
-                    })
-                    .setNegativeButton(R.string.dlg_cancel, null)
-                    .create();
-            }
-            throw new IllegalArgumentException("unknown id " + id);
-        }
+        return null;
     }
 
     private void uninstallPkg(String packageName, boolean allUsers, boolean andDisable) {
@@ -1277,13 +490,6 @@
         checkForceStop();
     }
 
-    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
-        }
-    };
-
     private void updateForceStopButton(boolean enabled) {
         if (mAppControlRestricted) {
             mForceStopButton.setEnabled(false);
@@ -1292,7 +498,7 @@
             mForceStopButton.setOnClickListener(InstalledAppDetails.this);
         }
     }
-    
+
     private void checkForceStop() {
         if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             // User can't force stop device admin.
@@ -1312,47 +518,21 @@
         }
     }
 
-    static class DisableChanger extends AsyncTask<Object, Object, Object> {
-        final PackageManager mPm;
-        final WeakReference<InstalledAppDetails> mActivity;
-        final ApplicationInfo mInfo;
-        final int mState;
+    private void startAppInfoFragment(Class<? extends AppInfoBase> fragment, CharSequence title) {
+        // start new fragment to display extended information
+        Bundle args = new Bundle();
+        args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mAppEntry.info.packageName);
 
-        DisableChanger(InstalledAppDetails activity, ApplicationInfo info, int state) {
-            mPm = activity.mPm;
-            mActivity = new WeakReference<InstalledAppDetails>(activity);
-            mInfo = info;
-            mState = state;
-        }
-
-        @Override
-        protected Object doInBackground(Object... params) {
-            mPm.setApplicationEnabledSetting(mInfo.packageName, mState, 0);
-            return null;
-        }
+        SettingsActivity sa = (SettingsActivity) getActivity();
+        sa.startPreferencePanel(fragment.getName(), args, -1, title, this, SUB_INFO_FRAGMENT);
     }
 
-    private void setNotificationsEnabled(boolean enabled) {
-        String packageName = mAppEntry.info.packageName;
-        INotificationManager nm = INotificationManager.Stub.asInterface(
-                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-        try {
-            final boolean enable = mNotificationSwitch.isChecked();
-            nm.setNotificationsEnabledForPackage(packageName, mAppEntry.info.uid, enabled);
-        } catch (android.os.RemoteException ex) {
-            mNotificationSwitch.setChecked(!enabled); // revert
-        }
-    }
-
-    private int getPremiumSmsPermission(String packageName) {
-        try {
-            if (mSmsManager != null) {
-                return mSmsManager.getPremiumSmsPermission(packageName);
-            }
-        } catch (RemoteException ex) {
-            // ignored
-        }
-        return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+    private void startNotifications() {
+        // start new fragment to display extended information
+        getActivity().startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, mAppEntry.info.packageName)
+                .putExtra(Settings.EXTRA_APP_UID, mAppEntry.info.uid));
     }
 
     /*
@@ -1381,69 +561,77 @@
             }
         } else if(v == mSpecialDisableButton) {
             showDialogInner(DLG_SPECIAL_DISABLE, 0);
-        } else if(v == mActivitiesButton) {
-            if (mUsbManager != null) {
-                mPm.clearPackagePreferredActivities(packageName);
-                try {
-                    mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
-                } catch (RemoteException e) {
-                    Log.e(TAG, "mUsbManager.clearDefaults", e);
-                }
-                mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
-                TextView autoLaunchTitleView =
-                        (TextView) mRootView.findViewById(R.id.auto_launch_title);
-                TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
-                resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
-            }
-        } else if(v == mClearDataButton) {
-            if (mAppEntry.info.manageSpaceActivityName != null) {
-                if (!Utils.isMonkeyRunning()) {
-                    Intent intent = new Intent(Intent.ACTION_DEFAULT);
-                    intent.setClassName(mAppEntry.info.packageName,
-                            mAppEntry.info.manageSpaceActivityName);
-                    startActivityForResult(intent, REQUEST_MANAGE_SPACE);
-                }
-            } else {
-                showDialogInner(DLG_CLEAR_DATA, 0);
-            }
-        } else if (v == mClearCacheButton) {
-            // Lazy initialization of observer
-            if (mClearCacheObserver == null) {
-                mClearCacheObserver = new ClearCacheObserver();
-            }
-            mPm.deleteApplicationCacheFiles(packageName, mClearCacheObserver);
         } else if (v == mForceStopButton) {
             showDialogInner(DLG_FORCE_STOP, 0);
             //forceStopPackage(mAppInfo.packageName);
-        } else if (v == mMoveAppButton) {
-            if (mPackageMoveObserver == null) {
-                mPackageMoveObserver = new PackageMoveObserver();
-            }
-            int moveFlags = (mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0 ?
-                    PackageManager.MOVE_INTERNAL : PackageManager.MOVE_EXTERNAL_MEDIA;
-            mMoveInProgress = true;
-            refreshButtons();
-            mPm.movePackage(mAppEntry.info.packageName, mPackageMoveObserver, moveFlags);
         }
     }
 
     @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        String packageName = mAppEntry.info.packageName;
-        ActivityManager am = (ActivityManager)
-                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-        if (buttonView == mAskCompatibilityCB) {
-            am.setPackageAskScreenCompat(packageName, isChecked);
-        } else if (buttonView == mEnableCompatibilityCB) {
-            am.setPackageScreenCompatMode(packageName, isChecked ?
-                    ActivityManager.COMPAT_MODE_ENABLED : ActivityManager.COMPAT_MODE_DISABLED);
-        } else if (buttonView == mNotificationSwitch) {
-            if (!isChecked) {
-                showDialogInner(DLG_DISABLE_NOTIFICATIONS, 0);
-            } else {
-                setNotificationsEnabled(true);
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference == mStoragePreference) {
+            startAppInfoFragment(AppStorageSettings.class, mStoragePreference.getTitle());
+        } else if (preference == mNotificationPreference) {
+            startNotifications();
+        } else if (preference == mPermissionsPreference) {
+            startAppInfoFragment(AppPermissionSettings.class, mPermissionsPreference.getTitle());
+        } else if (preference == mLaunchPreference) {
+            startAppInfoFragment(AppLaunchSettings.class, mLaunchPreference.getTitle());
+        } else if (preference == mDataPreference) {
+            // Not yet.
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    public static CharSequence getNotificationSummary(AppEntry appEntry, Context context) {
+        return getNotificationSummary(appEntry, context, new Backend());
+    }
+
+    public static CharSequence getNotificationSummary(AppEntry appEntry, Context context,
+            Backend backend) {
+        AppRow appRow = NotificationAppList.loadAppRow(context.getPackageManager(), appEntry.info,
+                backend);
+        if (appRow.banned) {
+            return context.getString(R.string.notifications_disabled);
+        } else if (appRow.priority) {
+            if (appRow.sensitive) {
+                return context.getString(R.string.notifications_priority_sensitive);
             }
+            return context.getString(R.string.notifications_priority);
+        } else if (appRow.sensitive) {
+            return context.getString(R.string.notifications_sensitive);
+        }
+        return context.getString(R.string.notifications_enabled);
+    }
+
+    static class DisableChanger extends AsyncTask<Object, Object, Object> {
+        final PackageManager mPm;
+        final WeakReference<InstalledAppDetails> mActivity;
+        final ApplicationInfo mInfo;
+        final int mState;
+
+        DisableChanger(InstalledAppDetails activity, ApplicationInfo info, int state) {
+            mPm = activity.mPm;
+            mActivity = new WeakReference<InstalledAppDetails>(activity);
+            mInfo = info;
+            mState = state;
+        }
+
+        @Override
+        protected Object doInBackground(Object... params) {
+            mPm.setApplicationEnabledSetting(mInfo.packageName, mState, 0);
+            return null;
         }
     }
+
+    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
+        }
+    };
 }
 
+
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 0eeefa9..67a8074 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -37,6 +37,7 @@
 import android.widget.Toast;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -74,30 +75,8 @@
         }
         mCreated = true;
         if (mAppRow == null) return;
-        final View content = getActivity().findViewById(R.id.main_content);
-        final ViewGroup contentParent = (ViewGroup) content.getParent();
-        final View bar = getActivity().getLayoutInflater().inflate(R.layout.app_notification_header,
-                contentParent, false);
-
-        final ImageView appIcon = (ImageView) bar.findViewById(R.id.app_icon);
-        appIcon.setImageDrawable(mAppRow.icon);
-
-        final TextView appName = (TextView) bar.findViewById(R.id.app_name);
-        appName.setText(mAppRow.label);
-
-        final View appSettings = bar.findViewById(R.id.app_settings);
-        if (mAppRow.settingsIntent == null) {
-            appSettings.setVisibility(View.GONE);
-        } else {
-            appSettings.setClickable(true);
-            appSettings.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mContext.startActivity(mAppRow.settingsIntent);
-                }
-            });
-        }
-        contentParent.addView(bar, 0);
+        AppHeader.createAppHeader(getActivity(), mAppRow.icon, mAppRow.label,
+                mAppRow.settingsIntent);
     }
 
     @Override
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 37b1813..53fdf1b 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -317,10 +317,6 @@
         return getPreferenceScreen();
     }
 
-    protected void clearSelectedApps() {
-        mSelectedPackages.clear();
-    }
-
     private void applyUserAppsStates() {
         final int userId = mUser.getIdentifier();
         if (!mUserManager.getUserInfo(userId).isRestricted() && userId != UserHandle.myUserId()) {
@@ -643,6 +639,8 @@
             final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);
             if (isSettingsApp) {
                 addLocationAppRestrictionsPreference(app, p);
+                // Settings app should be available to restricted user
+                mSelectedPackages.put(packageName, true);
                 continue;
             }
             PackageInfo pi = null;
@@ -687,7 +685,8 @@
                 p.setChecked(mSelectedPackages.get(packageName));
             }
             p.setOrder(MAX_APP_RESTRICTIONS * (mAppList.getPreferenceCount() + 2));
-            addToAppList(p, packageName);
+            mSelectedPackages.put(packageName, p.isChecked());
+            mAppList.addPreference(p);
         }
         mAppListChanged = true;
         // If this is the first time for a new profile, install/uninstall default apps for profile
@@ -736,11 +735,6 @@
         p.setPersistent(false);
         p.setOnPreferenceClickListener(this);
         p.setOrder(MAX_APP_RESTRICTIONS);
-        addToAppList(p, packageName);
-    }
-
-    private void addToAppList(AppRestrictionsPreference p, String packageName) {
-        mSelectedPackages.put(packageName, p.isChecked());
         mAppList.addPreference(p);
     }