diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3fa1d41..ed2f9e1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,7 +92,7 @@
             android:requiredForAllUsers="true"
             android:supportsRtl="true"
             android:allowBackup="false"
-            android:usesCleartextTraffic="false">
+            android:usesCleartextTraffic="true">
 
         <!-- Settings -->
 
@@ -672,7 +672,6 @@
                   android:excludeFromRecents="true">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
-                <action android:name="com.android.settings.USER_DICTIONARY_EDIT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1410,7 +1409,7 @@
         <!-- Lock screen settings -->
         <activity android:name="ConfirmDeviceCredentialActivity"
             android:exported="true"
-            android:theme="@style/Transparent">
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1737,27 +1736,6 @@
         <activity android:name=".AppPicker" android:label="@string/select_application"
                 android:theme="@android:style/Theme.Material.Light.Dialog" />
 
-        <activity android:name="Settings$UsbSettingsActivity"
-                android:label="@string/storage_title_usb"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$StorageSettingsActivity">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.STORAGE_USB_SETTINGS" />
-                <action android:name="com.android.settings.STORAGE_USB_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.UsbSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/storage_settings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UsbSettings"
                   android:exported="true"
@@ -1829,7 +1807,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.MANAGE_USB"
-                  android:theme="@style/Transparent">
+                  android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
         </activity>
 
         <activity android:name=".bluetooth.RequestPermissionHelperActivity"
@@ -2420,6 +2398,19 @@
                 android:resource="@id/notification_settings" />
         </activity>
 
+        <!-- Show Manual (from settings item) -->
+        <activity android:name="ManualDisplayActivity"
+                  android:label="@string/manual"
+                  android:taskAffinity=""
+                  android:enabled="@bool/config_show_manual">
+            <intent-filter>
+                <action android:name="android.settings.SHOW_MANUAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
         <!-- Show regulatory info (from settings item or dialing "*#07#") -->
         <activity android:name="RegulatoryInfoDisplayActivity"
                   android:label="@string/regulatory_information"
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 34c7f64..8102658 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -28,6 +28,7 @@
         android:inputType="textPassword"
         android:textSize="16sp"
         android:padding="10sp"
+        android:maxLength="500"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
    <include layout="@layout/crypt_keeper_switch_input_method" />
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index 56b4978..a13142e 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -28,6 +28,7 @@
         android:inputType="numberPassword"
         android:textSize="28sp"
         android:padding="4sp"
+        android:maxLength="500"
         style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
 
    <include layout="@layout/crypt_keeper_switch_input_method" />
diff --git a/res/layout/fingerprint_settings_footer.xml b/res/layout/fingerprint_settings_footer.xml
index e3e3c08..8d17052 100644
--- a/res/layout/fingerprint_settings_footer.xml
+++ b/res/layout/fingerprint_settings_footer.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<TextView
+<com.android.settings.widget.LinkTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@android:style/TextAppearance.Material.Body1"
     android:layout_width="wrap_content"
@@ -23,5 +23,4 @@
     android:paddingTop="32dp"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
-    android:selectable="false">
-</TextView>
\ No newline at end of file
+    android:selectable="false" />
diff --git a/res/layout/ignore_optimizations_content.xml b/res/layout/ignore_optimizations_content.xml
index 17327d9..3a6db9d 100644
--- a/res/layout/ignore_optimizations_content.xml
+++ b/res/layout/ignore_optimizations_content.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="8dp"
-    android:paddingBottom="8dp"
+    android:paddingBottom="4dp"
     android:orientation="vertical">
 
     <include
diff --git a/res/layout/radio_list_container.xml b/res/layout/radio_list_container.xml
new file mode 100644
index 0000000..bf40abe
--- /dev/null
+++ b/res/layout/radio_list_container.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingBottom="4dp"
+    android:orientation="vertical" />
diff --git a/res/layout/radio_with_summary.xml b/res/layout/radio_with_summary.xml
index 9c37050..87b1d14 100644
--- a/res/layout/radio_with_summary.xml
+++ b/res/layout/radio_with_summary.xml
@@ -36,10 +36,10 @@
         android:ellipsize="marquee" />
 
 
-    <TextView android:id="@+android:id/summary"
+    <TextView android:id="@android:id/summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="4dp"
+        android:paddingBottom="8dp"
         android:paddingStart="52dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
         android:textColor="?android:attr/textColorSecondary"
diff --git a/res/layout/usb_dialog_container.xml b/res/layout/usb_dialog_container.xml
new file mode 100644
index 0000000..e145911
--- /dev/null
+++ b/res/layout/usb_dialog_container.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="10dp"
+    android:paddingBottom="5dp">
+
+    <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+</ScrollView>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 15599b7..55c9b73 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vingerafdrukke is opgestel</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vingerafdruk is opgestel</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Vingerafdrukopstelling"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Om jou vingerafdruk te gebruik om jou skerm te ontsluit of aankope te bevestig, moet ons:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Stel jou rugsteunskermslotmetode op"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik vir identifisering of om \'n aankoop te magtig."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak net die vingerafdruksensor om jou toestel wakker te maak en te ontsluit."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Slaan vingerafdrukopstelling oor?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jy het gekies om jou vingerafdruk te gebruik as een manier om jou foon te ontsluit. As jy dit nou oorslaan, sal jy dit later moet opstel. Dit neem net \'n minuut of wat om op te stel."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Stel skermslot op"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Klaar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oeps, dis nie die sensor nie"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gebruik jou toestel se vingerafdruksensor."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrasie is nie voltooi nie"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tydlimiet vir vingerafdrukregistrasie is bereik. Probeer weer."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Vingerafdrukregistrasie het nie gewerk nie. Probeer weer of gebruik \'n ander vinger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Voeg nog een by"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Jy kan jou vingerafdruk nie net gebruik om jou foon te ontsluit nie, maar ook om aankope en programtoegang te magtig. "<annotation id="url">"Kom meer te wete"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Sien regsinligting, status, sagteware-weergawe"</string>
     <string name="legal_information" msgid="5769301644270604095">"Regsinligting"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bydraers"</string>
+    <string name="manual" msgid="3025943393642974445">"Handleiding"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulerende inligting"</string>
     <string name="copyright_title" msgid="865906688917260647">"Kopiereg"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensie"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Stelsel se WebView-lisensie"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Muurpapiere"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Verskaffers van satellietbeelde:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Handleiding"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Kon nie die handleiding laai nie."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Oopbronlisensies"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Daar was \'n probleem om lisensies te loods."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laai tans…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"programme toestemmings sekuriteit"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"programme verstek"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignoreer optimerings sluimer programbystand"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"lewendig rgb srgb kleur natuurlik standaard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"gly wagwoord patroon pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Wys stelsel-UI-ontvanger"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Bykomende toestemmings"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"nog <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Net batterylaai"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dra lêers oor (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Dra foto\'s oor (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Laai tans"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Laai net hierdie toestel"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Kragbron"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Laai die ander gekoppelde toestel"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Lêeroordragte"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dra lêers na Windows of Mac oor (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Foto-oordrag (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Dra foto\'s of lêers oor as MTP nie gesteun word nie (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gebruik toestel vir MIDI-invoer"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gebruik USB vir"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Onaktiewe programme"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Onaktief. Raak om te wissel."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Hierdie toestemming laat \'n program toe om stelselinstellings te verander."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dubbeldraai vir kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Maak die kameraprogram oop deur jou pols twee keer vinnig te draai"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Druk aan/af-skakelaar 2 keer vir kamera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Maak kamera vinnig oop sonder om jou skerm te ontsluit"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Lewendig (verstek)"</item>
+    <item msgid="8446070607501413455">"Natuurlik"</item>
+    <item msgid="6553408765810699025">"Standaard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Verbeterde kleure"</item>
+    <item msgid="8280754435979370728">"Natuurlike kleure soos dit vir die oë lyk"</item>
+    <item msgid="5363960654009010371">"Kleure vir digitale inhoud geoptimeer"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Fotokleurmodus"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gebruik sRGB"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8a534db..c185908 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"የጣት አሻራ ቅንብር"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"የጣት አሻራዎን በመጠቀም የእርስዎን ማያ ገጽ ለመክፈት ወይም ግዢን ለማረጋገጥ፣ የሚከተለውን ማድረግ ያስፈልገናል፦"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"የእርስዎን ማያ ገጽ መቆለፊያ ስልት ምትኬ ያቀናብሩ"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ይህን አዶ ባዩ ቁጥር፣ ማንነትን ለይቶ ለማወቅ ወይም ግዢን ፈቃድ ለመስጠት የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"የእርስዎን መሣሪያ ለማንቃት እና ለመክፈት የጣት አሻራ ዳሳሹን ነካ ማድረግ ብቻ ይበቃዎታል።"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ይህን አዶ ሲመለከቱ የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"የጣት አሻራን ማቀናበር ይዘለል?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"የእርስዎን ስልክ ለመክፈት የጣት አሻራዎችዎን እንደ አንድ መንገድ መርጠዋል። አሁን ከዘለሉት ይህንን በኋላ ላይ ማዘጋጀት ይኖርብዎታል። ማዘጋጀት አንድ ወይም ሁለት ደቂቃ ብቻ ነው የሚወስደው።"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ማያ ገጽ መቆለፊያ ያዋቅሩ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ተከናውኗል"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"አረግ አረግ፣ አነፍናፊው ያ አይደለም"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"በመሣሪያዎ ላይ ያለውን የጣት አሻራ አነፍናፊ ይጠቀሙ።"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ምዝገባ አልተጠናቀቀም"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"የጣት አሻራ ምዝገባ ጊዜ ገደብ ላይ ተደርሷል። እንደገና ይሞክሩ።"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"የጣት አሻራ ምዝገባ አልሰራም። እንደገና ይሞክሩ ወይም የተለየ ጣት ይጠቀሙ።"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ሌላ ያክሉ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ቀጣይ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ስልክዎን ከማስከፈት በተጨማሪም እንዲሁም ግዢዎችን እና የመተግበሪያ መዳረሻን ለመፍቀድ የጣት አሻራዎንም መጠቀም ይችላሉ። "<annotation id="url">"ተጨማሪ ለመረዳት"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"የሕግ መረጃ፣ኹነታ፣ የሶፍትዌር ሥሪት እይ"</string>
     <string name="legal_information" msgid="5769301644270604095">"የህግ መረጃ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"አዋጮች"</string>
+    <string name="manual" msgid="3025943393642974445">"መመሪያ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"የደንብ ክትትል መረጃ"</string>
     <string name="copyright_title" msgid="865906688917260647">"የቅጂ መብት"</string>
     <string name="license_title" msgid="1990487604356037871">"ፍቃድ"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"የስርዓት WebView ፍቃድ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"የግድግዳ ወረቀቶች"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"የሳተላይት ምስሎች አቅራቢዎች፦\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"መመሪያ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"መመሪያውን መጫን ላይ አንድ ችግር ነበር።"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"የነፃ ምንጭ  ፈቃዶች"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ፈቃዶቹንበመስቀል ላይ ችግር ነበር።"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"በመስቀል ላይ…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"የመተግበሪያዎች ፈቃዶች ደህንነት"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"መተግበሪያዎች ነባሪ"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"የማትባቶችን መጠን መተግበሪያ ዝግጁነት ችላ ማለት"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ነዛሪ rgb srgb ቀለም ተፈጥሯዋዊ መደበኛ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ማንሸራተት የይለፍ ቃል ስርዓተ-ጥለት ፒን"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ቃኚን አሳይ"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ተጨማሪ ፈቃዶች"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ተጨማሪ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ኃይል መሙላት ብቻ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ፋይሎችን ያሸጋግራል (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ፎቶዎችን ያሸጋግራል (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ኃይል በመሙላት ላይ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ይህን መሣሪያ ብቻ ኃይል ይሙሉበት"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"የኃይል አቅርቦት"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ሌላኛው የተገናኘ መሣሪያን ኃይል ይሙሉበት"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"የፋይል ዝውውሮች"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ፋይሎችን ወደ Windows ወይም Mac አዛውር (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"የፎቶ ዝውውር (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP የማይደገፍ ከሆነ ፎቶዎችን ወይም ፋይሎችን ማዛወር (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"መሣሪያን ለMIDI ግብዓት ይጠቀሙበት"</string>
     <string name="usb_use" msgid="3372728031108932425">"ዩኤስቢ ተጠቀም ለ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ንቁ ያልሆኑ መተግበሪያዎች"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ንቁ ያልሆነ። ለመቀያየር ነካ ያድርጉ።"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ይህ ፈቃድ መተግበሪያው የስርዓት ቅንብሮችን ለመቀየር ያስችለዋል።"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"አዎ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"አይ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ለካሜራ ሁለት ጊዜ ይጠምዝዙት"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"የእጅ አንጓዎን ሁለት ጊዜ በመጠምዘዝ የካሜራ መተግበሪያውን ይክፈቱ"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ለካሜራ የኃይል አዝራሩን ሁለቴ ይጫኑ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"የእርስዎን ማያ ገጽ ሳይከፍቱ ካሜራን በፍጥነት ይክፈቱ"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"ነዛሪ (ነባሪ)"</item>
+    <item msgid="8446070607501413455">"ተፈጥሯዊ"</item>
+    <item msgid="6553408765810699025">"መደበኛ"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"የበለጸጉ ቀለማት"</item>
+    <item msgid="8280754435979370728">"ልክ በዓይን እንደሚታዩት የተፈጥሮ ቀለማት"</item>
+    <item msgid="5363960654009010371">"ለዲጂታል ይዘት የላቁ ቀለማት"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"የስዕል ቀለም ሁነታ"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ይጠቀሙ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 676466e..9734322 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -330,6 +330,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"إعداد بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"لاستخدام بصمة إصبعك لإلغاء قفل الشاشة أو تأكيد عمليات الشراء، سنحتاج إلى:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"إعداد الطريقة الاحتياطية لقفل الشاشة"</string>
@@ -354,10 +355,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"يمكنك استخدام بصمة إصبعك متى رأيت هذا الرمز لتحديد الهوية أو الإذن بعملية شراء."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"لن يلزمك سوى لمس مستشعر بصمات الإصبع لتنشيط الجهاز وإلغاء قفله."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"عند رؤية هذا الرمز، يمكنك استخدام بصمة الإصبع."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"هل تريد تخطي إعداد بصمة الإصبع؟"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"لقد اخترت استخدام بصمة الإصبع كوسيلة لإلغاء تأمين هاتفك. إذا تخطيت ذلك الآن، فستحتاج إلى إعداده لاحقًا. لن يستغرق منك الإعداد سوى دقيقة تقريبًا."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"إعداد تأمين الشاشة"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"تم"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"عفوًا، هذا ليس جهاز الاستشعار"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"استخدم جهاز استشعار بصمة الإصبع على جهازك."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"لم يكتمل التسجيل"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"تم بلوغ الحد الأقصى لزمن تسجيل بصمة الإصبع. يمكنك إعادة المحاولة."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrollment didn\'t work. Try again or use a different finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"إضافة بصمة إصبع أخرى"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"التالي"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"بالإضافة إلى إلغاء قفل هاتفك، يمكنك أيضًا استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
@@ -1244,6 +1250,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"عرض المعلومات القانونية والحالة وإصدار البرنامج"</string>
     <string name="legal_information" msgid="5769301644270604095">"المعلومات القانونية"</string>
     <string name="contributors_title" msgid="5917703088825286504">"المساهمون"</string>
+    <string name="manual" msgid="3025943393642974445">"الكتيب"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"المعلومات التنظيمية"</string>
     <string name="copyright_title" msgid="865906688917260647">"حقوق الطبع والنشر"</string>
     <string name="license_title" msgid="1990487604356037871">"الترخيص"</string>
@@ -1251,6 +1258,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"‏ترخيص WebView للنظام"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"الخلفيات"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏الشركات الموفرة لصور القمر الصناعي:\n‎©2014 CNES / Astrium، وDigitalGlobe وBluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"الكتيب"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"حدثت مشكلة أثناء تحميل الكتيب."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"تراخيص البرامج مفتوحة المصدر"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"هناك مشكلة في تحميل التراخيص."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"جارٍ التحميل…"</string>
@@ -2538,6 +2547,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"أمان أذونات التطبيقات"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"التطبيقات الافتراضية"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"تجاهل تحسينات وضع استعداد تطبيقات الغفوة"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"‏لون rgb srgb نابض بالحياة قياسي طبيعي"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"التمرير، كلمة المرور، النمط، رقم التعريف الشخصي"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
@@ -2867,10 +2877,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"إظهار أداة ضبط واجهة مستخدم النظام"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"أذونات إضافية"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> أخرى"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"الشحن فقط"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏نقل البيانات (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏نقل الصور (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"جارٍ الشحن"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"شحن هذا الجهاز فقط"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"مصدر الطاقة"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"شحن الجهاز المتصل الآخر"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"عمليات نقل الملفات"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏نقل الملفات إلى Windows أو Mac (بروتوكول نقل الوسائط MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏نقل الصور (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏نقل الصور أو الملفات إذا لم يكن بروتوكول نقل الوسائط MTP متوفرًا (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏استخدام الجهاز مع إدخال MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏استخدام USB في"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"التطبيقات غير النشطة"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"غير نشط. المس للتبديل."</string>
@@ -2940,4 +2956,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"يتيح هذا الإذن للتطبيق إمكانية تعديل إعدادات النظام."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"نعم"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"لا"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"يمكنك اللف مرتين لفتح الكاميرا"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"يمكنك فتح تطبيق الكاميرا من خلال لف رسغك مرتين"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"اضغط على زر التشغيل مرتين لتشغيل الكاميرا"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"فتح الكاميرا سريعًا بدون إلغاء تأمين الشاشة"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"نابض بالحياة (افتراضي)"</item>
+    <item msgid="8446070607501413455">"طبيعي"</item>
+    <item msgid="6553408765810699025">"قياسي"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"ألوان محسَّنة"</item>
+    <item msgid="8280754435979370728">"الألوان الطبيعية تراها العين"</item>
+    <item msgid="5363960654009010371">"الألوان المحسَّنة للمحتوى الرقمي"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"نمط لون الصورة"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏استخدام sRGB"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index bf59f3b..43e2303 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> barmaq izi quraşdırması</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> barmaq izi quraşdırması</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Barmaq izi quraşdırması"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Ekranınızı kiliddən çıxarmaq və ya satın almalarınızı təsdiqləmək məqsədilə barmaq izinizdən istifadə etmək üçün bunlar lazımdır:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Arxa fon ekran kilidi metodunu ayarlayın"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu piktoqramı nə vaxtsa görsəniz, identifikasiya və ya satın almanı təsdiqləmək üçün barmaq izinizdən istifadə edə bilərsiniz."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ayılmaq və cihaz kilidini açmaq üçün sadəcə olaraq barmaq izi sensoruna toxunun."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Bu ikonu gördüyünüz zaman, barmaq izinizi istifadə edə bilərsiniz."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmaq izi ayarları ötürülsün?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefon kilidini açmaq üçün barmaq izindən istifadə etməyi seçmisiniz. Bunu indi ötürsəniz, bu funksiyanı daha sonra ayarlamalı olacaqsınız. Ayarlamaq bir-iki dəqiqə vaxtınızı aparacaq."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidi quraşdırın"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hazırdır"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, bu sensor deyil"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Cihazınızda barmaq izi sensorundan istifadə edin."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Qeydiyyat tamamlanmadı"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Barmaq izi qeydiyyatı üçün vaxt limiti ba çatdı. Yenidən cəhd edin."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Barmaq izi qeydiyyatı işləmədi. Yenidən cəhd edin və ya başqa barmaq istifadə edin."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Başqasını əlavə edin"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Növbəti"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Telefonun kiliddən çıxarılmasından əlavə, alışları doğrulamaq və tətbiqlərə giriş üçün barmaq izinizi də istifadə edə bilərsiniz. "<annotation id="url">"Ətraflı məlumat"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Hüquqi məlumata, statusa, proqram versiyasına baxın"</string>
     <string name="legal_information" msgid="5769301644270604095">"Hüquqi məlumat"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Yazarlar"</string>
+    <string name="manual" msgid="3025943393642974445">"Dərslik"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Normativ informasiya"</string>
     <string name="copyright_title" msgid="865906688917260647">"Müəlliflik hüququ"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisenziya"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Sistem WebView Lisenziyası"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Divar kağızları"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Peyk şəkillərini təqdim edənlər:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Dərslik"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Dərsliklərin yüklənməsində problem var."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Mənbə lisenziyalarını açın"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Lisenziyaların yüklənilməsində problem var."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Yüklənir…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"tətbiq icazələri təhlükəsizliyi"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"tətbiq defolt"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignore optimallaşdırılması app gözləmə doze"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"təbii standart canlı rgb sRGB rəngi"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"parol model pinini çəkin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Teqi quraşdırın"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yazın"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner göstərin"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Əlavə icazələr"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"daha <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Yalnız enerji doldurma"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Faylların transferi (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotoların transferi (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Enerji yığır"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Sadəcə bu cihazın batareyasını doldurun"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Enerji təchizatı"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Digər qoşulu cihazın batareyasını doldurun"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fayl köçürmələri"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Faylları Windows və ya Mac (MTP) cihazınıza transfer edin"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Foto transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Əgər MTP dəstəklənmirsə (PTP), foto və faylları transfer edin"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI daxiletmə üçün cihaz istifadə edin"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB istifadəsi"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"İnaktiv tətbiqlər"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"İnaktiv. Keçid etmək üçün toxunun."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu icazə tətbiqə sistem ayarlarını dəyişdirməyə imkan verir."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bəli"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Xeyr"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera üçün iki dəfə burun"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Biləyinizi iki dəfə buraraq kamera tətbiqini açın"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera üçün yandırıb söndürmə düyməsinə iki dəfə basın"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ekranınızın kilidini açmadan kameranı cəld açın"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Canlı (defolt)"</item>
+    <item msgid="8446070607501413455">"Təbii"</item>
+    <item msgid="6553408765810699025">"Standart"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Artırılmış rənglər"</item>
+    <item msgid="8280754435979370728">"Gözlə göründüyü kimi təbii rənglər"</item>
+    <item msgid="5363960654009010371">"Rəqəmsal məzmun üçün optimallaşdırılan rənglər"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Şəkil rəng rejimi"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB istifadə edin"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 26e981e..e438d2f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Отпечатък: Настройване"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"За да използвате отпечатъка си за отключване на екрана или за потвърждаване на покупки, ще трябва:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Настройте резервен начин за заключване на екрана"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Когато видите тази икона, можете да използвате отпечатъка си за идентификация или за оторизиране на покупка."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Трябва само да докоснете сензора за отпечатъци, за да „събудите“ и отключите устройството си."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Когато видите тази икона, можете да използвате отпечатъка си."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропуск. на настройването на отпечатък?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избрахте да използвате отпечатъка си като един от начините за отключване на телефона си. Ако пропуснете сега, ще трябва да настроите по-късно. Настройването отнема около минута."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Заключване на екрана: Настройване"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ами сега! Това не е сензорът"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Ползвайте сензора за отпечатък на у-вото си."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Регистрирането не бе завършено"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Времевото ограничение за регистриране на отпечатък бе достигнато. Опитайте отново."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Регистрирането на отпечатък не проработи. Опитайте отново или използвайте друг пръст."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Добавяне на друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отключване на телефона си можете да използвате отпечатъка си и за упълномощаване на покупки и достъп до приложения. "<annotation id="url">"Научете повече"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Преглед на състоянието, правната информация и версията на софтуера"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правна информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сътрудници"</string>
+    <string name="manual" msgid="3025943393642974445">"Ръководство"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Регулативна информация"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Системен лиценз за WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Доставчици на сателитни изображения:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Ръководство"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Възникна проблем при зареждане на ръководството."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензи с отворен код"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Възникна проблем при зареждането на лицензите."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Зарежда се…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"сигурност на разрешенията за приложения"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"приложения, по подразбиране"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"пренебрегване на оптимизациите, отлагане, приложение, готовност"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ярък, rgb, srgb, цвят, естествен, стандартен"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"плъзгане, парола, фигура, ПИН код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Показване на тунера на системния ПИ"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Допълнителни разрешения"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Още <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Само за зареждане"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Прехвърляне на файлове (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Прехвърляне на снимки (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Зареждане"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Само за зареждане на това устройство"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Захранване"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Зареждане на другото свързано устройство"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Прехвърляния на файлове"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Прехвърляне на файлове на устройство с Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Прехвърляне на снимки (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Прехвърляне на снимки или файлове, ако MTP не се поддържа (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Използване на устройството за вход за MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Използване на USB за"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивни приложения"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивно. Докоснете за превключване."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Това разрешение позволява на дадено приложение да променя системните настройки."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Завъртане два пъти за достъп до камерата"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Отворете приложението Камера с двукратно завъртане на китката си"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"За камерата натиснете бутона за захранване 2 пъти"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Бързо отваряйте камерата, без да отключвате екрана си"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Ярък (по подразбиране)"</item>
+    <item msgid="8446070607501413455">"Естествен"</item>
+    <item msgid="6553408765810699025">"Стандартен"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Подобрени цветове"</item>
+    <item msgid="8280754435979370728">"Естествени цветове, без подобрения"</item>
+    <item msgid="5363960654009010371">"Цветове, оптимизирани за дигитално съдържание"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Цветови режим за снимките"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Използване на sRGB"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index f9804fc..5508910 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"আঙ্গুলের ছাপ সেটআপ করুন"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"আপনার স্ক্রীন আনলক করতে অথবা ক্রয়গুলি নিশ্চিত করতে আপনার আঙ্গুলের ছাপ ব্যবহার করতে, আমাদের প্রয়োজন হবে:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"আপনার ব্যাক আপ স্ক্রীন লক করার পদ্ধতি সেট আপ করুন"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"যখন আপনি এই আইকন দেখতে পাবেন তখনই আপনি সনাক্ত করার জন্য অথবা একটি ক্রয় করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"আপনার ডিভাইসকে জাগাতে এবং আনলক করতে শুধুমাত্র আঙ্গুলের ছাপ সেন্সরে স্পর্শ করুন৷"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"আপনি যখন এই আইকন দেখতে পাবেন তখনই আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"আঙ্গুলের ছাপ সেট আপ করা এড়িয়ে যাবেন?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"আপনি আপনার ফোন আনলক করার একটি উপায় হিসেবে আপনার আঙ্গুলের ছাপ ব্যবহারের ব্যবস্থাটিকে বেছে নিয়েছেন। আপনি যদি এখনই এটিকে এড়িয়ে যান, তাহলে আপনাকে পরে আবার এটি সেট আপ করতে হবে। সেট আপ করতে মাত্র এক মিনিট এর মত সময় লাগতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"স্ক্রীন লক সেট আপ করুন"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"সম্পন্ন"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ওহো, সেটি সেন্সর ছিল না"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"আপনার ডিভাইসে আঙ্গুলের ছাপ নেওয়ার সেন্সর ব্যবহার করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"তালিকাভুক্তি সম্পন্ন করা যায়নি"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"আঙ্গুলের ছাপ তালিকাভুক্তির সময়সীমা শেষ হয়েছে। আবার চেষ্টা করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"আঙ্গুলের ছাপ তালিকাভুক্তিকরণ কাজ করেনি৷ আবার চেষ্টা করুন অথবা আলাদা কোনো আঙুল ব্যবহার করুন৷"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"আরেকটি জুড়ুন"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"পরবর্তী"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"উপরন্তু আপনার ফোন আনলক করতে, কেনাকাটা এবং অ্যাপ্লিকেশান অ্যাক্সেস অনুমোদন করতে আপনি আপনার আঙ্গুলের ছাপও ব্যবহার করতে পারেন৷ "<annotation id="url">"আরো জানুন"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"আইনি তথ্য, স্থিতি, সফ্টওয়্যার সংস্করণ দেখুন"</string>
     <string name="legal_information" msgid="5769301644270604095">"আইনি তথ্য"</string>
     <string name="contributors_title" msgid="5917703088825286504">"প্রদায়কগণ"</string>
+    <string name="manual" msgid="3025943393642974445">"ম্যানুয়াল"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"রেগুলেটরি তথ্য"</string>
     <string name="copyright_title" msgid="865906688917260647">"কপিরাইট"</string>
     <string name="license_title" msgid="1990487604356037871">"লাইসেন্স"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"সিস্টেম ওয়েবভিউ লাইসেন্স"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ওয়ালপেপারগুলি"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"উপগ্রহ চিত্র প্রদানকারী:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"ম্যানুয়াল"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ম্যানুয়াল লোড হওয়ার সময়ে একটি সমস্যা হয়েছে।"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"মুক্ত উৎস লাইসেন্স"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"লাইসেন্সগুলি লোড হতে একটা সমস্যা হয়েছে।"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"লোড হচ্ছে..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"অ্যাপ্লিকেশান অনুমতিগুলির নিরাপত্তা"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"অ্যাপ্লিকেশান ডিফল্ট"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"তন্দ্রা অ্যাপ্লিকেশান স্ট্যান্ডবাই এর ক্ষেত্রে অপ্টিমাইজেশান উপেক্ষা করুন"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ভাইব্রেন্ট rgb srgb রঙ প্রাকৃতিক মান"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"পাসওয়ার্ড প্যাটার্ন পিন স্লাইড করুন"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"সিস্টেমUI টিউনার দেখান"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"অতিরিক্ত অনুমতিগুলি"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"আরো <xliff:g id="COUNT">%1$d</xliff:g>টি"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"শুধুমাত্র চার্জ করা"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ফাইলগুলির স্থানান্তর (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ফটোগুলির স্থানান্তর (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"চার্জ হচ্ছে"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"শুধুমাত্র ডিভাইটি চার্জ করুন"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"পাওয়ার উৎস"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"অন্যান্য সংযুক্ত ডিভাইস চার্জ করুন"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ফাইল স্থানান্তরণগুলি"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows বা Mac এ ফাইলগুলি স্থানান্তর করুন (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ফটো স্থানান্তরণ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"যদি MTP সমর্থিত না হয় তবে ফটো বা ফাইলগুলি স্থানান্তর করুন (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ইনপুটের জন্য ডিভাইস ব্যবহার করুন"</string>
     <string name="usb_use" msgid="3372728031108932425">"এর জন্য USB ব্যবহার করুন"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"নিষ্ক্রিয় অ্যাপ্লিকেশানগুলি"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"নিষ্ক্রিয় রয়েছে৷ টগল করতে স্পর্শ করুন৷"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"এই অনুমতিটি কোনো অ্যাপ্লিকেশানকে সিস্টেম সেটিংস সংশোধন করার অনুমতি দেয়৷"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"হ্যাঁ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"না"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ক্যামেরার জন্য দুবার ঝাঁকান"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"আপনার কব্জি দুবার ঝাঁকিয়ে ক্যামেরা অ্যাপ্লিকেশানটি খুলুন"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ক্যামেরার জন্য দুবার পাওয়ার বোতাম টিপুন"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"আপনার স্ক্রীন আনলক না করেই দ্রুত ক্যামেরা খুলুন"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"ভাইব্রেন্ট (ডিফল্ট)"</item>
+    <item msgid="8446070607501413455">"প্রাকৃতিক"</item>
+    <item msgid="6553408765810699025">"সাধারণ"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"উন্নত রঙ"</item>
+    <item msgid="8280754435979370728">"স্বাভাবিক ভাবে আমরা চোখে যেমনটি দেখি সেইরূপ প্রাকৃতিক রঙ"</item>
+    <item msgid="5363960654009010371">"ডিজিট্যাল সামগ্রীর জন্য অপ্টিমাইজ করা রঙগুলি"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"ছবি রঙ মোড"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ব্যবহার করুন"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5c19702..d44bfc9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empremtes digitals configurades</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> empremta digital configurada</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Conf. empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Per fer servir la teva empremta digital per desbloquejar la pantalla o confirmar compres, ens caldrà:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configura un mètode de bloqueig de pantalla alternatiu"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar-te o per autoritzar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Toca el sensor d\'empremtes digitals per activar i desbloquejar el dispositiu."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quan vegis aquesta icona, pots fer servir la teva empremta digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Sortir de configuració d\'empremta digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has triat utilitzar la teva empremta digital per desbloquejar el telèfon. Si omets aquest pas ara, hauràs de fer aquesta configuració més endavant. Aquest procés només triga un parell de minuts."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configura el bloqueig de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fet"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Això no és el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilitza el sensor d\'empremtes del dispositiu"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"No s\'ha completat la inscripció"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"S\'ha esgotat el temps d\'espera per inscriure l\'empremta digital. Torna-ho a provar."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"La inscripció de l\'empremta digital no ha funcionat. Torna-ho a provar o fes servir un altre dit."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Afegeix-ne un altre"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Següent"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"A més de fer servir l\'empremta digital per desbloquejar el telèfon, també la pots fer servir per autoritzar compres i permetre l\'accés a determinades aplicacions. "<annotation id="url">"Més informació"</annotation></string>
@@ -1203,11 +1209,12 @@
     <string name="location_access_title" msgid="7064108942964081243">"Accés a la meva ubicació"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Permet que les aplicacions que hagin demanat permís utilitzin la informació sobre la ubicació"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Fonts d\'ubicació"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre la tauleta"</string>
-    <string name="about_settings" product="default" msgid="1743378368185371685">"Sobre el telèfon"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Quant a la tauleta"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Informació sobre el telèfon"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Mostra informació legal, estat, versió de programari"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informació legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Col·laboradors"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informació de regulació"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Llicència"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Llicència de WebView del sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fons de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Proveïdors d\'imatges per satèl·lit:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"S\'ha produït un problema en carregar el manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Llicències de codi obert"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"S\'ha produït un problema en llegir les llicències."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"S\'està carregant…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguretat per als permisos d\'aplicacions"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplicacions predeterminades"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar optimitzacions migdiada aplicació inactiva"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"estàndard natural color RGB sRGB vibrant"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lliscar, contrasenya, patró, PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta de NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostra SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos addicionals"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> més"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Només per carregar"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir fitxers (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Càrrega"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Carrega només aquest dispositiu"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Font d\'alimentació"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carrega l\'altre dispositiu connectat"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferència de fitxers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfereix fitxers al sistema Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferència de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfereix fotos o fitxers si no s\'admet MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilitza el dispositiu per a l\'entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Funcions de l\'USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicacions inactives"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactiva. Toca per activar-la."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Aquest permís permet que una aplicació modifiqui la configuració del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Doble gir per obrir Càmera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira el canell dues vegades per obrir l\'aplicació Càmera"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botó d\'engegada dos cops per obrir càmera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Obre ràpidament la càmera sense haver de desbloquejar la pantalla"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrant (predeterminat)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Estàndard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Colors millorats"</item>
+    <item msgid="8280754435979370728">"Colors naturals tal com els veu l\'ull humà"</item>
+    <item msgid="5363960654009010371">"Colors optimitzats per al contingut digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Mode de color de la imatge"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utilitza sRGB"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9ccc99a..186c673 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -326,6 +326,7 @@
       <item quantity="other">Nastavení <xliff:g id="COUNT_1">%1$d</xliff:g> otisků prstu</item>
       <item quantity="one">Nastavení <xliff:g id="COUNT_0">%1$d</xliff:g> otisku prstu</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nastavení otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Aby bylo možné pomocí otisku prstu odemykat obrazovku a potvrzovat nákupy, bude potřeba provést následující:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Nastavte záložní metodu zámku obrazovky."</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kdykoli se zobrazí tato ikona, můžete se identifikovat nebo autorizovat nákup pomocí svého otisku prstu."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Probuďte a odemkněte zařízení klepnutím na senzor otisků prstů."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Když se zobrazí tato ikona, můžete použít otisk prstu."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Přeskočit nastavení otisku prstu?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jako jeden ze způsobů odemknutí telefonu jste se rozhodli používat otisk prstu. Pokud nastavení přeskočíte, bude třeba jej dokončit později. Nastavení trvá jen chviličku."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavit zámek obrazovky"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Jejda, to není senzor."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Použijte senzor otisků prstů na zařízení."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrace nebyla dokončena"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Bylo dosaženo časového limitu registrace otisku prstu. Zkuste to znovu."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrace otisku prstu nefungovala. Zkuste to znovu nebo použijte jiný prst."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Přidat další"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Další"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Kromě odemknutí telefonu můžete svůj otisk prstu použít také k autorizaci nákupů a přístupu aplikací. "<annotation id="url">"Další informace"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Zobrazí právní informace, stav a verzi softwaru"</string>
     <string name="legal_information" msgid="5769301644270604095">"Právní informace"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Přispěvatelé"</string>
+    <string name="manual" msgid="3025943393642974445">"Příručka"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulační informace"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorská práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Systémová licence WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Tapety"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Poskytovatelé satelitních snímků:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Příručka"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Při načítání příručky došlo k chybě."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Při načítání licencí došlo k chybě."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Načítání..."</string>
@@ -2373,7 +2382,7 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Změna velikosti písma"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby dotykem telefonu"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby mobilem"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Jak to funguje"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Plaťte v obchodech telefonem"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Výchozí platební aplikace"</string>
@@ -2382,14 +2391,14 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Použít výchozí"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Vždy"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Kromě případů, kdy je spuštěna jiná platební aplikace"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace, která bude použita u terminálu pro platby dotykem telefonu:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace, která bude použita u terminálu pro platby mobilem:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Platba na terminálu"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Nastavte platební aplikaci. Poté jen přidržte telefon zadní stranou u terminálu se symbolem bezkontaktních plateb."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Rozumím"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Další..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Nastavit jako předvolbu?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Chcete při platbě dotykem telefonu vždy používat aplikaci <xliff:g id="APP">%1$s</xliff:g>?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Chcete při platbě dotykem telefonu namísto aplikace <xliff:g id="APP_0">%1$s</xliff:g> vždy používat aplikaci <xliff:g id="APP_1">%2$s</xliff:g>?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Chcete při platbě mobilem vždy používat aplikaci <xliff:g id="APP">%1$s</xliff:g>?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Chcete při platbě mobilem namísto aplikace <xliff:g id="APP_0">%1$s</xliff:g> vždy používat aplikaci <xliff:g id="APP_1">%2$s</xliff:g>?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odebrat omezení"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikace oprávnění zabezpečení"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplikace výchozí"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorování optimalizací schrupnutí aplikace v pohotovostním režimu"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"jasné rgb srgb barva přirozené standardní"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"přejetí prstem heslo gesto pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavení štítku NFC pro Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
@@ -2833,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Zobrazit tuner SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Další oprávnění"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Počet: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Pouze nabíjení"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Přenos souborů (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Přenos fotek (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Nabíjení"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Nabít jen toto zařízení"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Zdroj energie"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Nabít jen druhé připojené zařízení"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Přenos souborů"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Přenést soubory do systému Windows nebo Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Přenos fotek (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Přenést fotky nebo soubory, pokud MTP není podporováno (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Použít zařízení jako vstup MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Použití USB:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivní aplikace"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivní. Přepnete klepnutím."</string>
@@ -2904,4 +2920,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Toto oprávnění umožňuje aplikaci měnit nastavení systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ano"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Otevření Fotoaparátu otočením zápěstí"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Umožňuje otevřít aplikaci Fotoaparát dvojitým otočením zápěstí."</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Fotoaparát dvojitým stisknutím vypínače"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Rychle otevře fotoaparát bez odemknutí obrazovky"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Jasné (výchozí)"</item>
+    <item msgid="8446070607501413455">"Přirozené"</item>
+    <item msgid="6553408765810699025">"Standardní"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Vylepšené barvy"</item>
+    <item msgid="8280754435979370728">"Přirozené barvy, jak je vidí oči"</item>
+    <item msgid="5363960654009010371">"Barvy optimalizované pro digitální obsah"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Režim barev obrázku"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Použije se barevný prostor sRGB"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6e2af14..078b8d3 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingeraftryk er oprettet</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingeraftryk er oprettet</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Registrer fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Før du kan bruge dit fingeraftryk til at låse skærmen op eller bekræfte køb, skal vi:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Konfigurer din alternative metode til skærmlåsning"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikon, kan du bruge dit fingeraftryk til brugeridentifikation eller til at godkende et køb."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tryk på fingeraftrykssensoren for at vække din enhed og låse den op."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Når du ser dette ikon, kan du bruge dit fingeraftryk."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du springe registrering af fingeraftryk over?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt at bruge fingeraftryk som en metode til at låse din telefon op. Hvis du springer det over nu, skal du konfigurere dette senere. Konfigurationen tager kun omkring et minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skærmlås"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Færdig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hov! Dette er ikke sensoren"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Brug fingeraftrykssensoren på din enhed."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreringen kunne ikke gennemføres"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tidsgrænsen for registrering af fingeraftryk blev overskredet. Prøv igen."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrering af fingeraftryk virkede ikke. Prøv igen, eller brug en anden finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Tilføj endnu et"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Næste"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ud over at bruge fingeraftryk til at låse telefonen op kan du også bruge fingeraftryk til at godkende køb og få adgang til apps. "<annotation id="url">"Få flere oplysninger"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Vis juridiske oplysninger, status, softwareversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridiske oplysninger"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bidragydere"</string>
+    <string name="manual" msgid="3025943393642974445">"Brugervejledning"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Certificeringer"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"System WebView-licens"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Baggrunde"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Leverandører af satellitbilleder:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Brugervejledning"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Der er problemer med at indlæse brugervejledningen."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open source-licenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Der er problemer med at indlæse licenserne."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Indlæser..."</string>
@@ -1742,7 +1751,7 @@
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi aktiv"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
-    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Opkald"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"Data om mobilnetværk er sendt"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"Data om mobilnetværk er modtaget"</string>
     <string name="usage_type_radio_active" msgid="1732647857619420121">"Aktivitet for mobilradio"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps tilladelser sikkerhed"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apps standard"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorer, optimeringer, hvil, app standby"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"klare rgb srgb farve naturlige standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"stryg adgangskode mønster pinkode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2763,7 +2773,7 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Vælg indtaling"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Browserapp"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Ingen standardbrowser"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Opkaldsapp"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Telefonapp"</string>
     <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Applagerplads"</string>
     <string name="usage_access" msgid="5479504953931038165">"Adgang til forbrug"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Vis SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Flere tilladelser"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> mere"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Udelukkende til opladning"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Til at overføre filer (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Til at overføre billeder (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Oplader"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Oplad denne enhed"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strømforsyning"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Oplad den anden tilsluttede enhed"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Filoverførsler"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Overfør filer til Windows eller Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Billedoverførsel (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Overfør billeder eller filer, hvis MTP ikke understøttes (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"Til MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Brug enheden til MIDI-indgang"</string>
     <string name="usb_use" msgid="3372728031108932425">"Brug USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Tryk for at skifte."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Denne tilladelse giver en app lov til at ændre systemindstillinger."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Drej to gange for at åbne kameraet"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Åbn kameraappen ved at dreje håndleddet to gange"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tryk to gange på afbryderknappen for at åbne kameraet"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Åbn hurtigt kameraet uden at låse skærmen op"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Klare (standard)"</item>
+    <item msgid="8446070607501413455">"Naturlige"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Forbedrede farver"</item>
+    <item msgid="8280754435979370728">"Naturlige farver, som øjet opfatter dem"</item>
+    <item msgid="5363960654009010371">"Farver, der er optimeret til digitalt indhold"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Farvetilstand for billeder"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Brug sRGB"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3c1527b..c4e5aa7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -319,9 +319,10 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Fingerabdruck hinzufügen"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"Displaysperre"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Fingerabdrücke eingerichtet</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Fingerabdrücke eingerichtet</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Fingerabdrücke einrichten</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Fingerabdruck einrichten</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Abdruck einrichten"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Zum Entsperren des Displays oder Bestätigen von Käufen per Fingerabdruck sind folgende Aktionen erforderlich:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Richten Sie Ihre alternative Methode für die Displaysperre ein."</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wenn Sie dieses Symbol sehen, können Sie Ihren Fingerabdruck zur Identifizierung oder zur Autorisierung eines Kaufs verwenden."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tippen Sie einfach auf den Fingerabdrucksensor, um Ihr Gerät zu aktivieren und zu entsperren."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wenn Sie dieses Symbol sehen, können Sie Ihren Fingerabdruck verwenden."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Fingerabdruck-Einrichtung überspringen?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Sie haben festgelegt, dass Sie unter anderem Ihren Fingerabdruck zum Entsperren Ihres Smartphones verwenden möchten. Wenn Sie diesen Schritt jetzt überspringen, müssen Sie die Einrichtung zu einem späteren Zeitpunkt vornehmen. Die Einrichtung dauert nur ca. eine Minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Displaysperre einrichten"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fertig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Das ist nicht der Sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Fingerabdrucksensor auf Gerät verwenden"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrierung wurde nicht abgeschlossen."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Zeitüberschreitung für Fingerabdruckregistrierung. Versuchen Sie es erneut."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fehler bei Fingerabdruckregistrierung. Versuchen Sie es erneut oder verwenden Sie einen anderen Finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Weitere hinzufügen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Weiter"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Mit Ihrem Fingerabdruck können Sie nicht nur Ihr Smartphone entsperren, sondern auch Käufe und App-Zugriffe autorisieren. "<annotation id="url">"Weitere Informationen"</annotation></string>
@@ -810,7 +816,7 @@
     <string name="accessibility_category_work" msgid="4339262969083355720">"Konten für Arbeitsprofil – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Konten für persönliches Profil"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Arbeitskonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Privates Konto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Persönliches Konto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"Suche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
@@ -1209,6 +1215,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Rechtliche Hinweise, Status und Softwareversion anzeigen"</string>
     <string name="legal_information" msgid="5769301644270604095">"Rechtliche Hinweise"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mitwirkende"</string>
+    <string name="manual" msgid="3025943393642974445">"Handbuch"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulierungsinformationen"</string>
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
@@ -1216,6 +1223,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"System-WebView-Lizenz"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Hintergründe"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellitenbilder bereitgestellt von:\n© 2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Handbuch"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Problem beim Laden des Handbuchs."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-Source-Lizenzen"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Beim Laden der Lizenzen ist ein Problem aufgetreten."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Wird geladen..."</string>
@@ -1592,7 +1601,7 @@
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Untertitel"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Vergrößerungsbewegungen"</string>
     <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"Wenn diese Funktion aktiviert ist, können Sie heranzoomen und herauszoomen, indem Sie drei Mal auf den Bildschirm tippen.\n\nWenn Sie herangezoomt haben, können Sie:\n"<ul><li>"Schwenken: mindestens 2 Finger über den Bildschirm ziehen"</li>\n<li>"Zoomstufe anpassen: mindestens 2 Finger zusammen- oder auseinanderziehen"</li></ul>\n\n"Sie können auch das, was sich unter Ihrem Finger befindet, vorübergehend vergrößern, indem Sie drei Mal tippen und halten. In diesem vergrößerten Zustand können Sie Ihren Finger ziehen, um verschiedene Bereiche des Bildschirms zu erkunden. Heben Sie Ihren Finger an, um zum vorherigen Zustand zurückzukehren.\n\nHinweis: Das dreimalige Tippen zur Vergrößerung funktioniert überall außer in der Tastatur und in der Navigationsleiste."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Kurzbefehl für Bedienungshilfen"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bedienungshilfenverknüpfung"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"An"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Aus"</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wenn diese Funktion aktiviert ist, können Sie Bedienungshilfen schnell in zwei Schritten aktivieren:\n\nSchritt 1: Drücken und halten Sie die Ein-/Aus-Taste, bis Sie einen Ton hören oder eine Vibration spüren.\n\nSchritt 2: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören.\n\nFalls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
@@ -2503,6 +2512,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"App-Berechtigungen – Sicherheit"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"Apps-Standardeinstellung"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"Ignorieren Optimierungen Stromsparmodus App-Standby"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"brillant rgb srgb farbe natürlich standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ziehen passwort muster pin slide password pattern"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
@@ -2802,10 +2812,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI-Tuner anzeigen"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Zusätzliche Berechtigungen"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> weitere"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Nur aufladen"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dateien übertragen (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotos übertragen (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Ladevorgang"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Nur zum Aufladen dieses Geräts"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Stromversorgung"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Anderes angeschlossenes Gerät aufladen"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Dateiübertragungen"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dateien an Windows oder Mac übertragen (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoübertragung (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotos oder Dateien übertragen, falls MTP nicht unterstützt wird (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gerät für MIDI-Eingabe verwenden"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB verwenden für"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktive Apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Berühren zum Aktivieren."</string>
@@ -2871,4 +2887,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Diese Berechtigung ermöglicht einer App das Ändern von Systemeinstellungen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nein"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Zum Öffnen der Kamera zweimal drehen"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera App durch zweimaliges Drehen des Handgelenks öffnen"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Für Kamera Ein/Aus zweimal drücken"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Kamera ohne Entsperren des Displays schnell öffnen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Brillant (Standardeinstellung)"</item>
+    <item msgid="8446070607501413455">"Natürlich"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Verstärkte Farben"</item>
+    <item msgid="8280754435979370728">"Natürliche Farben wie vom Auge wahrgenommen"</item>
+    <item msgid="5363960654009010371">"Für digitale Inhalte optimierte Farben"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Farbmodus für Bilder"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB verwenden"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b038989..4236011 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Ρύθμ.μοναδικού χαρακτ."</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Για να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για να ξεκλειδώσετε την οθόνη σας ή να επιβεβαιώσετε αγορές, θα πρέπει να:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Ρύθμιση εφεδρικής μεθόδου κλειδώματος οθόνης"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Όποτε βλέπετε αυτό το εικονίδιο, μπορείτε να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για την ταυτοποίηση ή την εξουσιοδότηση μιας αγοράς."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Απλά αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων για να αφυπνίσετε και να ξεκλειδώσετε τη συσκευή σας."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Μόλις εμφανιστεί αυτό το εικονίδιο, μπορείτε να χρησιμοποιήσετε τα δακτυλικά σας αποτυπώματα."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Παράβλεψη ρύθμ. μοναδ. χαρακτηριστικού;"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Επιλέξατε να χρησιμοποιήσετε το μοναδικό χαρακτηριστικό σας ως έναν τρόπο για να ξεκλειδώσετε το τηλέφωνό σας. Εάν κάνετε παράβλεψη τώρα, θα πρέπει να το ρυθμίσετε αυτό αργότερα. Η εγκατάσταση διαρκεί μόνο ένα λεπτό περίπου."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ρύθμιση κλειδώματος οθόνης"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Τέλος"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ωχ, αυτό δεν είναι ο αισθητήρας"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Χρήση αισθητήρα μοναδικού χαρακτ. συσκευής."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Η εγγραφή δεν ολοκληρώθηκε"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Λήξη χρονικού ορίου εγγραφής δακτυλικών αποτυπωμάτων. Δοκιμάστε ξανά."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Αποτυχία εγγραφής δακτυλικών αποτυπωμάτων. Δοκιμάστε ξανά ή χρησιμοποιήστε ένα άλλο δάκτυλο."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Προσθήκη άλλου"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Επόμενο"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Εκτός από τη δυνατότητα ξεκλειδώματος του τηλεφώνου σας, μπορείτε επίσης να χρησιμοποιήσετε το μοναδικό χαρακτηριστικό σας, για να εξουσιοδοτήσετε αγορές και πρόσβαση σε εφαρμογές. "<annotation id="url">"Μάθετε περισσότερα"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Προβολή νομικών πληροφοριών, κατάστασης, έκδοσης λογισμικού"</string>
     <string name="legal_information" msgid="5769301644270604095">"Νομικές πληροφορίες"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Συνεργάτες"</string>
+    <string name="manual" msgid="3025943393642974445">"Εγχειρίδιο χρήσης"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Ρυθμιστικές πληροφορίες"</string>
     <string name="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Άδεια συστήματος WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ταπετσαρίες"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Πηγές δορυφορικών εικόνων:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Εγχειρίδιο χρήσης"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Παρουσιάστηκε κάποιο πρόβλημα κατά τη φόρτωση του εγχειριδίου χρήσης."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Άδειες λογισμ.ανοικτ.κώδ."</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Παρουσιάστηκε ένα πρόβλημα κατά τη φόρτωση των αδειών."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Φόρτωση..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ασφάλεια δικαιωμάτων εφαρμογών"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"προεπιλεγμένες εφαρμογές"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"παράβλεψη βελτιστοποιήσεις προσωρινή αναστολή εφαρμογή αναμονή"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ζωντανό rgb srgb χρώμα φυσικό τυπικό"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ολίσθηση κωδικός πρόσβασης μοτίβο pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Εμφάνιση δέκτη SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Πρόσθετα δικαιώματα"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ακόμη"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Φόρτιση μόνο"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Μεταφορά αρχείων (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Μεταφορά φωτογραφιών (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Φόρτιση σε εξέλιξη"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Φορτίστε απλώς τη συσκευή"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Παροχή ρεύματος"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Φορτίστε την άλλη συνδεδεμένη συσκευή"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Μεταφορές αρχείων"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Μεταφορά αρχείων σε Windows ή Mac (ΜΤΡ)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Μεταφορά φωτογραφιών (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Μεταφορά φωτογραφιών ή αρχείων, εάν δεν υποστηρίζεται το MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Χρήση συσκευής για είσοδο MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Χρήση USB για"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Ανενεργές εφαρμογές"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Ανενεργή. Αγγίξτε για εναλλαγή."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Αυτή η άδεια επιτρέπει σε μια εφαρμογή την τροποποίηση των ρυθμίσεων συστήματος."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ναι"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Όχι"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Περιστρέψτε δύο φορές για κάμερα"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ανοίξτε την εφαρμογή κάμερας περιστρέφοντας δύο φορές τον καρπό σας"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Διπλό πάτημα κουμπιού λειτ. για κάμερα"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Γρήγορο άνοιγμα κάμερας χωρίς ξεκλείδωμα οθόνης"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Ζωντανό (προεπιλογή)"</item>
+    <item msgid="8446070607501413455">"Φυσικό"</item>
+    <item msgid="6553408765810699025">"Τυπικό"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Βελτιωμένα χρώματα"</item>
+    <item msgid="8280754435979370728">"Φυσικά χρώματα όπως είναι ορατά στο μάτι"</item>
+    <item msgid="5363960654009010371">"Βελτιστοποιημένα χρώματα για ψηφιακό περιεχόμενο"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Λειτουργία χρώματος εικόνας"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Χρήση sRGB"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 33eca2c..9bb2663 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Set up your backup screen lock method"</string>
@@ -346,10 +347,15 @@
     <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="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Enrolment was not completed"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingerprint enrolment time limit reached. Try again."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Add another"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"In addition to unlocking your phone, you can also use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"System WebView Licence"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"There is a problem loading the manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-source licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"There is a problem loading the licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Loading…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignore optimisations doze app standby"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrant RGB SRGB colour natural standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Show SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Additional permissions"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> more"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charging only"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer files (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charging"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Just charge this device"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charge the other connected device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"File transfers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer files to Windows or Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Photo transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer photos or files if MTP is not supported (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Use device for MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Use USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactive. Touch to toggle."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quickly open camera without unlocking your screen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrant (default)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Enhanced colours"</item>
+    <item msgid="8280754435979370728">"Natural colours as seen by the eye"</item>
+    <item msgid="5363960654009010371">"Colours optimised for digital content"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 33eca2c..9bb2663 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Set up your backup screen lock method"</string>
@@ -346,10 +347,15 @@
     <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="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Enrolment was not completed"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingerprint enrolment time limit reached. Try again."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Add another"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"In addition to unlocking your phone, you can also use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"System WebView Licence"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"There is a problem loading the manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-source licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"There is a problem loading the licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Loading…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignore optimisations doze app standby"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrant RGB SRGB colour natural standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Show SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Additional permissions"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> more"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charging only"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer files (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charging"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Just charge this device"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charge the other connected device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"File transfers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer files to Windows or Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Photo transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer photos or files if MTP is not supported (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Use device for MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Use USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactive. Touch to toggle."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quickly open camera without unlocking your screen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrant (default)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Enhanced colours"</item>
+    <item msgid="8280754435979370728">"Natural colours as seen by the eye"</item>
+    <item msgid="5363960654009010371">"Colours optimised for digital content"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 33eca2c..9bb2663 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingerprint setup"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Set up your backup screen lock method"</string>
@@ -346,10 +347,15 @@
     <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="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"When you see this icon, you can use your fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Enrolment was not completed"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingerprint enrolment time limit reached. Try again."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Add another"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"In addition to unlocking your phone, you can also use your fingerprint to authorise purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"System WebView Licence"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpapers"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"There is a problem loading the manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-source licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"There is a problem loading the licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Loading…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apps default"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignore optimisations doze app standby"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrant RGB SRGB colour natural standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Show SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Additional permissions"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> more"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charging only"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer files (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charging"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Just charge this device"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charge the other connected device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"File transfers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer files to Windows or Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Photo transfer (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer photos or files if MTP is not supported (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Use device for MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Use USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactive apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactive. Touch to toggle."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quickly open camera without unlocking your screen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrant (default)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Enhanced colours"</item>
+    <item msgid="8280754435979370728">"Natural colours as seen by the eye"</item>
+    <item msgid="5363960654009010371">"Colours optimised for digital content"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4dcf107..1a3d2da 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other">Se configuraron <xliff:g id="COUNT_1">%1$d</xliff:g> huellas digitales.</item>
       <item quantity="one">Se configuró <xliff:g id="COUNT_0">%1$d</xliff:g> huella digital.</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. huella digital"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Si quieres usar tu huella digital para desbloquear la pantalla o confirmar compras, tendrás que hacer lo siguiente:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurar el método secundario de bloqueo de pantalla"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando veas este ícono, podrás utilizar tu huella digital para identificarte o para autorizar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo toca el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cuando veas este ícono, podrás utilizar tu huella digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Omitir configuración de huella digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Decidiste usar la huella digital como una de las formas para desbloquear el teléfono. Si omites este paso, tendrás que configurarla más tarde. La configuración tarda un minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Listo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ese no es el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilizar sensor de huellas digitales de disp."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"No se completó el registro"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Se alcanzó el límite de tiempo para el registro de huellas digitales. Vuelve a intentarlo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"El registro de huellas digitales no funcionó. Vuelve a intentarlo o usa otro dedo."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Agregar otra huella digital"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Además de desbloquear el teléfono, también puedes utilizar tu huella digital para autorizar compras y el acceso a aplicaciones. "<annotation id="url">"Más información"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión de software del tablet"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <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>
@@ -1215,6 +1222,8 @@
     <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 satelitales:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Se produjo un error al cargar el manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hay un problema para cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"configuración predeterminada de las aplicaciones"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar optimizaciones suspender aplicación espera"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrante rgb srgb color natural estándar"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2797,10 +2807,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador de IU del sistema"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos adicionales"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> más"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Solo para realizar cargas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir archivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Realizar cargas"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Cargar solo este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fuente de alimentación"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Cargar el otro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferir archivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir archivos a Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos o archivos si no se admite MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizar el dispositivo para la entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para lo siguiente:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicaciones inactivas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactiva (toca para alternar)"</string>
@@ -2866,4 +2882,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Este permiso admite que una aplicación modifique la configuración del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Gira la muñeca dos veces para la cámara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación de la cámara"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botón de encendido dos veces para cámara"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abre la cámara de forma rápida sin desbloquear la pantalla"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrante (predeterminado)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Estándar"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Colores mejorados"</item>
+    <item msgid="8280754435979370728">"Colores naturales como los ve el ojo"</item>
+    <item msgid="5363960654009010371">"Colores optimizados para contenido digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modo de color de la imagen"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usa sRGB"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8e97c68..fbfcd0a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> huellas digitales configuradas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> huella digital configurada</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configuración huella"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Si quieres utilizar tu huella digital para desbloquear la pantalla de bloqueo o confirmar compras, debes:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurar un método de bloqueo de pantalla alternativo"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando aparezca este icono, puedes usar tu huella digital para identificarte o autorizar una compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo tienes que tocar el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cuando aparezca este icono, puedes utilizar tu huella digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Saltar configuración de huella digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has decidido utilizar tu huella digital para desbloquear el teléfono. Si te saltas este paso ahora, tendrás que configurarlo más tarde (este proceso tarda aproximadamente un minuto)."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Listo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"¡Vaya! Ese no es el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Usa sensor huellas digitales del dispositivo."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registro no completado"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Se ha alcanzado el tiempo de registro de la huella digital. Vuelve a intentarlo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"El registro de la huella digital no se ha realizado correctamente. Vuelve a intentarlo o utiliza otro dedo."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Añadir otra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Además de desbloquear el teléfono, también puedes utilizar tu huella digital para autorizar acceso a aplicaciones y compras. "<annotation id="url">"Más información"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuidores"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <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>
@@ -1215,6 +1222,8 @@
     <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>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Error al intentar cargar las licencias."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Se ha producido un problema al intentar cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplicaciones predeterminadas"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar optimizaciones doze aplicación en espera"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrante rgb srgb color natural estándar"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos adicionales"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> más"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Solo carga"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir archivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Cargar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Cargar solo este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Suministrar corriente eléctrica"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Cargar el otro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferir archivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir archivos a Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos o archivos si no se admite MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizar dispositivo para entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicaciones inactivas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactiva. Toca para cambiar."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cuando se concede este permiso, la aplicación puede modificar los ajustes del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Doble giro para abrir la cámara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación Cámara"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botón de encendido dos veces para cámara"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abre la cámara rápidamente sin desbloquear la pantalla"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrante (predeterminado)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Estándar"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Colores mejorados"</item>
+    <item msgid="8280754435979370728">"Colores naturales como en la vida real"</item>
+    <item msgid="5363960654009010371">"Colores optimizados para contenido digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modo de color de imagen"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliza sRGB"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 52f41e3..035d95f 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> sõrmejälge on seadistatud</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> sõrmejälg on seadistatud</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Sõrmejälje seadistus"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Ekraani avamise või ostude kinnitamise puhul sõrmejälje kasutamiseks peame tegema järgmist."</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Varuekraaniluku meetodi seadistamine"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alati kui seda ikooni näete, saate tuvastamiseks või ostu volitamiseks kasutada oma sõrmejälge."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Seadme äratamiseks ja avamiseks puudutage lihtsalt sõrmejäljelugejat."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kui näete seda ikooni, saate sõrmejälge kasutada."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kas jätta sõrmejälje seadistus vahele?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Valisite telefoni avamise üheks viisiks sõrmejälje kasutamise. Kui seadistamise praegu vahele jätate, peate seda tegema hiljem. See võtab ainult umbes minuti."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Seadista ekraanilukk"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Valmis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Vabandust, see pole andur"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Kasutage seadme sõrmejäljeandurit."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreerumist ei lõpetatud"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Sõrmejälje registreerimisaeg lõppes. Proovige uuesti."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Sõrmejälje registreerimine ei toiminud. Proovige uuesti või kasutage teist sõrme."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lisa veel üks"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Järgmine"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Lisaks telefoni avamisele saate oma sõrmejälje abil volitada ka ostusid ja juurdepääsu rakendustele. "<annotation id="url">"Lisateave"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Vaadake juriidilist teavet, olekut, tarkvara versiooni"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juriidiline teave"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kaasautorid"</string>
+    <string name="manual" msgid="3025943393642974445">"Käsitsi"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulatiivteave"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autoriõigus"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsents"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Süsteemi WebView\' litsents"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Taustapildid"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelliitpiltide pakkujad:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Käsitsi"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Juhendi laadimisel ilmnes probleem."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avatud lähtekoodiga litsentsid"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Litsentside laadimisega on probleem."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laadimine ..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"rakendused load turvalisus"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"rakendused vaikimisi"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"optimeerimiste ignoreerimine Doze\'i rakenduse ooterežiimis"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ere rgb srgb värv loomulik tavaline"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lohistamine parool muster PIN-kood"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Kuva SystemUI tuuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Täiendavad load"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Veel <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Ainult laadimine"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Failide edastamine (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotode edastamine (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Laadimine"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Selle seadme laadimine"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Toiteallikas"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Teise ühendatud seadme laadimine"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Failide edastamine"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Failide edastamine Windowsi või Maci arvutisse (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotode edastamine (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotode või failide edastamine, kui MTP-d ei toetata (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Seadme kasutamine MIDI-sisendina"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB kasutusviis"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktiivsed rakendused"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiivne. Puudutage ümberlülitamiseks."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Luba võimaldab rakendusel muuta süsteemiseadeid."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jah"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pöörake kaks korda kaamera avamiseks"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Avage kaamerarakendus, pöörates rannet kaks korda"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kaamera avam. vajut. 2 korda toitenuppu"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Kaamera avatakse kiirelt ekraani avamata"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Ere (vaikeseade)"</item>
+    <item msgid="8446070607501413455">"Loomulik"</item>
+    <item msgid="6553408765810699025">"Tavaline"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Täiustatud värvid"</item>
+    <item msgid="8280754435979370728">"Silmadele loomulikuna tunduvad värvid"</item>
+    <item msgid="5363960654009010371">"Digitaalse sisu jaoks optimeeritud värvid"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Pildi värvirežiim"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB kasutamine"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 65febfd..f13982f 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> hatz-markaren konfigurazioa</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> hatz-markaren konfigurazioa</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Konfigurazioa"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Pantaila desblokeatzeko edo erosketak berresteko hatz-marka erabili nahi baduzu, hau egin behar duzu:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Konfiguratu pantailaren blokeoaren ordezko metodoa"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu zeure burua identifikatzeko edo erosketak baimentzeko."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ukitu hatz-marka digitalaren sentsorea gailua aktibatzeko eta desblokeatzeko."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hatz-markaren konfigurazioa saltatu?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hatz-marka erabiltzea aukeratu duzu telefonoa desblokeatzeko modu bat gisa. Urratsa saltatzen baduzu, geroago konfiguratu beharko duzu. Minutu bat inguru baino ez duzu beharko konfiguratzeko."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguratu pantailaren blokeoa"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Eginda"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hori ez da sentsorea"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Erabili gailuko hatz-marken sentsorea."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Ez da erregistratu"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Hatz-marka digitalak erregistratzeko denbora-muga gainditu da. Saiatu berriro."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Ezin izan da erregistratu hatz-marka. Saiatu berriro edo erabili beste hatz bat."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Gehitu beste bat"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Hurrengoa"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Telefonoa desblokeatzeko ez ezik, erosketak eta aplikazioetarako sarbideak baimentzeko balio du hatz-markak. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ikusi legezko informazioa, egoera, software-bertsioa"</string>
     <string name="legal_information" msgid="5769301644270604095">"Lege-informazioa"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kolaboratzaileak"</string>
+    <string name="manual" msgid="3025943393642974445">"Eskuliburua"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Arauei buruzko informazioa"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyrighta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizentzia"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Web-ikustailearen lizentzia"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Horma-paperak"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelite-irudien hornitzaileak:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Eskuliburua"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Arazo bat izan da eskuliburua kargatzean."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Kode irekiko lizentziak"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Arazo bat izan da lizentziak kargatzean."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Kargatzen…"</string>
@@ -1623,12 +1632,12 @@
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Aukera estandarrak"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"Hizkuntza"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"Testuaren tamaina"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"Azpitituluen estiloa"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Bideo-oinen estiloa"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"Aukera pertsonalizatuak"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"Atzeko planoaren kolorea"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"Atzeko planoaren opakutasuna"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"Azpitituluen leihoaren kolorea"</string>
-    <string name="captioning_window_opacity" msgid="5041556024849862376">"Azpitituluen leihoaren opakutasuna"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"Bideo-oinaren leihoaren kolorea"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"Bideo-oinaren leihoaren opakutasuna"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"Testuaren kolorea"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Testuaren opakutasuna"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"Ertzen kolorea"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikazioak baimenak segurtasuna"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplikazio lehenetsi"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"egin ez ikusi optimizazioei utzi aplikazioa egonean"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"bizia rgb srgb kolorea naturala estandarra"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lerratu pasahitz eredu pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Erakutsi sistemako UI konfiguratzailea"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Baimen gehigarriak"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Beste <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Kargatzeko bakarrik"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Fitxategiak transferitzeko (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Argazkiak transferitzeko (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Kargatzen"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Kargatu gailu hau soilik"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Energia-iturburua"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Kargatu konektatutako beste gailua"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fitxategi-transferentziak"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferitu fitxategiak Windows edo Mac (MTP) gailu batera"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Argazkien transferentzia (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferitu argazkiak edo fitxategiak MTP onartzen ez bada (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI modurako"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Erabili gailua MIDI sarrerarako"</string>
     <string name="usb_use" msgid="3372728031108932425">"Erabili USBa honetarako:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplikazio inaktiboak"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktibo. Aldatzeko, ukitu hau."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Baimen honekin, sistemaren ezarpenak alda ditzakete aplikazioek."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bai"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ez"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera irekitzeko, biratu birritan"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ireki kameraren aplikazioa eskumuturra birritan biratuta"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Ireki kamera etengailua birritan sakatuta"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ireki kamera bizkor, pantaila desblokeatu beharrik gabe"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Bizia (balio lehenetsia)"</item>
+    <item msgid="8446070607501413455">"Naturala"</item>
+    <item msgid="6553408765810699025">"Estandarra"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Kolore hobetuak"</item>
+    <item msgid="8280754435979370728">"Kolore naturalak, bizitza errealean bezala"</item>
+    <item msgid="5363960654009010371">"Eduki digitalerako optimizatutako koloreak"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Irudiaren kolore modua"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Erabili sRGB"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6951cf2..1bca8f7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"تنظیم اثر انگشت"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"برای استفاده از اثر انگشت شما جهت باز کردن قفل صفحه‌نمایش یا تأیید خریدها، نیاز داریم:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"روش قفل صفحه پشتیبانتان را تنظیم کنید"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"برای روشن کردن و باز کردن قفل دستگاهتان کافیست حسگر اثر انگشت را لمس کنید."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"وقتی این نماد را می‌بینید، می‌توانید از اثر انگشتتان استفاده کنید."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"از تنظیم اثر انگشت رد می‌شوید؟"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"انتخاب کرده‌اید که از اثر انگشتتان به‌عنوان روشی برای باز کردن قفل تلفن استفاده کنید. اگر اکنون این مرحله را رد کنید، باید بعداً آن را تنظیم کنید. تنظیم فقط یک دقیقه یا همین حدود طول می‌کشد."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"تنظیم قفل صفحه"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"تمام"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"اووه، آن حسگر نیست"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"از حسگر اثر انگشت در دستگاهتان استفاده کنید."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ثبت انجام نشد"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"مهلت زمانی ثبت اثر انگشت به پایان رسید. دوباره امتحان کنید."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ثبت اثر انگشت کار نمی‌کند. دوباره امتحان کنید یا از انگشت دیگری استفاده کنید."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"افزودن مورد دیگر"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"بعدی"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"علاوه بر باز کردن قفل تلفنتان، همچنین می‌توانید از اثرانگشتتان برای اجازه دادن به خریدها و دسترسی برنامه استفاده کنید."<annotation id="url">"بیشتر بدانید"</annotation></string>
@@ -364,8 +370,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری رایانهٔ لوحی"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری تلفن"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که رایانه لوحی را روشن می‌کنید، قفل صفحه را برای رمزگشایی از رایانه لوحی باز کنید. تنها راه دیگر برای رمزگشایی، بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت رایانه لوحی‌تان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که تلفن را روشن می‌کنید، قفل صفحه را برای رمزگشایی از تلفن باز کنید. تنها راه دیگر برای رمزگشایی بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت تلفنتان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که رایانه لوحی را روشن می‌کنید، قفل صفحه را برای رمزگشایی از رایانه لوحی باز کنید. تنها راه دیگر برای رمزگشایی، بازنشانی به داده کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت رایانه لوحی‌تان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که تلفن را روشن می‌کنید، قفل صفحه را برای رمزگشایی از تلفن باز کنید. تنها راه دیگر برای رمزگشایی بازنشانی به داده کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت تلفنتان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"رمزگذاری رایانهٔ لوحی شخصی"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"رمزگذاری تلفن"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"باتری خود را شارژ کرده و دوباره امتحان کنید."</string>
@@ -688,9 +694,9 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"لغو"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"با این وجود، رد می‌شوید"</string>
     <string name="wifi_dont_skip" msgid="1677493161164629163">"رد نمی‌شوید"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، رایانه لوحی‌تان فقط از داده‌های شبکه تلفن همراه برای بارگیری‌ها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
-    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، دستگاهتان فقط از داده‌های شبکه تلفن همراه برای بارگیری‌ها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
-    <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، تلفنتان فقط از داده‌های شبکه تلفن همراه برای بارگیری‌ها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، رایانه لوحی‌تان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
+    <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، دستگاهتان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
+    <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"‏هشدار: اگر از اتصال Wi‑Fi صرف نظر کنید، تلفنتان فقط از داده‌های شبکه تلفن همراه برای دانلودها و به‌روزرسانی‌های اولیه استفاده خواهد کرد. برای اجتناب از هزینه‌های احتمالی داده‌های شبکه تلفن همراه، به Wi‑Fi وصل شوید."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6324917391996718760">"‏اگر به Wi‑Fi متصل نشوید:\n\n"<li>"رایانه لوحی‌تان اتصال اینترنت نخواهد داشت."</li>\n\n<li>"تا زمانی که به اینترنت وصل نشوید، به‌روزرسانی‌های نرم‌افزارها را دریافت نمی‌کنید."</li>\n\n<li>"در این زمان نمی‌توانید ویژگی‌های محافظت از دستگاه را فعال کنید."</li></string>
     <string name="wifi_and_mobile_skipped_message" product="device" msgid="1110629752293998468">"‏اگر به Wi‑Fi متصل نشوید:\n\n"<li>"دستگاهتان اتصال اینترنت نخواهد داشت."</li>\n\n<li>"تا زمانی که به اینترنت وصل نشوید، به‌روزرسانی‌های نرم‌افزارها را دریافت نمی‌کنید."</li>\n\n<li>"در این زمان نمی‌توانید ویژگی‌های محافظت از دستگاه را فعال کنید."</li></string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="8271524692702309267">"‏اگر به Wi‑Fi متصل نشوید:\n\n"<li>"تلفنتان اتصال اینترنت نخواهد داشت."</li>\n\n<li>"تا زمانی که به اینترنت وصل نشوید، به‌روزرسانی‌های نرم‌افزارها را دریافت نمی‌کنید."</li>\n\n<li>"در این زمان نمی‌توانید ویژگی‌های محافظت از دستگاه را فعال کنید."</li></string>
@@ -935,7 +941,7 @@
     <string name="memory_calculating_size" msgid="2188358544203768588">"در حال محاسبه..."</string>
     <string name="memory_apps_usage" msgid="5128673488173839077">"برنامه‌ها و داده‌های برنامه"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"رسانه"</string>
-    <string name="memory_downloads_usage" msgid="3755173051677533027">"بارگیری‌ها"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"دانلودها"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"عکس‌ها، ویدئوها"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"صوتی (موسیقی، آهنگ‌های زنگ، پادکست‌ها و موارد دیگر)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"سایر فایل‌ها"</string>
@@ -1018,7 +1024,7 @@
     <string name="storage_detail_cached" msgid="8547136365247818567">"داده‌های موجود در حافظه پنهان"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"موارد دیگر"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"کاوش <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="4894289482062047165">"‏موارد دیگر شامل فایل‌های به اشتراک گذاشته شده‌ای که برنامه‌ها ذخیره کرده‌اند، فایل‌های بارگیری شده از اینترنت یا بلوتوث، فایل‌های Android و غیره است. \n\nبرای دیدن کل محتوای این <xliff:g id="NAME">^1</xliff:g>، کاوش را لمس کنید."</string>
+    <string name="storage_detail_dialog_other" msgid="4894289482062047165">"‏موارد دیگر شامل فایل‌های به اشتراک گذاشته شده‌ای که برنامه‌ها ذخیره کرده‌اند، فایل‌های دانلود شده از اینترنت یا بلوتوث، فایل‌های Android و غیره است. \n\nبرای دیدن کل محتوای این <xliff:g id="NAME">^1</xliff:g>، کاوش را لمس کنید."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ممکن است عکس، موسیقی، فیلم، برنامه یا داده‌های دیگری داشته باشد که <xliff:g id="SIZE">^2</xliff:g> از حافظه را اشغال کرده است. \n\nبرای مشاهده جزئیات، به <xliff:g id="USER_1">^1</xliff:g> جابه‌جا شوید."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> خود را راه‌اندازی کنید"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"استفاده به عنوان فضای ذخیره‌سازی قابل حمل"</string>
@@ -1102,9 +1108,9 @@
     <string name="network_reset_not_available" msgid="7188610385577164676">"بازنشانی شبکه برای این کاربر در دسترس نیست"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"تنظیمات شبکه بازنشانی شد"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"بازنشانی دستگاه"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی داده‌های کارخانه"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های بارگیری شده"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"تنیمات و داده‌های برنامه و سیستم"</li>\n<li>"برنامه‌های بارگیری شده"</li></string>
+    <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی به داده‌های کارخانه"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"تنیمات و داده‌های برنامه و سیستم"</li>\n<li>"برنامه‌های دانلود شده"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"مشاهدهٔ اطلاعات حقوقی، وضعیت، نسخه نرم‌افزار"</string>
     <string name="legal_information" msgid="5769301644270604095">"اطلاعات حقوقی"</string>
     <string name="contributors_title" msgid="5917703088825286504">"شرکت کنندگان"</string>
+    <string name="manual" msgid="3025943393642974445">"دفترچه راهنما"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"اطلاعات تنظیمی"</string>
     <string name="copyright_title" msgid="865906688917260647">"حق نسخه‌برداری"</string>
     <string name="license_title" msgid="1990487604356037871">"مجوز"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"‏مجوز System WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"کاغذدیواری‌ها"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏ارائه‌دهندگان تصویر ماهواره‌ای:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"دفترچه راهنما"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"مشکلی در بارگیری دفترچه راهنما وجود دارد."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"مجوزهای منبع باز"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"مشکلی در بارگیری مجوزها وجود دارد."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"در حال بارگیری…"</string>
@@ -2157,7 +2166,7 @@
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"همگام‌سازی خودکار داده"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"سیم‌کارت‌ها"</string>
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"شبکه‌های تلفن همراه"</string>
-    <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"مکث با رسیدن به حد"</string>
+    <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"توقف موقت با رسیدن به حد"</string>
     <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"همگام‌سازی خودکار داده"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"همگام‌سازی خودکار داده‌های شخصی"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"همگام‌سازی خودکار داده‌های کاری"</string>
@@ -2217,7 +2226,7 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g>، براساس محاسبه رایانهٔ لوحی شما، استفاده شده است. ممکن است روش محاسبهٔ مقدار استفاده از داده توسط شرکت مخابراتی شما متفاوت باشد."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g>، براساس محاسبه گوشی شما، استفاده شده است. ممکن است روش محاسبهٔ مقدار استفاده از داده توسط شرکت مخابراتی شما متفاوت باشد."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"محدودیت‌های شبکه"</string>
-    <string name="data_usage_metered_body" msgid="3262343834446126044">"زمانی که مصرف داده پس‌زمینه محدود شده باشد، شبکه‌های اندازه‌گیری شده مانند شبکه تلفن همراه عمل می‌کنند. ممکن است برنامه‌ها قبل از استفاده از این شبکه‌ها برای بارگیری‌های بزرگ هشدار دهند."</string>
+    <string name="data_usage_metered_body" msgid="3262343834446126044">"زمانی که مصرف داده پس‌زمینه محدود شده باشد، شبکه‌های اندازه‌گیری شده مانند شبکه تلفن همراه عمل می‌کنند. ممکن است برنامه‌ها قبل از استفاده از این شبکه‌ها برای دانلودهای بزرگ هشدار دهند."</string>
     <string name="data_usage_metered_mobile" msgid="2326986339431119372">"شبکه‌های تلفن همراه"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"‏شبکه‌های Wi-Fi اندازه‌گیری شده"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏برای انتخاب شبکه‌های اندازه‌گیری شده، Wi‑Fi را روشن کنید."</string>
@@ -2498,10 +2507,11 @@
     <string name="keywords_reset_apps" msgid="6420313678620788457">"بازنشانی پیش‌فرض تنظیمات برگزیده"</string>
     <string name="keywords_emergency_app" msgid="6542122071127391103">"پیش‌فرض برنامه اضطراری در موارد اضطراری"</string>
     <string name="keywords_default_phone_app" msgid="90136554927956860">"پیش‌فرض شماره‌گیر تلفن"</string>
-    <string name="keywords_all_apps" msgid="5377153522551809915">"برنامه‌ها بارگیری برنامه‌ها سیستم"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"برنامه‌ها دانلود برنامه‌ها سیستم"</string>
     <string name="keywords_app_permissions" msgid="8677901415217188314">"امنیت مجوزهای برنامه‌ها"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"پیش‌فرض برنامه‌ها"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"نادیده گرفتن بهینه‌سازی حالت خواب و حالت آماده به‌کار برنامه"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"‏استاندارد طبیعی رنگ پرطراوت rgb srgb"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"لغزاندن گذرواژه الگو پین"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"نمایش تنظیم‌گر واسط کاربری سیستم"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"مجوزهای بیشتر"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> مورد دیگر"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"فقط هنگام شارژ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏انتقال فایل‌ها (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏انتقال عکس‌ها (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"درحال شارژ شدن"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"فقط این دستگاه شارژ شود"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"منبع نیرو"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"دستگاه متصل دیگر شارژ شود"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"انتقال فایل"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏انتقال فایل‌ها به Windows یا Mac (‏MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏انتقال عکس (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏انتقال عکس یا فایل، اگر MTP پشتیبانی نمی‌شود (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏استفاده از دستگاه برای ورودی MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏استفاده از USB برای"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"برنامه‌های غیرفعال"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"غیرفعال. برای تغییر حالت لمس کنید."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"این مجوز به برنامه امکان می‌دهد تنظیمات سیستم را تغییر دهد."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"بله"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"نه"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"دو بار بچرخانید تا دوربین باز شود"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"با دو بار چرخاندن مچتان، برنامه دوربین را باز کنید"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"دو ضربه روی دکمه روشن/خاموش برای دوربین"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"دوربین را سریع و بدون باز کردن قفل صفحه باز کنید"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"پرطروات (پیش‌فرض)"</item>
+    <item msgid="8446070607501413455">"طبیعی"</item>
+    <item msgid="6553408765810699025">"استاندارد"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"رنگ‌های پیشرفته"</item>
+    <item msgid="8280754435979370728">"رنگ‌های طبیعی به‌همان صورتی که با چشم دیده می‌شوند"</item>
+    <item msgid="5363960654009010371">"رنگ‌های بهینه‌شده برای محتوای دیجیتالی"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"حالت رنگ عکس"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏استفاده از sRGB"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 3a2d34c..951f586 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> tunnistetiedostoa määritetty</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> tunnistetiedosto määritetty</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Sormenjäljen määritys"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Ennen kuin voit käyttää sormenjälkeä näytön lukituksen avaamiseen ja ostoksien vahvistamiseen, sinun täytyy"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Määritä näytön varalukitustapa"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kun tämä kuvake on näkyvissä, voit tunnistautua tai vahvistaa ostoksen sormenjälkesi avulla."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Voit avata laitteesi lukituksen koskettamalla sormenjälkianturia."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Voit käyttää sormenjälkeäsi, kun tämä kuvake on näkyvissä."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ohitetaanko sormenjäljen määritys?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Olet valinnut sormenjäljen yhdeksi tavaksi avata puhelimesi lukitus. Jos ohitat tämän nyt, sinun on määritettävä se myöhemmin. Määritys kestää vain noin minuutin."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ota näytön lukitus käyttöön"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Valmis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hups, anturi ei ole siinä."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Käytä laitteen sormenjälkianturia."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Rekisteröitymistä ei suoritettu loppuun."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Sormenjäljen rekisteröinnin aikaraja on saavutettu. Yritä uudelleen."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Sormenjäljen rekisteröinti ei onnistunut. Yritä uudelleen tai käytä eri sormea."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lisää toinen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seuraava"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Puhelimen lukituksen avaamisen lisäksi voit käyttää sormenjälkeä ostoksien ja sovelluksien käyttöoikeuksien vahvistamiseen. "<annotation id="url">"Lisätietoja"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Näytä lakitiedot, tila, ohjelmiston versio"</string>
     <string name="legal_information" msgid="5769301644270604095">"Oikeudelliset tiedot"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Avustajat"</string>
+    <string name="manual" msgid="3025943393642974445">"Käyttöopas"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Lakitiedot"</string>
     <string name="copyright_title" msgid="865906688917260647">"Tekijänoikeudet"</string>
     <string name="license_title" msgid="1990487604356037871">"Käyttölupa"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"WebView-järjestelmälisenssi"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Taustakuvat"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelliittikuvat:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Käyttöopas"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ongelma ladattaessa käyttöopasta."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avoimen lähdekoodin käyttöluvat"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Käyttölupien lataamisessa esiintyi ongelma."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ladataan…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sovellusten käyttöoikeuksien suojaus"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"oletussovellukset"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ohita optimoinnit -torkkutila"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"voimakas rgb srgb väri luonnollinen normaali"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"liu\'uta salasana lukituksenpoistokuvio PIN-koodi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Näytä SystemUI-viritin"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Lisäkäyttöoikeudet"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> lisää"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Vain lataus"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Tiedostojen siirtäminen (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Kuvien siirtäminen (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Akun lataus"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Lataa vain tämä laite."</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Virtalähde"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Lataa toinen liitetty laite."</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Tiedostojen siirto"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Siirrä tiedostoja Windowsille tai Macille (MTP)."</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Valokuvien siirto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Siirrä valokuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Käytä laitetta MIDI-äänitulona."</string>
     <string name="usb_use" msgid="3372728031108932425">"Käytä USB:tä:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Epäaktiiviset sovellukset"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Epäaktiivinen. Ota käyttöön tai poista käytöstä koskettamalla."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Tämä käyttöoikeus sallii sovelluksen muokata järjestelmäasetuksia."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Kyllä"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kaksoiskääntäminen kameraa varten"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Avaa kamerasovellus kääntämällä rannettasi kahdesti"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera: paina virtapainiketta kahdesti"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Avaa kamera nopeasti avaamatta näytön lukitusta"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Voimakas (oletus)"</item>
+    <item msgid="8446070607501413455">"Luonnollinen"</item>
+    <item msgid="6553408765810699025">"Normaali"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Tehostetut värit"</item>
+    <item msgid="8280754435979370728">"Ihmissilmän näkemät luonnolliset värit"</item>
+    <item msgid="5363960654009010371">"Digitaaliselle sisällölle parhaiten sopivat värit"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Kuvien värit"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Ota sRGB käyttöön"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 863632b..dc7acf4 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale configurée</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configuration d\'empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Pour utiliser votre empreinte digitale afin de déverrouiller l\'écran ou de confirmer des achats, nous devons effectuer les opérations suivantes :"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurer le mode de verrouillage d\'écran d\'arrière-plan"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il suffit de toucher le capteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Lorsque vous voyez cette icône, vous pouvez utiliser votre empreinte digitale."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration plus tard. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurer le verrouil. de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Terminé"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oups, ce n\'est pas le capteur"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez capteur empreinte dig. sur appareil."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Le temps attribué pour l\'enregistrement des empreintes digitales est écoulé. Veuillez essayer de nouveau."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement des empreintes digitales ne fonctionne pas. Essayez à nouveau ou utilisez un autre doigt."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une ligne"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Informations légales, état et version du logiciel"</string>
     <string name="legal_information" msgid="5769301644270604095">"Renseignements juridiques"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributeurs"</string>
+    <string name="manual" msgid="3025943393642974445">"Manuel"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Infos réglementaires"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licence WebView du système"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fonds d\'écran"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fournisseurs d\'images satellite :\n© CNES/Astrium, DigitalGlobe, Bluesky 2014"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manuel"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Problème lors du chargement du manuel."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences Open Source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargement en cours..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"applications autorisations sécurité"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"applications par défaut"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"Ignorer les optimisations (mise en veille des application non utilisées)"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrantes rvb srvb couleurs naturelles standards"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisser mot de passe schéma nip"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer une balise NFC par Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Afficher les paramètres SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Autorisations supplémentaires"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> autre(s)"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charge seulement"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfert de fichiers (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfert de photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charge en cours..."</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Charger cet appareil seulement"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Source de courant"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charger l\'autre appareil connecté"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferts de fichiers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transférer des fichiers vers Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transfert de photos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferer des photos ou des fichiers si MTP n\'est pas pris en charge (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utiliser un appareil pour l\'entrée MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utiliser la connexion USB pour :"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Applications inactives"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactif. Touchez pour changer l\'état."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres du système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pivot. poignet deux fois pour app. photo"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application de l\'appareil photo en pivotant votre poignet deux fois"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"App. 2x sur interr. pr activ. app. photo"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Lancez rapidement l\'appareil photo sans déverrouiller l\'écran"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrantes (par défaut)"</item>
+    <item msgid="8446070607501413455">"Naturelles"</item>
+    <item msgid="6553408765810699025">"Standards"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Couleurs améliorées"</item>
+    <item msgid="8280754435979370728">"Couleurs naturelles, comme l\'œil les voit"</item>
+    <item msgid="5363960654009010371">"Couleurs optimisées pour le contenu numérique"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Mode couleur des images"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliser sRGB"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 841681a..95afd16 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale configurée</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configurer empreinte"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Pour utiliser votre empreinte digitale afin de déverrouiller l\'écran ou de confirmer des achats, nous devons effectuer les opérations suivantes :"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurer le mode de verrouillage de secours de l\'écran"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que cette icône apparaît, vous pouvez utiliser votre empreinte pour vous identifier ou autoriser un achat."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Lorsque cette icône s\'affiche, vous pouvez utiliser votre empreinte digitale."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration ultérieurement. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Verrouillage de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"OK"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Petit problème… Il ne s\'agit pas du capteur"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez le lecteur d\'empreintes intégré."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Délai d\'enregistrement de l\'empreinte digitale expiré. Veuillez réessayer."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement de l\'empreinte digitale n\'a pas fonctionné. Veuillez réessayer ou utiliser un autre doigt."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une empreinte"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
@@ -391,8 +397,8 @@
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Le mot de passe saisi est correct. Malheureusement, vos données sont corrompues. \n\nPour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Le mot de passe saisi est correct. Malheureusement, vos données sont corrompues. \n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Changer le mode de saisie"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Verrouillage de l\'écran"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez votre méthode de sauvegarde de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Modifier écran verr."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modifier ou désactiver la sécurité : schéma, code PIN ou mot de passe"</string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Informations légales, état et version du logiciel"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informations légales"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaborateurs"</string>
+    <string name="manual" msgid="3025943393642974445">"Manuel"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Réglementations"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licence WebView du système"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fonds d\'écran"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fournisseurs d\'images satellite :\n© CNES/Astrium, DigitalGlobe, Bluesky 2014"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manuel"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Un problème est survenu lors du chargement du manuel."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargement..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sécurité des autorisations des applications"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"applications par défaut"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorer les optimisations, mettre en veille l\'application"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"couleurs éclatantes rgb srgb couleur couleurs naturelles couleurs normales"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"faire glisser mot de passe schéma code d\'accès"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer un tag NFC pour Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Afficher l\'adaptateur de l\'IU système"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Autorisations supplémentaires"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> autres"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Charge uniquement"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transférer des fichiers (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transférer des photos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Charger"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Uniquement pour charger cet appareil"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Source d\'alimentation"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Charger l\'autre appareil connecté"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transférer des fichiers"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transférer des fichiers vers Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transférer des photos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transférer des photos ou des fichiers si MTP n\'est pas compatible (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utiliser l\'appareil pour l\'entrée MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utiliser la connexion USB pour"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Applications inactives"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Application inactive. Appuyez ici pour l\'activer."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Double rotation pour l\'appareil photo"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application Appareil photo en faisant pivoter votre poignet deux fois."</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Appuyer deux fois sur bouton Marche/Arrêt pour lancer caméra"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Lancez rapidement la caméra sans déverrouiller l\'écran."</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Couleurs éclatantes (par défaut)"</item>
+    <item msgid="8446070607501413455">"Couleurs naturelles"</item>
+    <item msgid="6553408765810699025">"Couleurs normales"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Couleurs améliorées"</item>
+    <item msgid="8280754435979370728">"Couleurs naturelles vues par l\'œil"</item>
+    <item msgid="5363960654009010371">"Couleurs optimisées pour les contenus numériques"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Mode de couleur des images"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliser sRGB"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index a4cfb4e..d286319 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -202,7 +202,7 @@
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Tipo de rede:"</string>
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Definir o tipo de rede preferido:"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Facer ping a IpAddr:"</string>
-    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Facer ping ao nome do servidor (www.google.com):"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Facer ping ao nome de host (www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"Proba de cliente HTTP:"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"Executar proba de ping"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
@@ -322,6 +322,7 @@
       <item quantity="other">Configuráronse <xliff:g id="COUNT_1">%1$d</xliff:g> impresións dixitais</item>
       <item quantity="one">Configurouse <xliff:g id="COUNT_0">%1$d</xliff:g> impresión dixital</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. identificación"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Para usar a túa impresión dixital para desbloquear a túa pantalla ou confirmar compras, teremos que:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurar o método de bloqueo da pantalla en segundo plano"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cando vexas esta icona, podes usar a túa impresión dixital para a identificación ou para autorizar unha compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Simplemente toca o sensor de impresións dixitais para activar e desbloquear o teu dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Cando vexas esta icona, podes usar a túa impresión dixital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omitir configuración impresión dixital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Decidiches usar a túa impresión dixital para desbloquear o teu teléfono. Se omites este paso agora, terás que configuralo máis tarde. Non tardarás máis dun minuto en facelo."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo da pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Feito"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Iso non é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utiliza o sensor de impresión dixital."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Non se completou a inscrición"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Esgotouse o tempo de espera da inscrición de impresión dixital. Téntao de novo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"A inscrición de impresión dixital non funcionou. Téntao de novo ou utiliza outro dedo."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Engadir outro"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ademais de desbloquear o teu teléfono, tamén podes utilizar a túa impresión dixital para autorizar compras e o acceso a aplicacións. "<annotation id="url">"Máis información"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Mostra información legal, o estado e a versión do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Información normativa"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licenza WebView do sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fondos de pantalla"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Provedores de imaxes por satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Hai un problema para cargar o manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenzas de código aberto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hai un problema para cargar as licenzas."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando..."</string>
@@ -1505,7 +1514,7 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configuración do teclado físico"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opcións de programador"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Definir as opcións de desenvolvemento de aplicacións"</string>
-    <string name="development_settings_not_available" msgid="4308569041701535607">"As opcións de programador non están dispoñibles para este usuario"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"As opcións do programador non están dispoñibles para este usuario"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"A configuración da VPN non está dispoñible para este usuario"</string>
     <string name="tethering_settings_not_available" msgid="6765770438438291012">"A configuración da ancoraxe non está dispoñible para este usuario"</string>
     <string name="apn_settings_not_available" msgid="7873729032165324000">"A configuración do nome do punto de acceso non está dispoñible para este usuario"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguranza dos permisos das aplicacións"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplicacións predeterminadas"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar optimizacións do modo de espera da aplicación"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"estándar rgb srgb cor natural estándar"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"pasar o dedo contrasinal padrón pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC wifi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador da IU do sistema"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisos adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> máis"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Só durante a carga"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir ficheiros (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Cargando"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Só carga o dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentación"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carga outro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferencias de ficheiros"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfire ficheiros a Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferencia de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferencia de fotos ou ficheiros se MTP non é compatible (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Usa o dispositivo para a entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicacións inactivas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Aplicación inactiva. Toca para activala."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Con este permiso unha aplicación pode modificar a configuración do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Si"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dobre xiro para abrir a cámara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Xira o pulso dúas veces para abrir a aplicación da cámara"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Premer botón de acendido dúas veces para abrir a cámara"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abre a cámara rapidamente sen desbloquear a pantalla"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Brillante (predeterminado)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Estándar"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Cores melloradas"</item>
+    <item msgid="8280754435979370728">"Cores naturais tal e o como se ven"</item>
+    <item msgid="5363960654009010371">"Cores optimizadas para contido dixital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imaxe"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliza sRGB"</string>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 980fec6..3f2ecc6 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"ફિંગરપ્રિન્ટ સેટઅપ"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"તમારી સ્ક્રીન અનલૉક કરવા અથવા ખરીદીની પુષ્ટિ કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા , તમને આની જરૂર પડશે:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"તમારી બેકઅપ સ્ક્રીન લૉક પદ્ધતિને સેટ કરો"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"જ્યારે પણ તમે આ આઇકન જુઓ, તમે ઓળખ માટે અથવા ખરીદી અધિકૃત કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"તમારા ઉપકરણને સક્રિય કરવા અને અનલૉક કરવા માટે માત્ર ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"જ્યારે તમે આ આયકન જુઓ, ત્યારે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ફિંગરપ્રિન્ટ સેટ કરવાનું છોડીએ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"તમે તમારા ફોનને અનલૉક કરવા માટેની એક રીત તરીકે તમારી ફિંગરપ્રિન્ટને ઉપયોગમાં લેવાનું પસંદ કર્યું છે. જો તમે હવે છોડી દો છો, તો તમારે આને પછીથી સેટ કરવું પડશે. સેટઅપમાં માત્ર એક મિનિટ અથવા તેથી વધુ સમય લાગે છે."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"સ્ક્રીન લૉક સેટ કરો"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"થઈ ગયું"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ઓહ, તે સેન્સર નથી"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"તમારા ઉપકરણ પર ફિંગરપ્રિન્ટ સેન્સરનો ઉપયોગ કરો."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"નોંધણી પૂર્ણ થઈ ન હતી"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ફિંગરપ્રિન્ટ નોંધણીની સમય મર્યાદા સુધી પહોંચી ગયાં. ફરીથી પ્રયાસ કરો."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ફિંગરપ્રિન્ટ નોંધણી કામ કરતી ન હતી. ફરીથી પ્રયાસ કરો અથવા એક અલગ આંગળીનો ઉપયોગ કરો."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"બીજી ઉમેરો"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"આગલું"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"તમારા ફોનને અનલૉક કરવા ઉપરાંત, તમે ખરીદીઓ અને એપ્લિકેશન અ‍ૅક્સેસને અધિકૃત કરવા માટે તમારી ફિંગરપ્રિન્ટનો પણ ઉપયોગ કરી શકો છો. "<annotation id="url">"વધુ જાણો"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"કાનૂની માહિતી, સ્થિતિ, સોફ્ટવેર સંસ્કરણ જુઓ"</string>
     <string name="legal_information" msgid="5769301644270604095">"કાનૂની માહિતી"</string>
     <string name="contributors_title" msgid="5917703088825286504">"સહયોગકર્તાઓ"</string>
+    <string name="manual" msgid="3025943393642974445">"મેન્યુઅલ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"નિયમનકારી માહિતી"</string>
     <string name="copyright_title" msgid="865906688917260647">"કોપિરાઇટ"</string>
     <string name="license_title" msgid="1990487604356037871">"લાઇસેંસ"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"સિસ્ટમ વેબવ્યૂ લાઇસેંસ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"વૉલપેપર્સ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ઉપગ્રહ છબી પ્રદાતાઓ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"મેન્યુઅલ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"મેન્યુઅલ લોડ કરવામાં સમસ્યા છે."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ખુલ્લા સ્ત્રોત લાઇસેંસેસ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"લાઇસેંસેસ લોડ કરવામાં સમસ્યા છે."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"લોડ કરી રહ્યું છે..."</string>
@@ -2504,6 +2513,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"એપ્લિકેશનો પરવાનગીઓની સુરક્ષા"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"એપ્લિકેશનો ડિફોલ્ટ"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ઓપ્ટિમાઇઝેશન્સ ડોઝ એપ્લિકેશન સ્ટેન્ડબાયને અવગણો"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"વાઇબ્રન્ટ rgb srgb રંગ કુદરતી માનક"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"સ્લાઇડ પાસવર્ડ પેટર્ન પિન"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ટેગ સેટ કરો"</string>
     <string name="write_tag" msgid="8571858602896222537">"લખો"</string>
@@ -2801,10 +2811,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ટયુનર બતાવો"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"વધારાની પરવાનગીઓ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> વધુ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"માત્ર ચાર્જીંગ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ફાઇલો ટ્રાન્સફર કરો (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ફોટા ટ્રાન્સફર કરો (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ચાર્જિંગ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"બસ આ ઉપકરણને ચાર્જ કરો"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"પાવર સપ્લાય"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"અન્ય કનેક્ટ થયેલ ઉપકરણોને ચાર્જ કરો"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ફાઇલ સ્થાનાંતરણ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows અથવા Mac પર ફાઇલો સ્થાનાંતરિત કરો (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ફોટો સ્થાનાંતરણ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"જો MTP સમર્થિત ન હોય તો ફોટા અથવા ફાઇલો સ્થાનાંતરિત કરો (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ઇનપુટ માટે ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use" msgid="3372728031108932425">"આ માટે USB નો ઉપયોગ કરો"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"નિષ્ક્રિય એપ્લિકેશનો"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"નિષ્ક્રિય. ટોગલ કરવા માટે ટચ કરો."</string>
@@ -2870,4 +2886,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"આ પરવાનગી એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ સંશોધિત કરવાની મંજૂરી આપે છે."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"હા"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"નહીં"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"કૅમેરા માટે બે વાર મરડો"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"તમારા કાંડાને બે વાર મરડીને કૅમેરા એપ્લિકેશન ખોલો"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"કૅમેરા માટે બે વખત પાવર બટન દબાવો"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"તમારી સ્ક્રીન અનલૉક કર્યાં વગર ઝડપથી કૅમેરો ખોલો"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"વાઇબ્રન્ટ (ડિફોલ્ટ)"</item>
+    <item msgid="8446070607501413455">"કુદરતી"</item>
+    <item msgid="6553408765810699025">"માનક"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"વધારેલ રંગો"</item>
+    <item msgid="8280754435979370728">"આંખો વડે જોઈ શકાતાં કુદરતી રંગો"</item>
+    <item msgid="5363960654009010371">"ડિજિટલ સામગ્રી માટે ઓપ્ટિમાઇઝ કરાયેલા રંગો"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"ચિત્ર રંગ મોડ"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB નો ઉપયોગ કરો"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5e583d0..7cbc132 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"अंगुली की छाप सेटअप"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"अपनी स्‍क्रीन अनलॉक करने या खरीदारी की पुष्‍टि करने हेतु आपके फ़िंगरप्रिंट का उपयोग करने के लिए, हमे इनकी आवश्‍यकता होगी:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"अपनी बैकअप स्‍क्रीन लॉक विधि सेट करें"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"जब आपको यह आइकन दिखाई दे, तो आप अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. यदि आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में लगभग एक मिनट लगता है."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्‍क्रीन लॉक सेट करें"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"हो गया"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह संवेदक नहीं है"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"डिवाइस पर फ़िंगरप्रिंट संवेदक का उपयोग करें."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"नामांकन पूर्ण नहीं हुआ था"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फ़िंगरप्रिंट नामांकन समय की सीमा पार हो गई है. फिर से प्रयास करें."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फ़िंगरप्रिंट नामांकन ने काम नहीं किया. फिर से प्रयास करें या किसी दूसरी अंगुली का उपयोग करें."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"कोई अन्‍य जोड़ें"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ ही, खरीदी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"और जानें"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"क़ानूनी जानकारी, स्‍थिति, सॉफ़्टवेयर वर्शन देखें"</string>
     <string name="legal_information" msgid="5769301644270604095">"कानूनी जानकारी"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ता"</string>
+    <string name="manual" msgid="3025943393642974445">"मैन्युअल"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"विनियामक जानकारी"</string>
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"लाइसेंस"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"सिस्टम WebView लाइसेंस"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वॉलपेपर"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह इमेजरी प्रदाता:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"मैन्युअल"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"मैन्युअल को लोड करने में कोई समस्‍या है."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ओपन सोर्स लाइसेंस"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"लाइसेंस लोड करने में एक समस्‍या है."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड हो रहा है..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ऐप्स अनुमति सुरक्षा"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ऐप्‍स डिफ़ॉल्‍ट"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ऑप्टिमाइज़ेशन अनदेखा करना ऐप को स्टैंडबाय में ले जाता है"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"चमकीला rgb srgb रंग प्राकृतिक मानक"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"स्लाइड पासवर्ड प्रतिमान पिन"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दिखाएं"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त अनुमतियां"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> और"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"केवल चार्जिंग"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"फ़ाइलों का स्थानांतरण (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फ़ोटो का स्थानांतरण (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"चार्ज हो रहा है"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"केवल इस डिवाइस को चार्ज करें"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ऊर्जा की आपूर्ति"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"अन्य कनेक्ट किए गए डिवाइस को चार्ज करें"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"फ़ाइल ट्रांसफर"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"फ़ाइलों को Windows या Mac (MTP) पर ट्रांसफर करें"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"फ़ोटो ट्रांसफर (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP समर्थित नहीं होने पर फ़ोटो या फ़ाइलें ट्रांसफर करें (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI इनपुट के लिए डिवाइस का उपयोग करें"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB का उपयोग इसके लिए करें"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"निष्क्रिय ऐप्स"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"निष्क्रिय. टॉगल करने के लिए स्पर्श करें."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"यह अनुमति किसी ऐप को सिस्टम सेटिंग बदलने देती है."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"हां"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"नहीं"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"कैमरे के लिए दो बार मोड़ना"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"अपनी कलाई को दो बार मोड़कर कैमरा ऐप खोलें"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कैमरे के लिए पावर बटन दो बार दबाएं"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"अपनी स्‍क्रीन को अनलाॅक किए बिना अपना कैमरा तुरंत खोलें"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"चमकीला (डिफ़ॉल्ट)"</item>
+    <item msgid="8446070607501413455">"स्वाभाविक"</item>
+    <item msgid="6553408765810699025">"मानक"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"बेहतर रंग"</item>
+    <item msgid="8280754435979370728">"आंखों को दिखाई देने वाले प्राकृतिक रंग"</item>
+    <item msgid="5363960654009010371">"डिजिटल सामग्री के लिए ऑप्टिमाइज़़ किए गए रंग"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रंग मोड"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB का उपयोग करें"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 49699ec..c726d44 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -324,6 +324,7 @@
       <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> otiska prsta postavljena</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> otisaka prsta postavljeno</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Postavljanje otiska"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Da biste mogli upotrebljavati otisak prsta za otključavanje zaslona ili potvrđivanje kupnje, morat ćete učiniti sljedeće:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Postavite pričuvni način zaključavanja zaslona"</string>
@@ -348,10 +349,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kada se prikaže ta ikona, možete se identificirati ili autorizirati kupnju otiskom prsta."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Jednostavno dodirnite senzor otiska prsta da biste aktivirali i otključali uređaj."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kada vidite ovu ikonu, možete upotrijebiti otisak prsta."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti postavljanje otiska prsta?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Odlučili ste se za otisak prsta kao jedan od načina za otključavanje telefona. Ako sad preskočite, morat ćete ga postaviti kasnije. Postavljanje traje samo otprilike jednu minutu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Postavi zaključavanje zaslona"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nije senzor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Upotrijebite senzor otiska prsta na uređaju."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija nije dovršena"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Isteklo je vremensko ograničenje za registraciju otiska prsta. Pokušajte ponovo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registracija otiska prsta nije uspjela. Pokušajte ponovo ili prislonite neki drugi prst."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj drugo"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalje"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Kupnje i pristup aplikacija možete osim otključavanjem telefona autorizirati i otiskom prsta. "<annotation id="url">"Saznajte više"</annotation></string>
@@ -1217,6 +1223,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Prikaži pravne informacije, status, verziju softvera"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Suradnici"</string>
+    <string name="manual" msgid="3025943393642974445">"Priručnik"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informacije o propisima"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorska prava"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
@@ -1224,6 +1231,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"WebView licenca sustava"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Pozadine"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Davatelji satelitskih slika:\n©2014. CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Priručnik"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Došlo je do problema prilikom učitavanja priručnika."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence otvorenog koda"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Došlo je do problema s učitavanjem licenci."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Učitavanje…"</string>
@@ -2511,6 +2520,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikacije dopuštenja sigurnost"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacije zadano"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"zanemari optimizacije mirovanje aplikacija čekanje"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"živopisno rgb srgb boja prirodno standardno"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kliziti zaporka uzorak PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavite oznaku NFC za Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
@@ -2816,10 +2826,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Prikaži Prijamnik kor. suč."</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Dodatna dopuštenja"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Još <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Samo punjenje"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Prijenos datoteka (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prijenos fotografija (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Punjenje"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Samo punjenje uređaja"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Napajanje"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Punjenje drugog povezanog uređaja"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Prijenosi datoteka"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Prijenos datoteka na Windows ili Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Prijenos fotografija (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prijenos fotografija i datoteka ako MTP nije podržan (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Upotreba uređaja za MIDI ulaz"</string>
     <string name="usb_use" msgid="3372728031108932425">"Svrha upotrebe USB-a"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivne aplikacije"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivno. Dodirnite za prebacivanje."</string>
@@ -2886,4 +2902,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To dopuštenje omogućuje aplikaciji izmjenu postavki sustava."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dvostruko obrtanje za fotoaparat"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvaranje aplikacije fotoaparata obrtanjem ručnog zgloba dvaput"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Pritisnite uključ. dvaput za fotoaparat"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Brzo otvaranje fotoaparata bez otključavanja zaslona"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Živopisno (zadano)"</item>
+    <item msgid="8446070607501413455">"Prirodno"</item>
+    <item msgid="6553408765810699025">"Standardno"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Poboljšane boje"</item>
+    <item msgid="8280754435979370728">"Prirodan doživljaj boje"</item>
+    <item msgid="5363960654009010371">"Boje optimizirane za digitalni sadržaj"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Način boje slike"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Upotrijebi sRGB"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2383771..3256393 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ujjlenyomat beállítása</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ujjlenyomat beállítása</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Ujjlenyomat beállítása"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Ahhoz, hogy ujjlenyomatával oldhassa fel a képernyőt vagy erősíthesse meg vásárlásait, a következőkre van szükségünk:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Állítsa be a másodlagos képernyőzárat"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ha ezt az ikont látja, akkor lehetősége van arra, hogy ujjlenyomatával azonosítsa magát, vagy engedélyezze a vásárlást."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Csak érintse meg az ujjlenyomat-érzékelőt az eszköz felébresztéséhez és feloldásához."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ha ezt az ikont látja, használhatja ujjlenyomatát."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Átugorja az ujjllenyomat-beállítást?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Kiválasztotta, hogy ujjlenyomattal is feloldhassa telefonját. Ha most kihagyja a lépéseket, később kell majd beállítania a funkciót. Ez hozzávetőlegesen 1 percet vesz igénybe."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Képernyőzár beállítása"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Kész"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hoppá! Az nem az érzékelő"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Használja az eszköz ujjlenyomat-érzékelőjét."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"A regisztráció nincs kész"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Letelt az ujjlenyomat-regisztráció időkorlátja. Próbálja újra."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Az ujjlenyomat regisztrációja nem sikerült. Próbálja újra, vagy próbálkozzon egy másik ujjával."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Még egy hozzáadása"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Következő"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"A telefon feloldásán kívül az ujjlenyomattal a vásárlásokat és az alkalmazások hozzáféréseit is engedélyezheti. "<annotation id="url">"További információ"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Jogi információk, állapot, szoftververzió megtekintése"</string>
     <string name="legal_information" msgid="5769301644270604095">"Jogi információk"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Közreműködők"</string>
+    <string name="manual" msgid="3025943393642974445">"Útmutató"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Szabályozási információk"</string>
     <string name="copyright_title" msgid="865906688917260647">"Szerzői jog"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenc"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"WebView-rendszerlicenc"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Háttérképek"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"A műholdképek szolgáltatói:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Útmutató"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Probléma adódott az útmutató betöltésekor."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Nyílt forráskódú licencek"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Gond van a licencek betöltésével."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Betöltés…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"alkalmazások engedélyek biztonság"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"Alkalmazások alapbeállításai"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"optimalizálás figyelmen kívül hagyása, szunyókálás, alkalmazás, készenlét"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"élénk RGB SRGB szín természetes normál"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"csúsztatás jelszó minta pin kód"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC-címke beállítása"</string>
     <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Kezelőfelület-hangoló megjelenítése"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"További engedélyek"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> további"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Csak töltés"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Fájlok átvitele (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotók átvitele (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Töltődik"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Csak töltse az eszközt"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Töltés"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Töltse a másik csatlakoztatott eszközt"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fájlátvitel"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Fájlok átvitele Windows rendszerre vagy Mac típusú számítógépekre (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotóátvitel (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotók vagy fájlok átvitele, ha az MTP nem támogatott (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Eszköz használata MIDI-bemenethez"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB használata a következő célra:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktív alkalmazások"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktív: A váltáshoz érintse meg."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ez az engedély lehetővé teszi az alkalmazás számára a rendszerbeállítások módosítását."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Igen"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nem"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"A kamera eléréshez forgassa kétszer a csuklóját"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Nyissa meg a Fényképezőgép alkalmazást kétszeri csuklófordítással"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"A kamerához nyomja meg a bekapcsológombot kétszer"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"A kamera gyors megnyitása a képernyő feloldása nélkül"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Élénk (alapértelmezett)"</item>
+    <item msgid="8446070607501413455">"Természetes"</item>
+    <item msgid="6553408765810699025">"Normál"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Erős színek"</item>
+    <item msgid="8280754435979370728">"Természetes színek, ahogyan azt az emberi szem is látja"</item>
+    <item msgid="5363960654009010371">"Digitális tartalomhoz optimalizált színek"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Kép színe mód"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB használata"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 152a8e6..f19c6a6 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Մատնահետքի գրանցում"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Մատնահետքի միջոցով էկրանն ապակողպելու կամ գնումները հաստատելու համար մեզ անհրաժեշտ է՝"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Կարգավորեք պահուստային էկրանի կողպման եղանակը"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Եթե տեսնում եք այս պատկերակը, դա նշանակում է, որ կարող եք օգտագործել ձեր մատնահետքը՝ նույնականացում կատարելու կամ գնումը թույլատրելու համար:"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Սարքը քնի ռեժիմից հանելու և ապակողպելու համար պարզապես հպեք մատնահետքի սենսորին:"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Մատնահետքը կարող եք օգտագործել ամեն անգամ, երբ ցուցադրվում է այս պատկերակը:"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Բաց թողնե՞լ մատնահետքի կարգավորումը:"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Դուք ընտրել եք մատնահետքի օգտագործումը որպես հեռախոսն ապակողպելու եղանակներից մեկը: Եթե բաց թողնեք հիմա, ապա ձեզ անհրաժեշտ կլինի կատարել կարգավորումն ավելի ուշ: Կարգավորումը տևում է ընդամենը մոտ մեկ րոպե:"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Էկրանի կողպման կարգավորում"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Պատրաստ է"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Դա սենսորը չէ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Օգտագործեք մատնահետքի սենսորը:"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Գրանցումը չի ավարտվել"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Մատնահետքի գրանցման ժամանակը սպառվել է: Փորձեք նորից:"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Մատնահետքը չգրանցվեց: Փորձեք նորից կամ փորձեք այլ մատ:"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ավելացնել այլ մատնահետք"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Հաջորդը"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Բացի հեռախոսը ապակողպելուց՝ մատնահետքը կարող եք նաև օգտագործել գնումները հաստատելու և հավելվածներից օգտվելու համար: "<annotation id="url">"Մանրամասն"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Դիտել իրավական տեղեկությունները, կարգավիճակը, ծրագրի տարբերակը"</string>
     <string name="legal_information" msgid="5769301644270604095">"Իրավական տեղեկատվություն"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Աջակցողներ"</string>
+    <string name="manual" msgid="3025943393642974445">"Ձեռքով"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Կանոնակարգման տեղեկատվություն"</string>
     <string name="copyright_title" msgid="865906688917260647">"Հեղինակային իրավունք"</string>
     <string name="license_title" msgid="1990487604356037871">"Արտոնագիր"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Համակարգի WebView-ի լիցենզիա"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Պաստառներ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Արբանյակային պատկերների մատակարարներ՝\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Ձեռքով"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ձեռնարկը բեռնելու խնդիր կա:"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Բաց կոդով ծրագրաշարի արտոնագրեր"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Խնդիր կա լիցենզիաները բեռնելիս:"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Բեռնում...."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"հավելվածների թույլտվություններին վերաբերող անվտանգություն"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"կանխադրված հավելվածները"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"անտեսել օպտիմալացումները Doze հավելվածի նիրհի ռեժիմի դեպքում"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"պայծառ rgb srgb գույն բնական սովորական"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"սահեցնել գաղտնաբառ նախշ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Ցուցադրել Համակարգի ՕՄ-ի կարգավորիչը"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Լրացուցիչ թույլտվություններ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Եվս <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Միայն լիցքավորման"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Ֆայլերի փոխանցման (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Լուսանկարների փոխանցման (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Լիցքավորում"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Պարզապես այս սարքի լիցքավորում"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Հոսանքի սնուցում"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Այլ կապակցված սարքի լիցքավորում"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Ֆայլերի փոխանցումներ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Ֆայլերի փոխանցում Windows-ին կամ Mac-ին (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Լուսանկարի փոխանցում (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Լուսանկարների կամ ֆայլերի փոխանցում, եթե MTP-ն չի աջակցվում (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Սարքի օգտագործում MIDI ներածման համար"</string>
     <string name="usb_use" msgid="3372728031108932425">"Օգտագործել հետևյալ USB կապակցումը՝"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Միացրած հավելվածներ"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Անջատված: Հպեք՝ փոխարկելու համար:"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Միացնելով այս թույլտվությունը՝ թույլ եք տալիս հավելվածին փոփոխել համակարգի կարգավորումները:"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Այո"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ոչ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Տեսախցիկի բացում կրկնակի պտտման միջոցով"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Տեսախցիկի բացում դաստակի կրկնակի պտտման միջոցով"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Խցիկ - սնուցման կոճակի կրկնակի սեղմամբ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Խցիկի արագ բացում առանց էկրանը ապակողպելու"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Պայծառ (կանխադրված)"</item>
+    <item msgid="8446070607501413455">"Բնական"</item>
+    <item msgid="6553408765810699025">"Սովորական"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Բարելավված գույներ"</item>
+    <item msgid="8280754435979370728">"Բնական գույներ"</item>
+    <item msgid="5363960654009010371">"Թվային բովանդակության համար հարմարեցված գույներ"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Նկարի գունային ռեժիմ"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Օգտագործել sRGB"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c7471fc..f2cb83f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> sidik jari disiapkan</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> sidik jari disiapkan</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Penyiapan sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Untuk menggunakan sidik jari guna membuka kunci layar atau mengonfirmasi pembelian, kami perlu:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Menyiapkan metode kunci layar cadangan"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Setiap kali melihat ikon ini, Anda dapat menggunakan sidik jari untuk identifikasi atau mengotorisasi pembelian."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cukup sentuh sensor sidik jari untuk membangunkan dan membuka kunci perangkat."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Jika melihat ikon ini, Anda dapat menggunakan sidik jari."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Lewati penyiapan sidik jari?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan sidik jari sebagai satu cara untuk membuka kunci perangkat. Jika dilewati sekarang, Anda harus menyiapkannya nanti. Penyiapan hanya memerlukan waktu sekitar satu menit."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Siapkan kunci layar"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Selesai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, bukan itu sensornya"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gunakan sensor sidik jari di perangkat."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Pendaftaran tidak selesai"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Batas waktu pendaftaran sidik jari tercapai. Coba lagi."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Pendaftaran sidik jari tidak berhasil. Coba lagi atau gunakan jari lain."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Tambahkan yang lain"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Berikutnya"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Selain membuka kunci ponsel, Anda juga dapat menggunakan sidik jari untuk mengotorisasi pembelian dan akses aplikasi. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Lihat info legal, status, versi perangkat lunak"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informasi hukum"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontributor"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informasi pengaturan"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensi"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Lisensi WebView Sistem"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Wallpaper"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Penyedia citra satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ada masalah saat memuat manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Lisensi sumber terbuka"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ada masalah saat memuat lisensi."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Memuat…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"keamanan izin aplikasi"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplikasi default"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"abaikan pengoptimalan nonaktifkan aplikasi siaga"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"terang rgb srgb warna alami standar"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"geser pin pola sandi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Siapkan Tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Tampilkan Penyetel SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Izin tambahan"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> lainnya"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Hanya untuk pengisian daya"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transfer file (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfer foto (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Mengisi daya"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Isi daya perangkat ini saja"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Pasokan daya"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Isi daya perangkat lain yang terhubung"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transfer file"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfer file ke Windows atau Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transfer foto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfer foto atau file jika MTP tidak didukung (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gunakan perangkat untuk masukan MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gunakan USB untuk"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplikasi yang tidak aktif"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Tidak aktif. Sentuh untuk mengalihkan."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Izin ini memungkinkan aplikasi mengubah setelan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Putar dua kali untuk kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Membuka aplikasi kamera dengan memutar pergelangan tangan dua kali"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tekan tombol daya dua kali untuk kamera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Buka kamera dengan cepat tanpa membuka kunci layar"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Terang (default)"</item>
+    <item msgid="8446070607501413455">"Alami"</item>
+    <item msgid="6553408765810699025">"Standar"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Warna yang disempurnakan"</item>
+    <item msgid="8280754435979370728">"Warna-warni alami seperti yang dilihat oleh mata"</item>
+    <item msgid="5363960654009010371">"Warna yang dioptimalkan untuk konten digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Mode warna gambar"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gunakan sRGB"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index b543833..ee4572a 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingrafar sett upp</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingraför sett upp</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Uppsetning fingrafara"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Til að þú getir notað fingrafarið þitt til að taka skjáinn úr lás eða staðfesta kaup þurfum við að:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Settu upp varaleið fyrir skjálásinn"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alltaf þegar þú sérð þetta tákn geturðu notað fingrafarið þitt til að auðkenna þig eða til að heimila kaup."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Snertu einfaldlega fingrafaraskynjarann til að taka tækið úr biðstöðu og lás."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Þegar þú sérð þetta tákn geturðu notað fingrafarið."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Viltu sleppa uppsetningu fingrafars?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Þú hefur valið að nota fingrafar þitt sem leið til að opna símann þinn. Ef þú sleppir þessu núna þarftu að setja þetta upp seinna. Uppsetningin tekur einungis um eina mínútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Setja upp skjálás"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Lokið"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Úbbs, þetta er ekki skynjarinn"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Notaðu fingrafaraskynjarann á tækinu."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Innritun var ekki lokið"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingrafarsinnritun rann út á tíma. Reyndu aftur."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingrafarsinnritun virkaði ekki. Reyndu aftur eða notaðu annan fingur."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Bæta öðru við"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Áfram"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Auk þess að taka símann úr lás geturðu notað fingrafarið til að heimila kaup og aðgang að forritum. "<annotation id="url">"Frekari upplýsingar"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Skoða lagalegar upplýsingar, stöðu, útgáfu hugbúnaðar"</string>
     <string name="legal_information" msgid="5769301644270604095">"Lagalegar upplýsingar"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Meðhöfundar"</string>
+    <string name="manual" msgid="3025943393642974445">"Handbók"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Lögbundnar upplýsingar"</string>
     <string name="copyright_title" msgid="865906688917260647">"Höfundarréttur"</string>
     <string name="license_title" msgid="1990487604356037871">"Leyfi"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Leyfi vefglugga í kerfi"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Veggfóður"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Gervihnattamyndir frá:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Handbók"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Vandamál kom upp við að hlaða handbókina."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Leyfi opins kóða"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Vandamál kom upp við að hlaða leyfin."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Hleður…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"öryggi forritsheimilda"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"sjálfgefin forrit"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"hunsa sparnaður blunda forrit bið"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"líflegir rgb srgb litir náttúrulegir hefðbundnir"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"renna aðgangsorð mynstur pin-númer"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Sýna fínstillingar kerfisviðmóts"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Viðbótarheimildir"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> í viðbót"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Hleðslu eingöngu"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Skráaflutning (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Myndaflutning (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Í hleðslu"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Bara hlaða þetta tæki"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Rafmagn"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Hlaða hitt tengda tækið"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Skráaflutningur"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Flytja skrár yfir í Windows eða Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Myndaflutningur (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Flytja myndir eða skrár ef MTP er ekki stutt (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Nota tæki fyrir MIDI-inntak"</string>
     <string name="usb_use" msgid="3372728031108932425">"Nota USB fyrir"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Óvirk forrit"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Óvirkt. Snertu til að breyta."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Þessi heimild leyfir forriti að breyta kerfisstillingum."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Já"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Tvöfaldur snúningur fyrir myndavél"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Opnaðu myndavélarforritið með því að snúa úlnliðnum tvisvar"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Ýttu tvisvar á aflrofann til að opna myndavélina"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Opnaðu myndavélina hratt án þess að taka skjáinn úr lás"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Líflegir (sjálfgefið)"</item>
+    <item msgid="8446070607501413455">"Náttúrulegir"</item>
+    <item msgid="6553408765810699025">"Hefðbundnir"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Áhrifaríkir litir"</item>
+    <item msgid="8280754435979370728">"Náttúrulegir litir eins og augað nemur þá"</item>
+    <item msgid="5363960654009010371">"Litir sérhannaðir fyrir stafrænt efni"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Litastilling mynda"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Nota sRGB"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 23f50d4..1fde08c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impronte digitali configurate</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impronta digitale configurata</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configura impronta digitale"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Per sbloccare lo schermo o confermare acquisti con l\'impronta digitale, devi:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Impostare il metodo di blocco schermo dello sfondo"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando viene visualizzata questa icona, puoi utilizzare la tua impronta digitale per l\'identificazione o per autorizzare un acquisto."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tocca il sensore delle impronte digitali per riattivare e sbloccare il dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quando vedi questa icona, significa che puoi utilizzare l\'impronta digitale."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Saltare configurazione impronta digitale?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hai scelto anche l\'utilizzo dell\'impronta digitale tra i vari metodi per sbloccare il telefono. Se salti la configurazione ora, dovrai eseguirla in un secondo momento. Basta un minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Imposta blocco schermo"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fine"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ops, questo non è il sensore"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Usa sensore impronte digitali su dispositivo."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'iscrizione non è stata completata"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Timeout iscrizione mediante impronta digitale. Riprova."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Iscrizione mediante impronta digitale non riuscita. Riprova o utilizza un dito diverso."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Aggiungine un\'altra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Avanti"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Oltre che per sbloccare il telefono, puoi utilizzare la tua impronta digitale per autorizzare acquisti e accessi alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Visualizza informazioni legali, stato, versione del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaboratori"</string>
+    <string name="manual" msgid="3025943393642974445">"Manuale"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Normative"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licenza di sistema per WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Sfondi"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fornitori di immagini satellitari:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manuale"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Si è verificato un problema durante il caricamento del manuale."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenze open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Errore durante il caricamento delle licenze."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Caricamento..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sicurezza delle autorizzazioni app"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"impostazioni predefinite per le app"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignora ottimizzazioni sospensione app standby"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vivaci rgb srgb colori naturali standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"scorrimento password sequenza pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostra SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Altre autorizzazioni"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Altre <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Solo per la ricarica"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Trasferisci file (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Trasferisci foto (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Ricarica"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Solo per la ricarica del dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Alimentazione"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Ricarica l\'altro dispositivo connesso"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Trasferimenti di file"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Trasferisci file su Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Trasferimento di foto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Trasferisci foto o file se la modalità MTP non è supportata (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizza il dispositivo per l\'ingresso MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizza connessione USB per"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"App non attive"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Non attiva. Tocca per attivare."</string>
@@ -2850,7 +2866,7 @@
     <string name="system_alert_window_access_title" msgid="8811695381437304132">"Spostamento su altre app"</string>
     <string name="permit_draw_overlay" msgid="6606018549732046201">"Consenti Posizionamento davanti ad altre app"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"Autorizzazione Spostamento di app sopra"</string>
-    <string name="allow_overlay_description" msgid="7895191337585827691">"Questa autorizzazione consente di visualizzare un\'app sopra altre app in uso. Potrebbe interferire con il tuo utilizzo dell\'interfaccia in altre applicazioni o modificare ciò che credi di vedere in altre applicazioni."</string>
+    <string name="allow_overlay_description" msgid="7895191337585827691">"Questa autorizzazione consente a un\'app di spostarsi sopra altre app in uso e potrebbe interferire con il tuo utilizzo dell\'interfaccia in altre applicazioni o cambiare ciò che credi di vedere in altre applicazioni."</string>
     <string name="keywords_system_alert_window" msgid="8579673659566564926">"finestra dialogo avviso sistema Posizionamento davanti ad altre appp"</string>
     <string name="overlay_settings" msgid="222062091489691363">"Spostamento su altre app"</string>
     <string name="system_alert_window_summary" msgid="4268867238063922290">"<xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g> sono autorizzate a spostarsi sopra altre app"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sì"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Doppia rotazione per fotocamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Apri l\'app Fotocamera ruotando due volte il polso"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Premi due volte tasto di acc. per fotoc."</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Consente di aprire rapidamente la fotocamera senza sbloccare lo schermo"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vivaci (opzione predefinita)"</item>
+    <item msgid="8446070607501413455">"Naturali"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Colori migliorati"</item>
+    <item msgid="8280754435979370728">"Colori naturali e realistici"</item>
+    <item msgid="5363960654009010371">"Colori ottimizzati per i contenuti digitali"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modalità colori immagini"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e776da5..53de201 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -326,6 +326,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"הגדרה של טביעת אצבע"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"כדי להשתמש בטביעת האצבע לביטול נעילת המסך או אישור רכישות, יש לבצע את הפעולות הבאות:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"הגדר את שיטת הגיבוי לנעילת המסך"</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"גע בחיישן טביעת האצבע כדי להוציא את המכשיר ממצב שינה ולבטל את הנעילה שלו."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"האם לדלג על הגדרת טביעת אצבע?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"בחרת להשתמש בטביעת האצבע שלך כאחת מהדרכים שבהן תוכל לבטל את הנעילה בטלפון. אם תדלג על שלב זה עכשיו, תצטרך לבצע את ההגדרה בהמשך. ההגדרה לוקחת רק דקה או שתיים."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"הגדר נעילת מסך"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"סיום"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"אופס. זה לא החיישן הנכון"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"השתמש בחיישן טביעת האצבע במכשיר."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ההרשמה לא הושלמה"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"חלף הזמן הקצוב להרשמה באמצעות טביעת אצבע. נסה שוב."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ההרשמה באמצעות טביעת אצבע נכשלה. נסה שוב או השתמש באצבע אחרת."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"הוסף עוד"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"הבא"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"בנוסף לביטול הנעילה של הטלפון, תוכל להשתמש בטביעת האצבע כדי לאשר רכישות וגישה לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"הצג מידע משפטי, סטטוס, גרסת תוכנה"</string>
     <string name="legal_information" msgid="5769301644270604095">"מידע משפטי"</string>
     <string name="contributors_title" msgid="5917703088825286504">"תורמים"</string>
+    <string name="manual" msgid="3025943393642974445">"ידני"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"מידע על תקנות"</string>
     <string name="copyright_title" msgid="865906688917260647">"זכויות יוצרים"</string>
     <string name="license_title" msgid="1990487604356037871">"רישיון"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"‏רישיון WebView במערכת"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"טפטים"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏ספקים של צילומי לוויין:\n‎©2014 CNES / Astrium‏, DigitalGlobe‏, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"ידני"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"יש בעיה בטעינת המדריך."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"רשיונות קוד פתוח"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"יש בעיה בטעינת הרישיון."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"טוען..."</string>
@@ -2097,7 +2106,7 @@
     <string name="hdcp_checking_title" msgid="8605478913544273282">"‏בדיקת HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"‏הגדר אופן בדיקת HDCP"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"ניפוי באגים"</string>
-    <string name="debug_app" msgid="8349591734751384446">"בחר אפליקציה לניפוי באגים"</string>
+    <string name="debug_app" msgid="8349591734751384446">"בחר אפליקציה לניפוי"</string>
     <string name="debug_app_not_set" msgid="718752499586403499">"לא הוגדרה אפליקציה לניפוי"</string>
     <string name="debug_app_set" msgid="2063077997870280017">"אפליקציה לניפוי: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="select_application" msgid="5156029161289091703">"בחר אפליקציה"</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"אבטחה של הרשאות לאפליקציות"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ברירת מחדל לאפליקציות"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"התעלמות אופטימיזציות שינה אפליקציה המתנה"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"‏דינמי RGB ‏sRGB צבע טבעי רגיל"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏החלקה סיסמה קו ביטול נעילה מספר PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
@@ -2833,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"‏הצג את SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"הרשאות נוספות"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"עוד <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"טעינה בלבד"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏העברת קבצים (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏העברת תמונות (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"טעינה"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"רק לטעינת המכשיר"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"מקור חשמל"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"הטען את המכשיר האחר המחובר"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"העברות קבצים"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏העבר קבצים אל Windows או Mac ‏(MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏העברת תמונות (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏העברת תמונות או קבצים אם MTP אינו נתמך (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏השתמש במכשיר לקלט MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏השתמש ב-USB בשביל"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"אפליקציות לא פעילות"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"לא פעילה. גע כדי להחליף."</string>
@@ -2904,4 +2920,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"כן"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"לא"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"סיבוב כפול להפעלת המצלמה"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"פתח את אפליקציית המצלמה על ידי סיבוב כפול של פרק כף היד"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"לחץ על לחצן ההפעלה פעמיים כדי לפתוח את המצלמה"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"הפעל את המצלמה במהירות מבלי לבטל את נעילת הטלפון"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"דינמי (ברירת מחדל)"</item>
+    <item msgid="8446070607501413455">"טבעי"</item>
+    <item msgid="6553408765810699025">"רגיל"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"צבעים משופרים"</item>
+    <item msgid="8280754435979370728">"צבעים טבעיים כפי שהם נראים לעין"</item>
+    <item msgid="5363960654009010371">"צבעים מותאמים באופן אופטימלי לתוכן דיגיטלי"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"מצב צבע התמונה"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏שימוש ב-sRGB"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a91a538..2bacc5b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -324,6 +324,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"指紋の設定"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"指紋を使って画面ロックの解除や購入の確認を行うには、次の手順を行う必要があります。"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"予備の画面ロック方式を設定"</string>
@@ -334,7 +335,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"詳細"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"次へ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"センサー位置の確認"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"センサーを探す"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"端末の背面にある指紋認証センサーを探します。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"端末の指紋認証センサーの位置を示した図"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名前"</string>
@@ -348,10 +349,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用できます。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"指紋認証センサーに触れるだけで端末を復帰させてロックを解除できます。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"このアイコンが表示されている場合は指紋を利用できます。"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"指紋の設定をスキップしますか？"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"スマートフォンのロック解除方法として指紋を選択しています。スキップした場合は、後でセットアップする必要があります。セットアップの所要時間は1分程度です。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"画面ロックを設定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完了"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"これはセンサーではありません"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"端末の指紋認証センサーを使用してください。"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"登録を完了できませんでした"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"指紋の登録がタイムアウトになりました。もう一度お試しください。"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"指紋を登録できませんでした。もう一度試すか、別の指を使用してください。"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"別の指紋を登録"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"次へ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"スマートフォンのロック解除に加えて、指紋認証を使用して購入やアプリのアクセスを許可することもできます。"<annotation id="url">"詳細"</annotation></string>
@@ -1210,6 +1216,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"規約、ステータス、ソフトウェアバージョン"</string>
     <string name="legal_information" msgid="5769301644270604095">"法的情報"</string>
     <string name="contributors_title" msgid="5917703088825286504">"アライアンスパートナー"</string>
+    <string name="manual" msgid="3025943393642974445">"マニュアル"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"規制情報"</string>
     <string name="copyright_title" msgid="865906688917260647">"著作権"</string>
     <string name="license_title" msgid="1990487604356037871">"ライセンス"</string>
@@ -1217,6 +1224,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"システムのWebViewライセンス"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"壁紙"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"航空写真の提供:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"マニュアル"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"マニュアルの読み込み中に問題が発生しました。"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"オープンソースライセンス"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ライセンスの読み込み中に問題が発生しました。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"読み込み中..."</string>
@@ -2508,6 +2517,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"アプリ 権限 セキュリティ"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"アプリ 既定"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"無視 最適化 スリープ アプリ スタンバイ"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"鮮やか rgb srgb 色 自然 標準"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"スライド パスワード パターン pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFCタグのセットアップ"</string>
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
@@ -2805,14 +2815,20 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI調整ツールを表示"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"その他の権限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"他<xliff:g id="COUNT">%1$d</xliff:g>件"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"充電のみ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ファイルの転送（MTP）"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"写真の転送（PTP）"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"この端末の充電のみを行う"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"接続されている他のデバイスを充電する"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ファイル転送"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"WindowsまたはMacへファイルを転送する（MTP）"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"写真の転送（PTP）"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"写真を転送またはMTPがサポートされない場合にファイルを転送する（PTP）"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"端末をMIDI入力に使用する"</string>
     <string name="usb_use" msgid="3372728031108932425">"USBの使用"</string>
-    <string name="inactive_apps_title" msgid="1317817863508274533">"休止中のアプリ"</string>
-    <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"休止中。タップすると切り替わります。"</string>
-    <string name="inactive_app_active_summary" msgid="4512911571954375968">"実行中。タップすると切り替わります。"</string>
+    <string name="inactive_apps_title" msgid="1317817863508274533">"無効なアプリ"</string>
+    <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"無効。タップすると切り替わります。"</string>
+    <string name="inactive_app_active_summary" msgid="4512911571954375968">"有効。タップすると切り替わります。"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"画面のテキストを使用"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"画面コンテンツのテキストにアクセスすることをアシストアプリに許可します"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"スクリーンショットを使用"</string>
@@ -2874,4 +2890,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"この権限により、アプリはシステム設定の変更ができるようになります。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"可"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不可"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"2回ひねる動作でカメラアプリを開く"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"手首を2回ひねる動作でカメラアプリを開きます"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"電源ボタンを2回押してカメラを起動"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"画面ロックを解除せずにすばやくカメラを起動します"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"鮮やか（既定）"</item>
+    <item msgid="8446070607501413455">"自然"</item>
+    <item msgid="6553408765810699025">"標準"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"拡張色"</item>
+    <item msgid="8280754435979370728">"目に自然な色"</item>
+    <item msgid="5363960654009010371">"デジタルコンテンツに最適な色"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"画像の色モード"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGBを使用"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 5596aae..f8dc2cf 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"თითის ანაბეჭდის დაყენება"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"თქვენი ეკრანის განბლოკვისა და შესყიდვების დადასტურებისთვის თითის ანაბეჭდის გამოსაყენებლად ჩვენ უნდა:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"თქვენი სარეზერვო ეკრანის დაბლოკვის მეთოდის დაყენება"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"როდესად ამ ხატულას დაინახავთ, იდენტიფიცირების ან თქვენი შესყიდვის ავტორიზებისათვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"უბრალოდ, შეეხეთ თითის ანაბეჭდის სენსორს თქვენი მოწყობილობის გამოსაღვიძებლად და განსაბლოკად."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"როდესაც ამ ხატულას დაინახავთ, შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"გსურთ თითის ანაბეჭდის დაყენ. გამოტოვება?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"თქვენ აირჩიეთ თქვენი თითის ანაბეჭდის გამოყენება თქვენი ტელეფონის განბლოკვის ერთ-ერთ მეთოდად. თუ ამას ახლა გამოტოვებთ, მისი დაყენება მოგვიანებით მოგიწევთ. დაყენებას მხოლოდ ერთი წუთი სჭირდება."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ეკრანის დაბლოკვის დაყენება"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"შესრულდა"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"უფს, ეს არ არის სენსორი"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"თითის ანაბეჭდ. სენსორის მოწყობ.-ზე გამოყენება"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"რეგისტრაცია არ დასრულდა"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"თითის ანაბეჭდის რეგისტრაციის დროის ლიმიტი ამოიწურა. ცადეთ ისევ."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"თითის ანაბეჭდის რეგისტრაცია ვერ მოხერხდა. ცადეთ ისევ ან გამოიყენეთ სხვა თითი."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"კიდევ ერთის დამატება"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"შემდეგი"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"თქვენი ტელეფონის განბლოკვასთან ერთად, ასევე შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი შესყიდვებისა და აპების წვდომის დასამოწმებლად. "<annotation id="url">"შეიტყვეთ მეტი"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"იხილეთ სამართლებრივი ინფორმაცია, სტატუსი, პროგრამული უზრუნველყოფის ვერსია"</string>
     <string name="legal_information" msgid="5769301644270604095">"იურიდიული ინფორმაცია"</string>
     <string name="contributors_title" msgid="5917703088825286504">"მონაწილეები"</string>
+    <string name="manual" msgid="3025943393642974445">"სახელმძღვანელო"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"ნორმატიული ინფორმაცია"</string>
     <string name="copyright_title" msgid="865906688917260647">"საავტორო უფლებები"</string>
     <string name="license_title" msgid="1990487604356037871">"ლიცენზია"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"სისტემის ვებ მიმოხილვის ლიცენზია"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ფონები"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"სატელიტური სურათების პროვაიდერები:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"სახელმძღვანელო"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"სახელმძღვანელოს ჩატვირთვისას წარმოიქმნა პრობლემა."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ღია კოდის ლიცენზიები"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ლიცენზიის ჩამოტვირთვასთან პრობლემაა."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ჩატვირთვა…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"აპლიკაციების ნებართვების უსაფრთხოება"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"აპები ნაგულისხმევი"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ოპტიმიზაციის იგნორირების თვლემის აპი მოლოდინის რეჟიმშია"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"მკვეთრი rgb srgb ფერი ბუნებრივი სტანდარტული"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"გასრიალება პაროლი ნიმუში pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC თეგის დაყენება"</string>
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ტუნერის ჩვენება"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"დამატებითი ნებართვები"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> სხვა"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"მხოლოდ დამუხტვა"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ფაილების გადაცემისთვის (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ფოტოების გადაცემისთვის (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"მიმდინარეობს დატენვა"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"უბრალოდ დამუხტეთ ეს მოწყობილობა"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"დენის მიწოდება"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"სხვა დაკავშირებული მოწყობილობის დამუხტვა"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ფაილის გადატანა"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"გადაიტანეთ ფაილები Windows ან Mac (MTP)-ში"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"სურათის გადატანა (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"გადაიტანეთ ფოტოები ან ფაილები, თუ MTP არ არის მხარდაჭერილი (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"გამოიყენეთ მოწყობილობა MIDI შეყვანისთვის"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB-ს გამოყენება"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"უმოქმედო აპები"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"უმოქმედო. შეეხეთ გადასართავად."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ეს ნებართვა უფლებას აძლევს აპს, შეცვალოს სისტემის პარამეტრები."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"კი"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"არა"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ორმაგი მოტრიალება კამერისთვის"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"გახსენით კამერის აპი თქვენი მაჯის ორჯერ მოტრიალებით"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"კამერისთვის ჩართვის ღილაკზე ორჯერ დაჭერა"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"კამერის სწრაფად გახსნა ეკრანის განბლოკვის გარეშე"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"მკვეთრი (ნაგულისხმევი)"</item>
+    <item msgid="8446070607501413455">"ბუნებრივი"</item>
+    <item msgid="6553408765810699025">"სტანდარტული"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"გაჯერებული ფერები"</item>
+    <item msgid="8280754435979370728">"თვალისთვის ხილული ბუნებრივი ფერები"</item>
+    <item msgid="5363960654009010371">"ციფრული კონტენტისთვის ოპტიმიზებული ფერები"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"გამოსახულების ფერების რეჟიმი"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB-ს გამოყენება"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 25659b5..13ec226 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Саусақ ізін орнату"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Экран құлпын ашу немесе сатып алуды растау мақсатында саусақ таңбаңызды пайдалану үшін келесілер қажет:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Сақтық көшірме экранын құлыптау әдісін орнату"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Осы белгішені көргенде идентификациялау немесе сатып алуды авторизациялау үшін саусақ ізін пайдалануға болады."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Құрылғыны ояту және құлпын ашу үшін жай саусақ ізі сенсорын түртіңіз."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Осы белгішені көргенде саусақ ізін пайдалануға болады."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Саусақ ізін орнатуды өткізіп жіберу керек пе?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Саусақ ізін пайдалануды телефон құлпын ашудың бір жолы ретінде таңдадыңыз. Қазір өткізіп жіберсеңіз, мұны кейінірек орнату керек. Орнату бір минутқа жақын уақыт алады."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Экран құлпын орнату"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Дайын"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, бұл сенсор емес"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Құрылғ.саусақ таңбасы сенсорын пайдаланыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Тіркеу аяқталмады"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Саусақ ізін тіркеу уақытының шегіне жеттіңіз. Әрекетті қайталаңыз."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Саусақ ізін тіркеу нәтиже бермеді. Әрекетті қайталаңыз немесе басқа саусақты пайдаланыңыз."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Басқасын қосу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Келесі"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Саусақ ізімен телефон бекітпесін ашып қана қоймай, сонымен қатар тауар сатып алғаныңызды және қолданбаны пайдалануға рұқсатыңыз бар екенін растау үшін пайдалануға болады. "<annotation id="url">"Толығырақ"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Заңнамалық ақпарат, күйін, бағдарлама нұсқасын қарау"</string>
     <string name="legal_information" msgid="5769301644270604095">"Заңнамалық ақпараттар"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Үлес қосушылар"</string>
+    <string name="manual" msgid="3025943393642974445">"Қолмен"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Нұсқаулықтар ақпараты"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторлық құқықтар"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Жүйенің WebView лицензиясы"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тұсқағаз"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Жерсерік кескіндерін жеткізушілер:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Қолмен"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Нұсқаулықты жүктеу кезінде мәселе болды."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ашық бастапқы код лицензиялары"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензияларды жүктеу барысында мәселе орын алды."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Жүктелуде..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"қолданбалар рұқсаттарының қауіпсіздігі"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"әдепкі қолданбалар"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ұйқы қолданбасының күту режиміндегі мүмкіндіктерді қолданбау"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"жарқын RGB SRGB түс табиғи стандартты"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырғыту құпия сөз өрнек PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC белгісін реттеу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазу"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Жүйе пайд. интерфейсінің тюнерін көрсету"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Қосымша рұқсаттар"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Тағы <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Тек зарядтау"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Файлдарды тасымалдау (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Фотосуреттерді тасымалдау (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Зарядталуда"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Тек осы құрылғыны зарядтау"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Қуат көзі"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Басқа жалғанған құрылғыны зарядтау"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Файлдарды тасымалдаулар"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Файлдарды Windows немесе Mac жүйесіне тасымалдау (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Фотосурет тасымалдау (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP қолдауы жоқ болса (PTP), фотосуреттерді немесе файлдарды тасымалдау"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Құрылғыны MIDI кірісі үшін пайдалану"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB пайдалану мақсаты"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Белсенді емес қолданбалар"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Белсенді емес. Ауыстыру үшін түртіңіз."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Бұл рұқсат қолданбаға жүйелік параметрлерді өзгертуге рұқсат етеді."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Иә"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Жоқ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Камера үшін екі рет бұру"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Білекті екі рет бұру арқылы камера қолданбасын ашу"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера үшін қуат түймес. екі рет басыңыз"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Экран құлпын ашпастан камераны жылдам ашу"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Жарқын (әдепкі)"</item>
+    <item msgid="8446070607501413455">"Табиғи"</item>
+    <item msgid="6553408765810699025">"Стандартты"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Жақсартылған түстер"</item>
+    <item msgid="8280754435979370728">"Көзбен көргендегі табиғи түстер"</item>
+    <item msgid="5363960654009010371">"Сандық мазмұн үшін оңтайландырылған түстер"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Сурет түс режимі"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB пайдалану"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 25a9d3a..75793a3 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"ដំឡើងស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"ដើម្បីប្រើស្នាមម្រាមដៃរបស់អ្នកដោះសោអេក្រង់ ឬបញ្ជាក់ការទិញ យើងត្រូវ៖"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"ដំឡើងវិធីសាស្ត្រចាក់សោអេក្រង់បម្រុងរបស់អ្នក"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃដើម្បីធ្វើជាអត្តសញ្ញាណ ឬដើម្បីអនុញ្ញាតការទិញ។"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"គ្រាន់តែប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃដើម្បីដាស់ និងដោះសោឧបករណ៍របស់អ្នក។"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃរបស់អ្នក។"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"រំលងការដំឡើងស្នាមម្រាមដៃឬទេ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"អ្នកបានជ្រើសរើសប្រើស្នាមម្រាមដៃរបស់អ្នកជាវិធីមួយក្នុងការដោះសោទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើអ្នករំលងឥឡូវនេះ អ្នកត្រូវដំឡើងវានៅពេលក្រោយ។ ការដំឡើងចំណាយពេលបន្តិចប៉ុណ្ណោះ។"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"កំណត់ការចាក់សោអេក្រង់"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"រួចរាល់"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"អូ នោះមិនមែនជាឧបករណ៍ចាប់សញ្ញាទេ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ប្រើឧបករណ៍ចាប់សញ្ញាម្រាមដៃនៅលើឧបករណ៍របស់អ្នក។"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ការចុះឈ្មោះមិនបានបញ្ចប់នោះទេ"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"រយៈពេលបញ្ចូលស្នាមម្រាមដៃបានអស់ពេលហើយ សូមព្យាយាមម្តងទៀត។"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ការបញ្ចូលស្នាមម្រាមដៃមិនដំណើរការទេ សូមព្យាយាមម្តងទៀត ឬប្រើម្រាមដៃផ្សេងពីនេះ។"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"បន្ថែមផ្សេងទៀត"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"បន្ទាប់"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"បន្ថែមលើការដោះសោទូរស័ព្ទរបស់អ្នក អ្នកក៏អាចប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីផ្តល់សិទ្ធិលើការចូលប្រើការទិញ និងកម្មវិធី។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"មើល​ព័ត៌មាន​ផ្លូវច្បាប់, ស្ថានភាព, កំណែ​កម្មវិធី"</string>
     <string name="legal_information" msgid="5769301644270604095">"ព័ត៌មាន​ផ្លូវ​ច្បាប់"</string>
     <string name="contributors_title" msgid="5917703088825286504">"អ្នក​ចូលរួម"</string>
+    <string name="manual" msgid="3025943393642974445">"ឯកសារណែនាំ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"ព័ត៌មាន​គ្រប់គ្រង"</string>
     <string name="copyright_title" msgid="865906688917260647">"រក្សាសិទ្ធិ"</string>
     <string name="license_title" msgid="1990487604356037871">"អាជ្ញាប័ណ្ណ"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"អាជ្ញាប័ណ្ណ System WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ផ្ទាំង​រូបភាព"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"កម្មវិធី​ផ្ដល់​សេវា​រូបភាព​ផ្កាយ​រណប​៖\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"ឯកសារណែនាំ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"មានបញ្ហាក្នុងការបើកឯកសារណែនាំ"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"អាជ្ញាប័ណ្ណ​កម្មវិធី​ប្រភព​កូដ​ចំហ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"មាន​បញ្ហា​ក្នុង​ការ​ផ្ទុក​អាជ្ញាប័ណ្ណ។"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"កំពុង​ផ្ទុក..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"សុវត្ថិភាពសិទ្ធិកម្មវិធី"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"លំនាំដើមកម្មវិធី"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"មិនអើពើការបង្កើនប្រសិទ្ធិភាពពេលកម្មវិធីផ្អាកដំណើរការមួយរយៈ"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"រស់រវើក rgb srgb ពណ៌ ធម្មជាតិ ស្តង់ដារ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"រុញ​ពាក្យសម្ងាត់ លំនាំ កូដ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"បង្ហាញឧបករណ៍ចាប់ SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"សិទ្ធិអនុញ្ញាតបន្ថែម"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ទៀត"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"បញ្ចូលថ្មប៉ុណ្ណោះ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"បញ្ជូនឯកសារ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"បញ្ជូនរូបថត (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"បញ្ចូលថ្ម"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"គ្រាន់តែបញ្ចូលថ្មឧបករណ៍នេះ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ការផ្គត់ផ្គង់ថាមពល"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"បញ្ចូលថ្មឧបករណ៍ដែលភ្ជាប់ផ្សេងទៀត"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ផ្ទេរឯកសារ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ផ្ទេរឯកសារទៅ Windows ឬ Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ផ្ទេររូបថត (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ផ្ទេររូបថត ឬឯកសារ ប្រសិនបើមិនគាំទ្រ MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"មីឌី"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"ប្រើឧបករណ៍សម្រាប់បញ្ចូលមីឌី"</string>
     <string name="usb_use" msgid="3372728031108932425">"ប្រើ USB ដើម្បី"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"កម្មវិធីដែលអសកម្ម"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"អសកម្ម។ ប៉ះដើម្បីបិទ/បើក។"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"សិទ្ធិអនុញ្ញាតនេះអនុញ្ញាតឲ្យកម្មវិធីកែការកំណត់ប្រព័ន្ធ។"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"បាទ/ចាស"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ទេ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"បង្វិលពីរដងដើម្បីប្រើកាមេរ៉ា"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"បើកកម្មវិធីកាមេរ៉ាដោយបង្វិលកដៃរបស់អ្នកពីរដង"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ចុចប៊ូតុងថាមពលពីរដងដើម្បីបើកកាមេរ៉ា"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"បើកកាមេរ៉ាបានយ៉ាងឆាប់រហ័សដោយមិនចាំបាច់ដោះសោអេក្រង់របស់អ្នក"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"រស់រវើក (លំនាំដើម)"</item>
+    <item msgid="8446070607501413455">"ធម្មជាតិ"</item>
+    <item msgid="6553408765810699025">"ស្តង់ដារ"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"ពណ៌ដែលធ្វើឲ្យប្រសើរជាងមុន"</item>
+    <item msgid="8280754435979370728">"ពណ៌ធម្មជាតិដូចដែលបានឃើញដោយភ្នែក"</item>
+    <item msgid="5363960654009010371">"ពណ៌ដែលបានសម្រួលសម្រាប់មាតិកាឌីជីថល"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"របៀបនៃពណ៌រូបភាព"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"ប្រើ sRGB"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 5e86b79..d524aad 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆಟಪ್"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಲು, ನಾವು ಹೀಗೆ ಮಾಡಬೇಕಾದ ಅಗತ್ಯವಿದೆ:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಪರದೆ ಲಾಕ್ ವಿಧಾನವನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ನೀವು ಈ ಐಕಾನ್ ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಗುರುತಿಸುವಿಕೆಗೆ ಅಥವಾ ಖರೀದಿಯನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲು ಬಳಸಬಹುದು."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಎಚ್ಚರಗೊಳಿಸಲು ಮತ್ತು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಕೇವಲ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ಈ ಐಕಾನ್ ಅನ್ನು ನೀವು ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಬಳಸಬಹುದು."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಒಂದು ಮಾರ್ಗವಾಗಿ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಲು ನೀವು ಆಯ್ಕೆಮಾಡಿರುವಿರಿ. ನೀವು ಇದೀಗ ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ನೀವು ಇದನ್ನು ನಂತರ ಹೊಂದಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ. ಸೆಟಪ್ ಕೇವಲ ನಿಮಿಷದಷ್ಟು ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ಪರದೆ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ಮುಗಿದಿದೆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ಓಹ್, ಅದು ಸೆನ್ಸಾರ್ ಅಲ್ಲ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಬಳಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿಲ್ಲ"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ನೋಂದಣಿ ಸಮಯದ ಮಿತಿಯನ್ನು ಮೀರಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ನೋಂದಣಿ ಕೆಲಸ ಮಾಡುತ್ತಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಬೇರೊಂದು ಬೆರಳನ್ನು ಬಳಸಿ."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ಇನ್ನೊಂದನ್ನು ಸೇರಿಸಿ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ಮುಂದೆ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡುವುದಕ್ಕೆ ಹೆಚ್ಚುವರಿಯಾಗಿ, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ ಪ್ರವೇಶಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಅನ್ನು ಕೂಡಾ ನೀವು ಬಳಸಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"ಕಾನೂನು ಮಾಹಿತಿ, ಸ್ಥಿತಿ, ಸಾಫ್ಟ್‌ವೇರ್ ಆವೃತ್ತಿಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="legal_information" msgid="5769301644270604095">"ಕಾನೂನು ಮಾಹಿತಿ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ಕೊಡುಗೆದಾರರು"</string>
+    <string name="manual" msgid="3025943393642974445">"ಹಸ್ತಚಾಲಿತ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"ನಿಯಂತ್ರಣ ಮಾಹಿತಿ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ಹಕ್ಕುಸ್ವಾಮ್ಯ"</string>
     <string name="license_title" msgid="1990487604356037871">"ಪರವಾನಗಿ"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"ಸಿಸ್ಟಂ ವೆಬ್‌ವೀಕ್ಷಣೆ ಪರವಾನಗಿ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ಉಪಗ್ರಹ ಚಿತ್ರಣ ಪೂರೈಕೆದಾರರು:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"ಹಸ್ತಚಾಲಿತ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ಹಸ್ತಚಾಲಿತವಾಗಿ ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆ."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ತೆರೆದ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ಪರವಾನಗಿಗಳನ್ನು ಲೋಡ್‌ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಇದೆ."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ಲೋಡ್ ಆಗುತ್ತಿದೆ..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅನುಮತಿಗಳು ಭದ್ರತೆ"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಡೀಫಾಲ್ಟ್"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳ ಡೋಜ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಟ್ಯಾಂಡ್‌ಬೈ ಅನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ಸ್ಪಂದನಾತ್ಮಕ rgb srgb ಬಣ್ಣ ನೈಸರ್ಗಿಕ ಪ್ರಮಾಣಿತ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ಸ್ಲೈಡ್ ಪಾಸ್‌ವರ್ಡ್ ಮಾದರಿ ಪಿನ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ಟ್ಯೂನರ್ ತೋರಿಸು"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ಹೆಚ್ಚುವರಿ ಅನುಮತಿಗಳು"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ಇನ್ನಷ್ಟು"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ಚಾರ್ಜ್‌ ಮಾಡುವುದಕ್ಕೆ ಮಾತ್ರ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಿ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ಫೋಟೋಗಳನ್ನು ವರ್ಗಾಯಿಸಿ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ಈ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಿ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ವಿದ್ಯುತ್ ಪೂರೈಕೆ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ಇತರ ಸಂಪರ್ಕ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಿ"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ಫೈಲ್ ವರ್ಗಾವಣೆಗಳು"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows ಅಥವಾ Mac (MTP) ಗೆ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಿ"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ಫೋಟೋ ವರ್ಗಾವಣೆ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ಒಂದು ವೇಳೆ MTP ಬೆಂಬಲಿಸದೇ ಹೋದಲ್ಲಿ ಫೋಟೋಗಳೂ ಅಥವಾ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಿ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ಇನ್‌ಪುಟ್‌ಗೆ ಸಾಧನವನ್ನು ಬಳಸಿ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ಇದಕ್ಕಾಗಿ USB ಬಳಸಿ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ನಿಷ್ಕ್ರಿಯ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ. ಟಾಗಲ್ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ಈ ಅನುಮತಿಯು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ಹೌದು"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ಇಲ್ಲ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ಕ್ಯಾಮರಾಗೆ ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ನಿಮ್ಮ ಮಣಿಕಟ್ಟನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸುವ ಮೂಲಕ ಕ್ಯಾಮರಾ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ಕ್ಯಾಮರಾಗೆ ಪವರ್ ಬಟನ್ ಎರಡು ಬಾರಿ ಒತ್ತಿ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡದೆಯೇ ಕ್ಯಾಮರಾವನ್ನು ತ್ವರಿತವಾಗಿ ತೆರೆಯಿರಿ"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"ಸ್ಪಂದನಾತ್ಮಕ (ಡೀಫಾಲ್ಟ್)"</item>
+    <item msgid="8446070607501413455">"ಪ್ರಾಕೃತಿಕ"</item>
+    <item msgid="6553408765810699025">"ಪ್ರಮಾಣಿತ"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"ವರ್ಧಿತ ಬಣ್ಣಗಳು"</item>
+    <item msgid="8280754435979370728">"ಕಣ್ಣಿಗೆ ಕಾಣಿಸುವ ರೀತಿಯಲ್ಲಿ ನೈಸರ್ಗಿಕ ಬಣ್ಣಗಳು"</item>
+    <item msgid="5363960654009010371">"ಡಿಜಿಟಲ್ ವಿಷಯಕ್ಕಾಗಿ ಆಪ್ಟಿಮೈಜ್ ಮಾಡಲಾಗಿರುವ ಬಣ್ಣಗಳು"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"ಚಿತ್ರ ಬಣ್ಣದ ಮೋಡ್"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ಬಳಸಿ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index dd2d513..040a0e0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"지문 설정"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"지문을 사용하여 화면 잠금을 해제하거나 구매를 확인하려면 다음을 수행해야 합니다."</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"백업 화면 잠금 방식을 설정하세요."</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 증명하거나 구매를 승인할 수 있습니다."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"기기의 대기 모드 및 잠금을 해제하려면 지문 센서를 터치하기만 하면 됩니다."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"이 아이콘이 표시되면 지문을 사용할 수 있습니다."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"지문 설정을 건너뛰시겠습니까?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"지문으로 휴대전화를 잠금 해제하도록 설정했습니다. 지금 건너뛰면 나중에 설정해야 하며 설정에는 약 1분 정도 소요됩니다."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"화면 잠금 설정"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"완료"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"죄송합니다. 센서가 아닙니다."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"기기에서 지문 센서를 사용합니다."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"등록이 완료되지 않았습니다."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"지문 파일 등록 제한 시간에 도달했습니다. 다시 시도하세요."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"지문 파일 등록이 되지 않았습니다. 다시 시도하거나 다른 손가락을 사용하세요."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"다른 지문 추가"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"다음"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"지문 파일은 휴대전화의 잠금 해제뿐 아니라 구매 및 앱 액세스를 승인하는 데 사용할 수 있습니다. "<annotation id="url">"자세히 알아보기"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"법률 정보, 상태, 소프트웨어 버전 보기"</string>
     <string name="legal_information" msgid="5769301644270604095">"법률정보"</string>
     <string name="contributors_title" msgid="5917703088825286504">"도움을 주신 분들"</string>
+    <string name="manual" msgid="3025943393642974445">"수동"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"규정 정보"</string>
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
     <string name="license_title" msgid="1990487604356037871">"라이선스"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"시스템 WebView 라이선스"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"배경화면"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"위성 이미지 제공업체:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"수동"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"설명서를 로드하는 중에 문제가 발생했습니다."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이선스"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"라이선스를 로드하는 동안 문제가 발생했습니다."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"로드 중..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"앱 권한 보안"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"앱 기본"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"최적화 수면 앱 대기 무시"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"생동감 rgb srgb 색상 내츄럴 표준"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"슬라이드 비밀번호 패턴 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC 태그 설정"</string>
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI 튜너 표시"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"추가 권한"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g>개 더보기"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"충전 전용"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"파일 전송(MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"사진 전송(PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"충전 중"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"이 기기만 충전"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"전원 공급장치"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"연결된 다른 기기 충전"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"파일 전송"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"파일을 Windows 또는 Mac에 전송(MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"사진 전송(PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP가 지원되지 않는 경우 사진 또는 파일 전송(PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI 입력에 기기 사용"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 사용"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"비활성 앱"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"비활성 상태입니다. 전환하려면 터치하세요."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"이 권한은 앱이 시스템 설정을 수정하도록 허용합니다."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"예"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"아니요"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"손목을 두 번 돌려 카메라 열기"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"손목을 두 번 돌리면 카메라 앱이 열립니다."</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"전원 버튼을 두 번 눌러 카메라 열기"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"화면을 잠금 해제하지 않고 신속하게 카메라를 열 수 있습니다."</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"생동감(기본값)"</item>
+    <item msgid="8446070607501413455">"내츄럴"</item>
+    <item msgid="6553408765810699025">"표준"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"보정 색상"</item>
+    <item msgid="8280754435979370728">"눈으로 보는 듯한 내츄럴 색상"</item>
+    <item msgid="5363960654009010371">"디지털 콘텐츠에 최적화된 색상"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"사진 색상 모드"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB 사용"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index bb9efbe..74710e1 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Манжа изин орнотуу"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Экраныңыздын кулпусун ачып же сатып алууларды ырастоого манжа изиңизди пайдалануу үчүн биз төмөнкүлөрдү кылышыбыз керек:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Камдык экраныңызды кулпулоонун кошумча ыкмасын коюңуз"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Бул сөлөкөттү качан көрсөңүз да аныктоо же сатып алууга уруксат берүү үчүн манжа изиңизди пайдалана аласыз."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Түзмөгүңүздү ойготуп, кулпусун ачуу үчүн, жөн гана манжа изи сенсоруна тийип коюңуз."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Бул сөлөкөттү көргөнүңүздө манжа изиңизди колдонсоңуз болот."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Манжа изин жөндөө өткөрүлсүнбү?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Телефонуңуздун кулпусун манжа изи менен ачуу ыкмасын тандадыңыз. Эгер азыр өткөрүп жиберсеңиз, аны кийинчерээк жөндөшүңүз керек болот. Жөндөөгө бир мүнөтчө эле убакыт кетет."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Экранды кулпулоо ыкмасын коюу"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Даяр"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, ал сенсор эмес"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Түзмөгүңүздөгү манжа изи сенсорун колдонуңуз."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Каттоо аягына чыгарылган жок"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Манжа изин каттоо боюнча убакыт чегине жетти. Кайра аракет кылыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Манжа изин каттоо иштеген жок. Кайра аракет кылыңыз же башка манжаңызды колдонуңуз."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Дагы бирди кошуу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Кийинки"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Телефонуңуздун кулпусун ачуу, ар кандай нерселерди сатып алуу жана колдонмолорду ачуу үчүн, манжа изиңизди кошуп коюңуз. "<annotation id="url">"Көбүрөөк билүү"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Юридикалык маалыматты, абалын, программа версиясын көрүү"</string>
     <string name="legal_information" msgid="5769301644270604095">"Юридикалык маалыматтар"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Салым кошуучулар"</string>
+    <string name="manual" msgid="3025943393642974445">"Нускама"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Башкаруучу маалыматтар"</string>
     <string name="copyright_title" msgid="865906688917260647">"Автордук укук"</string>
     <string name="license_title" msgid="1990487604356037871">"Уруксаттама"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Систем WebView Уруксаттамасы"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тушкагаздар"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Спутник сүрөттөрүн камсыздагычтар:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Нускама"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Нускаманы жүктөөдө көйгөй чыкты."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ачык программа уруксаттамалары"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Уруксаттамалар жүктөлүп жатканда көйгөй келип чыкты."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Жүктөлүүдө…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"колдонмолордун уруксаттарынын коопсуздугу"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"колдонмонун демейкиси"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"батареянын кубатын керектөө чектөөлөрү сакталбасын көшүү режими"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"толкундуу rgb srgb түсү табигый кадимки"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырсөз үлгү төөнөгүчүн жылмыштыруу"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC тегин орнотуу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазуу"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner\'ди көрсөтүү"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Кошумча уруксаттар"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Дагы <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Кубаттоо үчүн гана"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Файлдарды өткөрүү (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Сүрөттөрдү өткөрүү (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Кубатталууда"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Жөн гана бул түзмөктү кубаттоо"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Кубат булагы"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Туташып турган башка түзмөктү кубаттоо"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Файл өткөрүү"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Файлдарды Windows же Mac (MTP) тутумуна өткөрүү"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Сүрөт өткөрүү (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Эгер MTP колдоого алынбаса, сүрөттөрдү же файлдарды өткөрүү (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Түзмөктү MIDI киргизүү үчүн колдонуу"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB төмөнкү үчүн колдонулсун:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Иштебеген колдонмолор"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Иштеген жок. Которуу үчүн тийип коюңуз."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Мындай уруксат колдонмого тутум жөндөөлөрүн өзгөртүү мүмкүнчүлүгүн берет."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ооба"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Жок"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Колду эки айлантып камераны ачуу"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Колуңузду эки айлантып, камера колдонмосун ачыңыз"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера үчүн кубат баскычын эки басыңыз"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Камераны экраныңыздын кулпусун ачпастан, тез эле ачып алыңыз"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Толкундуу (демейки)"</item>
+    <item msgid="8446070607501413455">"Табигый"</item>
+    <item msgid="6553408765810699025">"Кадимки"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Жакшыртылган түстөр"</item>
+    <item msgid="8280754435979370728">"Көзгө көрүнгөн табигый түстөр"</item>
+    <item msgid="5363960654009010371">"Санарип мазмун үчүн оптималдаштырылган түстөр"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Сүрөт түсү режими"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB колдонуңуз"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 425f81c..ee8fddc 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"ການຕັ້ງ​ລາຍ​ນີ້ວ​ມື"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"ເພື່ອ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ປົດ​ລັອກ​ໜ້າ​ຈ​ໍ​ຂອງ​ທ່ານ ແລະ​ຢືນ​ຢັນ​ການ​ຊື້, ພວກ​ເຮົາ​ຈຳ​ເປັນ​ຕ້ອງ:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"ຕັ້ງ​ວິ​ທີ​ລັອກ​ໜ້າ​ຈໍ​ສຳ​ຮອງ​ຂໍ້​ມູນ​ຂອງ​ທ່ານ"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ທຸກ​ຄັ້ງ​ທີ່​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ສຳ​ລັບ​ການ​ລະ​ບຸ ຫຼື​ເພື່ອ​ໃຫ້​ສິດ​ການ​ຊື້."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ພຽງ​ແຕ່​ສຳ​ຜັດ​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື ເພື່ອ​ກະ​ຕຸ້ນ ແລະ ປົດ​ລັອກ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ເມື່ອ​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ໄດ້."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ຂ້າມ​ການ​ຕັ້ງ​ລາຍ​ນີ້ວ​ມື​ບໍ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ທ່ານ​ເລືອກ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ເປັນ​ວິ​ທີ​ໜຶ່ງໃນການ​ປົດ​ລັອກ​ໂທ​ລ​ະ​ສັບ​ຂອງ​ທ່ານ. ຖ້າ​ທ່ານ​ຂ້າມ​​ດຽວ​ນີ້, ທ່ານ​ຈະ​ຕ້ອງ​ໄດ້​ຕັ້ງ​ອັນ​ນີ້​ພາຍ​ຫຼັງ. ການ​ຕັ້ງ​ໃຊ້​ເວ​ລາ​ພຽງ​ໜຶ່ງ​ນາ​ທີ ຫຼື ປະ​ມານນັ້ນ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ຕັ້ງຄ່າການລັອກໜ້າຈໍ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ແລ້ວໆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ອຸ້ຍ, ນັ້ນ​ບໍ່​ແມ່ນ​ເຊັນ​ເຊີ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ໃຊ້​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ການ​ລົງ​ທະ​ບຽນ​ບໍ່​ສຳ​ເລັດ"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ຮອດ​ຂີດ​ຈຳ​ກັດ​ເວ​ລາ​ການ​ລົງ​ທະ​ບຽນ​ລາຍ​ນີ້ວ​ມື​ແລ້ວ. ລອງ​ໃໝ່​ອີກ."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ການ​ລົງ​ທະ​ບຽນ​ລາຍ​ນີ້ວ​ມື​ບໍ່​ເຮັດ​ວຽກ. ລອງ​ໃໝ່​ອີກ ຫຼື ໃຊ້​ນີ້ວ​ມື​ນີ້ວ​ອື່ນ."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ເພີ່ມ​ອັນ​ອື່ນ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ຕໍ່​ໄປ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ນອກ​ຈາກ​ການ​ປົດ​ລັອກ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ແລ້ວ, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້​ມື​ຂອງ​ທ່ານ ​ເພື່ອ​ໃຊ້​ສິດ​ໃນ​ການ​ຊື້ ແລະ​ການ​ເຂົ້າ​ຫາ​ແອັບ​ໄດ້ນຳ​ອີກ "<annotation id="url">"ຮຽນ​ຮູ້​ເພີ່ມ​ເຕີມ"</annotation></string>
@@ -552,7 +558,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ສຳລັບເພງ ແລະສື່"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ຈື່ການຕັ້ງຄ່າ"</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi Assistant"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"ການສົ່ງສັນຍານ"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"ຄາສທ໌"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ບໍ່ມີອຸປະກອນຢູ່ໃນບໍລິເວນໃກ້ຄຽງ."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"ກຳລັງເຊື່ອມຕໍ່"</string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"ເບິ່ງຂໍ້ມູນທາງກົດໝາຍ, ສະຖານະ, ເວີຊັນຊອບແວ"</string>
     <string name="legal_information" msgid="5769301644270604095">"ຂໍ້ມູນທາງກົດໝາຍ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ຜູ່ມີສ່ວນຮ່ວມ"</string>
+    <string name="manual" msgid="3025943393642974445">"ຄູ່​ມື"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"ຂໍ້ມູນກົດລະບຽບ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ສະຫງວນລິຂະສິດ"</string>
     <string name="license_title" msgid="1990487604356037871">"ລິຂະສິດ"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"ໃບ​ອະ​ນຸ​ຍາດ WebView ຂອງ​ລະ​ບົບ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ພາບພື້ນຫຼັງ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ຜູ່​ສະ​ໜອງ​ພາບ​ຖ່າຍ​ດາວ​ທຽມ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"ຕັ້ງຄ່າເອງ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ເກີດບັນຫາໃນການໂຫລດຄູ່​ມື."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ລິຂະສິດໂອເພນຊອດ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ເກີດບັນຫາໃນການໂຫຼດຂໍ້ມູນລິຂະສິດ."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ກຳລັງໂຫລດ..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ຄວາມ​ປອດ​ໄພ​ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ມາດ​ຕະ​ຖານ​ແອັບ"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ສະ​ແຕນ​ບາຍ​ແອັບລະເລີຍການປັບ​ໃຫ້​ມີ​ປະ​ສິດ​ທິ​ຜົນ​ສູງສຸດ"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ມາດ​ຕະ​ຖານ​ທຳ​ມະ​ຊາດ​ສີ rgb srgb ຕົວ​ສັ່ນ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ສະ​ໄລ້ ລະ​ຫັດ​ຜ່ານ ຮູບ​ແບບ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"ສະ​ແດງ​ຕົວ​ປັບ SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ການ​ອະ​ນຸ​ຍາດ​​ເພີ່ມ​ເຕີມ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ເພີ່ມ​ເຕີມ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ການ​ສາກ​ເທົ່າ​ນັ້ນ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ໂອນ​ໄຟ​ລ໌ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ໂອນ​ຮູບ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ກຳລັງສາກໄຟ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ຫາ​ກໍ່​ສາກ​ອຸ​ປະ​ກອນ​ນີ້"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ການ​ຈ່າຍ​ໄຟ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ສາກ​ອຸ​ປະ​ກອນ​ເຊື່ອມ​ຕໍ່​ອື່ນ"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ການ​ໂອນ​ໄຟ​ລ໌"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ໂອນ​ໄຟ​ລ໌​ໄປ​ຫາ Windows ຫຼື Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ການ​ໂອນ​ຮູບ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ໂອນ​ຮູບ ຫຼື ໄຟ​ລ໌ ຖ້າ MTP ບໍ່​ໄດ້​ຮອງ​ຮັບ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"ໃຊ້​ອຸ​ປະ​ກອນ​ສຳ​ລັບ​ການ​ປ້ອນ MIDI ເຂົ້າ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ໃຊ້ USB ສຳ​ລັບ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ແອັບ​ບໍ່​ໃຊ້​ງານ​ຢູ່"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ບໍ່​ໃຊ້​ງານ​ຢູ່. ສຳ​ພັດ​ເພື່ອ​ສະ​ຫຼັບ."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ການ​ອະ​ນຸ​ຍາດ​ນີ້​ອະ​ນຸ​ຍາດໃຫ້​ແອັບດັດ​ແປງ​ການ​ຕັ້ງ​ຄ່າ​ລະ​ບົບ​ໄດ້."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"​ແມ່ນ​ແລ້ວ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ບໍ່"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ບິດ​ສອງ​ຄັ້ງ​ສຳ​ລັບ​ກ້ອງ​ຖ່າຍ​ຮູບ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ເປີດ​ກ້ອງ​ຖ່າຍ​ຮູບ​ໂດຍ​ການ​ບິດ​ຂໍ້​ມື​ຂອງ​ທ່ານ​ສອງ​ຄັ້ງ"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ກົດ​ປຸ່ມ​ປິດ​ເປີດ​ສອງ​ຄັ້ງ​ສຳ​ລັບ​ກ້ອງ​ຖ່າຍ​ຮູບ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ເປີດ​ກ້ອງ​ຖ່າຍ​ຮູບ​ດ່ວນ​ໂດຍ​ບໍ່​ຕ້ອງ​ປົດ​ລັອກໜ້າຈໍ​ຂອງ​ທ່ານ"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"ຕົວ​ສັ່ນ (ມາດ​ຕະ​ຖານ)"</item>
+    <item msgid="8446070607501413455">"ທຳ​ມະ​ຊາດ"</item>
+    <item msgid="6553408765810699025">"ມາດ​ຕະ​ຖານ"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"ສີ​ທີ່​ປັບ​ປຸງ​ແລ້ວ"</item>
+    <item msgid="8280754435979370728">"ສີ​ທຳ​ມະ​ຊາດ​ຕາມ​ທີ່​ເຫັນ​ດ້ວຍ​ຕາ"</item>
+    <item msgid="5363960654009010371">"ສີ​ທີ່​ປັບ​ໃຫ້​ເໝາະ​ສົມ​ສຳ​ລັບ​ເນື້ອ​ໃນ​ດິ​ຈີ​ຕອ​ລ"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"ໂໝດ​ສີ​ຮູບ"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"ໃຊ້ sRGB"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index bcfcb4b..34caf54 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -326,6 +326,7 @@
       <item quantity="many">Nustatyta <xliff:g id="COUNT_1">%1$d</xliff:g> kontrolinio kodo</item>
       <item quantity="other">Nustatyta <xliff:g id="COUNT_1">%1$d</xliff:g> kontrolinių kodų</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Kontr. kodo sąranka"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Kad galėtume naudoti kontrolinį kodą ekranui atrakinti ar pirkimo operacijoms patvirtinti, turime:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Nustatykite atsarginį ekrano užrakto metodą"</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kai rodoma ši piktograma, galite naudoti kontrolinį kodą tapatybei nustatyti ar pirkimo operacijai autorizuoti."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tiesiog palieskite kontrolinio kodo jutiklį, kad pažadintumėte ir atrakintumėte įrenginį."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kai pamatysite šią piktogramą, galėsite naudoti kontrolinį kodą."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Praleisti pirštų atspaudų nustatymą?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pasirinkote naudoti piršto atspaudą kaip vieną iš telefono atrakinimo būdų. Jei praleisite dabar, turėsite nustatyti funkciją vėliau. Nustatymas apytiksliai užtruks tik minutę."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nustatyti ekrano užraktą"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Atlikta"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oi, tai ne jutiklis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Naudokite įrenginio kontrolinio kodo jutiklį."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija neužbaigta"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Pasiektas kontrolinio kodo registracijos laiko apribojimas. Bandykite dar kartą."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Nepavyko užregistruoti kontrolinio kodo. Bandykite dar kartą arba atlikite tai kitu pirštu."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pridėti kitą"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Kitas"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Naudodami kontrolinį kodą galite atrakinti telefoną, be to, galite įgalioti pirkimo veiksmus ir programų prieigą. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Žiūrėti teisinę informaciją, būseną, programinės įrangos versiją"</string>
     <string name="legal_information" msgid="5769301644270604095">"Teisinė informacija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Pagalbininkai"</string>
+    <string name="manual" msgid="3025943393642974445">"Neautomatiškai"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Reguliuojam. informacija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorių teisės"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencija"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Sistemos „WebView“ licencija"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ekrano fonai"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Palydovinių vaizdų teikėjai:\n© CNES / „Astrium“, „DigitalGlobe“, „Bluesky“, 2014 m."</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Neautomatiškai"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Įkeliant vadovą iškilo problema."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atvirojo šaltinio licencijos"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Įkeliant licencijas iškilo problema."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Įkeliama…"</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"programų leidimų sauga"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"programos numatytosios"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"nepaisyti optimizavimo nustatymų pristabdyti programą laukimo režimas"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ryškus rgb srgb spalva natūralus standartinis"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slysti slaptažodis šablonas PIN kodas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
@@ -2835,10 +2845,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Rodyti sistemos NS derinimo priemonę"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Papildomi leidimai"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Dar <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Tik įkrovimas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Perkelti failus (MPP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Perkelti nuotraukas (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Įkrovimas"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Įkrauti tik šį įrenginį"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Maitinimo šaltinis"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Įkrauti kitą prijungtą įrenginį"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Failų perkėlimai"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Perkelti failus į „Windows“ ar „Mac“ kompiuterį (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Nuotraukų perkėlimas (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Perkelti nuotraukas ar failus, jei MTP nepalaikomas (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Naudoti įrenginį – MIDI įvestis"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB naudojimas"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktyvios programos"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktyvi. Palieskite, kad perjungtumėte."</string>
@@ -2906,4 +2922,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Programai bus leidžiama keisti sistemos nustatymus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Taip"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dukart pasukti, kad fotoap. pr. būtų at."</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Atidarykite fotoaparato programą dukart pasukę riešą"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Dukart pasp. mait. mygt. fotoap. atidar."</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Greitai atidarykite fotoaparatą neatrakinę įrenginio"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Ryškus (numatytasis)"</item>
+    <item msgid="8446070607501413455">"Natūralus"</item>
+    <item msgid="6553408765810699025">"Standartinis"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Patobulintos spalvos"</item>
+    <item msgid="8280754435979370728">"Natūralios spalvos"</item>
+    <item msgid="5363960654009010371">"Skaitmeniniam turiniui optimizuotos spalvos"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Nuotraukos spalvos režimas"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Naudoti sRGB"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 31da1fd..d23b44c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -324,6 +324,7 @@
       <item quantity="one">Iestatīt <xliff:g id="COUNT_1">%1$d</xliff:g> pirkstu nospiedumu</item>
       <item quantity="other">Iestatīt <xliff:g id="COUNT_1">%1$d</xliff:g> pirkstu nospiedumus</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nospieduma iestatīšana"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Lai izmantotu pirksta nospiedumu ekrāna atbloķēšanai vai pirkumu apstiprināšanai, veiciet tālāk norādītās darbības."</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Iestatiet rezerves ekrāna bloķēšanas metodi."</string>
@@ -348,10 +349,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kad tiek rādīta šī ikona, varat izmantot pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Pieskarieties pirkstu nospiedumu sensoram, lai aktivizētu un atbloķētu savu ierīci."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kad redzat šo ikonu, varat izmantot pirkstu nospiedumu."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Izlaist pirksta nospieduma iestatīšanu?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jūs izvēlējāties pirksta nospiedumu kā vienu no tālruņa atbloķēšanas iespējām. Ja izlaidīsiet šo darbību, iestatīšana būs jāveic vēlāk. Iestatīšanai nepieciešama aptuveni viena minūte."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Iestatīt ekrāna bloķēšanu"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gatavs"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Tas nav sensors!"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Izmantojiet nospieduma sensoru uz ierīces."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Reģistrēšana netika pabeigta"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Ir sasniegts pirksta nospieduma reģistrēšanas laika ierobežojums. Mēģiniet vēlreiz."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Neizdevās reģistrēt pirksta nospiedumu. Mēģiniet vēlreiz vai izmantojiet citu pirkstu."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pievienot citu"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tālāk"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Papildus tālruņa atbloķēšanai varat izmantot arī pirksta nospiedumu, lai autorizētu pirkumus un lietotņu piekļuvi. "<annotation id="url">"Uzziniet vairāk"</annotation>"."</string>
@@ -1217,6 +1223,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Skatīt juridisko informāciju, statusu, programmatūras versiju"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridiskā informācija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Līdzdalībnieki"</string>
+    <string name="manual" msgid="3025943393642974445">"Rokasgrāmata"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulējoša informācija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autortiesības"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
@@ -1224,6 +1231,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Sistēmas WebView licence"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fona tapetes"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satelītuzņēmumu nodrošinātāji:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Rokasgrāmata"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Radās ar rokasgrāmatas ielādi saistīta problēma."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atklātā pirmkoda licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Radās ar licenču ielādi saistīta problēma."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Notiek ielāde…"</string>
@@ -2511,6 +2520,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"lietotnes atļaujas drošība"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"lietotnes noklusējums"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorēt optimizāciju lietotnes snauda gaidstāve"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"spilgts rgb srgb krāsa dabiska standarta"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vilkt parole kombinācija pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Iestatīt Wi-Fi NFC atzīmi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
@@ -2816,10 +2826,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Rādīt sistēmas saskarnes regulatoru"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Papildu atļaujas"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Vēl <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Tikai uzlāde"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Failu pārsūtīšana (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotoattēlu pārsūtīšana (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Uzlāde"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Tikai šīs ierīces uzlāde"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strāvas padeve"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Otras pievienotās ierīces uzlāde"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Failu pārsūtīšana"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Failu pārsūtīšana uz Windows vai Mac datoru (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoattēlu pārsūtīšana (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotoattēlu vai failu pārsūtīšana, ja MTP nav pieejams (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Izmantot ierīci MIDI ievadei"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB savienojuma lietošana"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktīvās lietotnes"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Lietotne nav aktīva. Pieskarieties, lai pārslēgtu."</string>
@@ -2886,4 +2902,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ar šo atļauju lietotnes var pārveidot sistēmas iestatījumus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jā"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nē"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pagriešana divreiz kameras atvēršanai"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Atvērt kameras lietotni, divreiz pagriežot plaukstas locītavu"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera, divreiz nospiežot barošanas pogu"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ērta kameras atvēršana, neatbloķējot ekrānu"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Spilgts (noklusējums)"</item>
+    <item msgid="8446070607501413455">"Dabisks"</item>
+    <item msgid="6553408765810699025">"Standarta"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Uzlabotas krāsas"</item>
+    <item msgid="8280754435979370728">"Dabiskas krāsas"</item>
+    <item msgid="5363960654009010371">"Digitālajam saturam optimizētas krāsas"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Attēla krāsu režīms"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Izmantot sRGB"</string>
 </resources>
diff --git a/res/values-mcc505/bools.xml b/res/values-mcc505/bools.xml
new file mode 100644
index 0000000..274841d
--- /dev/null
+++ b/res/values-mcc505/bools.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<resources>
+    <!-- Whether none security option is hide or not  (country specific). -->
+    <bool name="config_hide_none_security_option">true</bool>
+</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 23bcd15..0ac1e6d 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -98,8 +98,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Спречи употреба на бирач со Bluetooth кога екранот е заклучен"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Уреди со Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Име на уред"</string>
-    <string name="bluetooth_device_details" msgid="4594773497930028085">"Поставки за уред"</string>
-    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Поставки на профил"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Подесувања за уред"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Подесувања на профил"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Нема поставено име, се користи името на сметката"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Скенирај за уреди"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Преименувај го уредот"</string>
@@ -209,7 +209,7 @@
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Ажурирај"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Освежи"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Префрли ДНС проверка"</string>
-    <string name="oem_radio_info_label" msgid="6163141792477958941">"Информации/Поставки карактеристични за ОЕМ"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"Информации/Подесувања карактеристични за ОЕМ"</string>
     <string name="band_mode_title" msgid="954174198903776205">"Подеси појас на GSM/UMTS"</string>
     <string name="band_mode_loading" msgid="548764766363847336">"Вчитување список на појаси..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Подеси"</string>
@@ -242,14 +242,14 @@
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Информации за телефонот"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"УСБ меморија"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD картичка"</string>
-    <string name="proxy_settings_label" msgid="3271174136184391743">"Поставки за прокси"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"Подесувања за прокси"</string>
     <string name="cancel" msgid="6859253417269739139">"Откажи"</string>
     <string name="okay" msgid="1997666393121016642">"Во ред"</string>
     <string name="forget" msgid="1400428660472591263">"Заборави"</string>
     <string name="save" msgid="879993180139353333">"Зачувај"</string>
     <string name="done" msgid="6942539184162713160">"Готово"</string>
-    <string name="settings_label" msgid="1626402585530130914">"Поставки"</string>
-    <string name="settings_label_launcher" msgid="8344735489639482340">"Поставки"</string>
+    <string name="settings_label" msgid="1626402585530130914">"Подесувања"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Подесувања"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Кратенка за подесувања"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим на работа во авион"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Повеќе"</string>
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Поставување отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"За да користите отпечаток за отклучување на екранот или потврдување на купувањето, треба да:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Поставете резервен метод за заклучување на екранот"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Секогаш кога ќе ја видите оваа икона, може да го користите вашиот отпечаток за идентификација или да авторизирате купување."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само допрете го сензорот за отпечатоци за да го разбудите и отклучите уредот."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Кога ќе ја видите иконава, може да го користите отпечатокот."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Да се прескокне поставувањето отпечаток?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избравте да го користите отпечатокот од прстот како еден од начините на отклучување на телефонот. Ако го прескокнете сега, ќе треба да го поставите подоцна. За поставувањето ќе ви треба околу една минута."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Поставете заклучување на екранот"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Упс, тоа не е сензорот"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Користи сензор за отпечаток на уредот."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Запишувањето не е завршено"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Се достигна временското ограничување на запишувањето со отпечаток од прст. Обидете се повторно."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Запишувањето со отпечаток од прст не работеше. Обидете се повторно или користете друг прст."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додај друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Следно"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отклучување на телефонот, отпечатокот може да го користите и за да авторизирате купувања и да пристапувате до апликации. "<annotation id="url">"Дознајте повеќе"</annotation></string>
@@ -508,7 +514,7 @@
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Скенирај за уреди"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Освежи"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Пребарување..."</string>
-    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Поставки на уред"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Подесувања на уред"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"Спарен уред"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"Име"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"Поврзување на интернет"</string>
@@ -546,7 +552,7 @@
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Овозм. пренос на дојд. датот."</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Поврзан со уред за пристап на интернет"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Споделување локална конекција на интернет со уред"</string>
-    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Поставки на прикачен полнач"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Подесувања на прикачен полнач"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Користи прикачен полнач за аудио"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Како интерфон"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медиуми"</string>
@@ -582,7 +588,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Вклучи Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Поставки за Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Подесувања за Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Постави и управувај со безжични пристапни точки"</string>
     <string name="wifi_setup_wizard_title" msgid="7873622558088429710">"Изберете Wi-Fi мрежа"</string>
@@ -664,7 +670,7 @@
     <string name="wifi_ap_band_config" msgid="1611826705989117930">"Изберете појас на АП"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Појас од 2,4 GHz"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Појас од 5 GHz"</string>
-    <string name="wifi_ip_settings" msgid="3359331401377059481">"Поставки на ИП"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Подесувања на ИП"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(непроменети)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(неодредени)"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Достапен WPS"</string>
@@ -705,7 +711,7 @@
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ИП адреса"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Зачувани мрежи"</string>
-    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Поставки на ИП"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Подесувања на ИП"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Зачувај"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Откажи"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Внеси важечка ИП адреса."</string>
@@ -773,7 +779,7 @@
     <string name="media_volume_title" msgid="3576565767317118106">"Медиуми"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Постави јачина на звук за музика и видеа"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Аларм"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Поставки на аудио за прикачениот полнач"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Подесувања на аудио за прикачениот полнач"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Тонови на допир на тастатура за избирање"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Звуци при допир"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Звук на заклучување екран"</string>
@@ -788,13 +794,13 @@
     <string name="volume_notification_mute" msgid="7955193480006444159">"Исклучи звук на известувања"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Исклучи звук на предупредувања"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Приклучи на полнач"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"Поставки на полнач"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Подесувања на полнач"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Аудио"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Поставки на прикачен полнач за работна површина"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Поставки за прикачениот полнач за автомобил"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Подесувања на прикачен полнач за работна површина"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Подесувања за прикачениот полнач за автомобил"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Таблетот не е приклучен на полнач"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Телефонот не е приклучен на полнач"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Поставки за прикачениот полнач"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Подесувања за прикачениот полнач"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Полначот не е пронајден"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Треба да го приклучите таблетот пред да подесите приклучување аудио."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Треба да го приклучите телефонот пред да подесите приклучување аудио."</string>
@@ -820,7 +826,7 @@
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Автоматски префрли ја ориентацијата при ротирање на телефонот"</string>
     <string name="brightness" msgid="8480105032417444275">"Ниво на осветленост"</string>
     <string name="brightness_title" msgid="5746272622112982836">"Осветленост"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"Приспособи ја осветленоста на екранот"</string>
+    <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>
@@ -842,14 +848,14 @@
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"За да контролирате што се случува кога телефонот е приклучен на полнач и/или е во мирување, вклучете Daydream."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Кога е избрано Daydream"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Започни сега"</string>
-    <string name="screensaver_settings_button" msgid="7292214707625717013">"Поставки"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Подесувања"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматска осветленост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигнете да се активира"</string>
     <string name="doze_title" msgid="2259176504273878294">"Амбиентален екран"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Екран за будење кога ќе го подигнете уредот или ќе примите известувања"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Големина на фонт"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Големина на фонт"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Поставки на заклучување на SIM картичка"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Подесувања на заклучување на SIM картичка"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Постави заклучување на SIM картичката"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Заклучување на СИМ картичката"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Заклучи СИМ картичка"</string>
@@ -1052,7 +1058,7 @@
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Оваа <xliff:g id="NAME_0">^1</xliff:g> се чини дека е бавна. \n\nМоже да продолжите, но апликациите што се преместени на оваа локација може да подзастануваат и префрлањето податоци може да одзема многу време. \n\nРазмислете за користење побрза <xliff:g id="NAME_1">^1</xliff:g> за подобра изведба."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Статус на батеријата"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерија"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"Поставки на APN"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"Подесувања на APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Уреди пристапна точка"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Не е подесено"</string>
     <string name="apn_name" msgid="4115580098369824123">"Име"</string>
@@ -1123,7 +1129,7 @@
     <string name="master_clear_not_available" msgid="1000370707967468909">"Фабричкото ресетирање не е достапно за овој корисник"</string>
     <string name="master_clear_progress_title" msgid="5194793778701994634">"Се брише"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Почекајте..."</string>
-    <string name="call_settings_title" msgid="5188713413939232801">"Поставки на повик"</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"Подесувања на повик"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Подеси говорна пошта, проследување на повик, повик на чекање, ИД на повикувач"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Поврзување со УСБ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Преносл. точка на пристап"</string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Прикажи правни информации, статус, верзија на софтвер"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правни информации"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Соработници"</string>
+    <string name="manual" msgid="3025943393642974445">"Упатство"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Регулаторни информации"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Системска лиценца за WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Даватели на сателитски снимки:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Упатство"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Постои проблем со вчитување на упатството."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценци на софтвер со отворен код"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Постои проблем при вчитување на лиценците."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Се вчитува..."</string>
@@ -1270,14 +1279,14 @@
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управувај и отстрани инсталирани апликации"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Апликации"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управувај со апликации, постави кратенки за брзо стартување"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"Поставки на апликација"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"Подесувања на апликација"</string>
     <string name="install_applications" msgid="4872012136210802181">"Непознати извори"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Дозв. ги сите изв. на аплик."</string>
     <string name="install_unknown_applications_title" msgid="663831043139080992">"Ви овозм.да инсталирате аплик. од извори различни од Google Play"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Дозволи инсталација на апликации од непознати извори"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Вашиот таблет и личните податоци се повеќе ранливи на напади од апликации од непознати извори. Се согласувате дека единствено вие сте одговорни за каква било штета на таблетот или губење податоци кои може да произлезат од користењето на овие апликации."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Вашиот телефон и личните податоци се повеќе ранливи на напади од апликации од непознати извори. Се согласувате дека единствено вие сте одговорни за каква било штета на вашиот телефон или губење податоци кои може да произлезат од користењето на овие апликации."</string>
-    <string name="advanced_settings" msgid="1777249286757067969">"Напредни поставки"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Напредни подесувања"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Овозможи повеќе опции за подесување"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Информации за апликацијата"</string>
     <string name="storage_label" msgid="8700867073480107253">"Меморија"</string>
@@ -1424,11 +1433,11 @@
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Услуги"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Процеси"</string>
     <string name="service_stop" msgid="6369807553277527248">"Запри"</string>
-    <string name="service_manage" msgid="1876642087421959194">"Поставки"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Подесувања"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"Оваа услуга беше започната од нејзината апликација. Ако се запре може да предизвика апликацијата да откаже."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"Оваа апликација не може безбедно да се запре. Ако ја запрете, може да изгубите дел од вашата моментална работа."</string>
     <string name="background_process_stop_description" msgid="3834163804031287685">"Ова е процес на стара апликација кој сè уште работи во случај повторно да затреба. Обично нема причина да се запре."</string>
-    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: моментално е во употреба. Допрете „Поставки“ за да контролирате."</string>
+    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: моментално е во употреба. Допрете „Подесувања“ за да контролирате."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Главен процес во употреба."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Услугата <xliff:g id="COMP_NAME">%1$s</xliff:g> е во употреба."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Давателот <xliff:g id="COMP_NAME">%1$s</xliff:g> е во употреба."</string>
@@ -1437,7 +1446,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ако ја запрете оваа услуга, некои карактеристики на вашиот телефон може да престанат да работат правилно, додека не го исклучите и повторно не го вклучите."</string>
     <string name="language_settings" msgid="5292716747264442359">"Јазик и внесување"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Јазик и внес"</string>
-    <string name="language_settings_category" msgid="2288258489940617043">"Поставки на јазик"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Подесувања на јазик"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Тастатура и методи на внес"</string>
     <string name="phone_language" msgid="8870144109924299673">"Јазик"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1446,12 +1455,12 @@
     <string name="auto_caps" msgid="6379232078052591265">"Големи букви автоматски"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Секоја реченица започни ја со голема буква"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Автоматско ставање интерпункциски знаци"</string>
-    <string name="hardkeyboard_category" msgid="5957168411305769899">"Поставки на физичка тастатура"</string>
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Подесувања на физичка тастатура"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Притисни копче „Простор“ двапати за внесување „.“"</string>
     <string name="show_password" msgid="3001113966880559611">"Направи ги лозинките видливи"</string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Овој метод на внес може да го собере сиот текст кој го пишувате, вклучувајќи и лични податоци како што се, лозинки и броеви на кредитни картички. Тоа го прави апликацијата <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Користи го овој метод на внес?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Овој софтвер за проверка на правопис може да го собере сиот текст што го пишувате, вклучувајќи и лични податоци како што се лозинки и броеви на кредитни картички. Тоа го прави апликацијата <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Користи го овој софтвер за проверка на правопис?"</string>
-    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Поставки"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Подесувања"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Јазик"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Подесувањата за <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> не се отворија"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Глувче/подлога на допир"</string>
@@ -1494,15 +1503,15 @@
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Секогаш прикажувај"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Секогаш сокриј"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"Подеси методи на внес"</string>
-    <string name="input_method_settings" msgid="5801295625486269553">"Поставки"</string>
-    <string name="input_method_settings_button" msgid="6778344383871619368">"Поставки"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Подесувања"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Подесувања"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Активни методи на внес"</string>
     <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Користи системски јазик"</string>
-    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Поставки на <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Подесувања на <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Избери активни методи на внес"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Поставки на тастатура на екран"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Подесувања на тастатура на екран"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Физичка тастатура"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Поставки на физичка тастатура"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Подесувања на физичка тастатура"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Опции на развивач"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Постави опции за развој на апликација"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"Опциите на програмерот не се достапни за овој корисник"</string>
@@ -1584,7 +1593,7 @@
     <string name="last_time_used_label" msgid="8459441968795479307">"Користено последен пат"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Време на употреба"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Пристапност"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"Поставки на пристапност"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Подесувања на пристапност"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Услуги"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"Приказ"</string>
@@ -1615,7 +1624,7 @@
     <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Девтераномалија (слепило за црвена и зелена)"</string>
     <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Протаномалија (слепило за црвена и зелена)"</string>
     <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Тританомалија (слепило за сина и жолта)"</string>
-    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Поставки"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Подесувања"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Вклучено"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Исклучено"</string>
     <string name="accessibility_feature_or_input_method_not_allowed" msgid="5950315477009501647">"Не е дозволено од вашата организација"</string>
@@ -1663,14 +1672,14 @@
     <string name="disable_service_message" msgid="2012273739481042318">"Допри „Во ред“ и <xliff:g id="SERVICE">%1$s</xliff:g> ќе запре."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Нема инсталирано услуги"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Не е обезбеден опис."</string>
-    <string name="settings_button" msgid="3006713718908152930">"Поставки"</string>
+    <string name="settings_button" msgid="3006713718908152930">"Подесувања"</string>
     <string name="print_settings" msgid="4742428530112487843">"Печатење"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуги за печатење"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Употреби <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Вашиот документ може да помине преку еден или повеќе сервери на својот пат до печатачот."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Нема инсталирано услуги"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Не се пронајдени печатачи"</string>
-    <string name="print_menu_item_settings" msgid="6591330373682227082">"Поставки"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Подесувања"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додај печатачи"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Вклучено"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Исклучено"</string>
@@ -1723,7 +1732,7 @@
     <string name="history_details_title" msgid="3608240585315506067">"Детали на историја"</string>
     <string name="details_title" msgid="3792801565213935385">"Користи детали"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Користи детали"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"Приспособи употреба на струја"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Прилагоди употреба на струја"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Вклучени пакети"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Светилка"</string>
@@ -1759,10 +1768,10 @@
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Забележана употреба на напојување"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Исклучи присилно"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Информации за апликацијата"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"Поставки на апликација"</string>
-    <string name="battery_action_display" msgid="7338551244519110831">"Поставки на екран"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Поставки за Wi-Fi"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Поставки на Bluetooth"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"Подесувања на апликација"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Подесувања на екран"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Подесувања за Wi-Fi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Подесувања на Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Батеријата се користи за разговори"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Батеријата се користи кога таблетот е во мирување"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Батеријата се користи кога телефонот е во мирување"</string>
@@ -1838,7 +1847,7 @@
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Преден план"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Кеширани"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Влез и излез на глас"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Поставки на влез и излез на глас"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Подесувања на влез и излез на глас"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Барај со глас"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Тастатура за Android"</string>
     <string name="voice_category" msgid="1430370497125803904">"Говор"</string>
@@ -1848,7 +1857,7 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Целосна услуга – клучен збор и интеракција"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Едноставна услуга – говор во текст"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Услугата за гласовен запис ќе може да извршува постојан гласовен надзор и да ги контролира гласовно овозможените апликации во ваше име. Ова доаѓа од апликацијата <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Овозможете користење на услугата?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Поставки на текст-во-говор"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Подесувања на текст-во-говор"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"Излез текст-во-говор"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Секогаш користи ги моите подесувања"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Стандардните подесувања подолу ги заменуваат подесувањата за апликации"</string>
@@ -1881,11 +1890,11 @@
     <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> не е поддржано"</string>
     <string name="tts_status_checking" msgid="4983413982985913047">"Се проверува..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Софтвери"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Поставки на <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Подесувања на <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е овозможен"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е оневозможен"</string>
     <string name="tts_engine_settings_section" msgid="2346105138448751893">"Подесувања на софтвер"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Поставки на <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Подесувања на <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Јазици и гласови"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Инсталиран"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Не е инсталиран"</string>
@@ -1965,7 +1974,7 @@
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Да престане со резервни копии на вашите лозинки на Wi-Fi, обележувачи, други поставки и податоци за апликацијата и да ги избрише сите копии на серверите на Google?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="944399039066318647">"Дали да се престане со создавање резервна копија на податоците на уредот (како што се лозинки за Wi-Fi и историја на повикување) и податоците за апликациите (како што се поставки и датотеки што ги складирале апликациите) и да се избришат сите копии на Диск на Google?"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Автоматски создајте резервна копија на податоците на уредот (како што се лозинки за Wi-Fi и историја на повици) и податоците за апликациите (како што се поставки и датотеки кои ги складирале апликациите) од далечина.\n\nОткако ќе вклучите автоматско создавање резервна копија, податоците за уредот и апликациите повремено се зачувуваат на далечина. Податоците за апликацијата може да бидат секакви податоци кои ги зачувала апликацијата (според поставките на програмерот), вклучувајќи потенцијално чувствителни податоци како што се контакти, пораки и фотографии."</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Поставки на администратор на уред"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Подесувања на администратор на уред"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор на уред"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Деактивирај"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Администратори на уред"</string>
@@ -2035,7 +2044,7 @@
     <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="sync_in_progress" msgid="5151314196536070569">"Се синхронизира сега..."</string>
-    <string name="settings_backup" msgid="2274732978260797031">"Поставки на резервна копија"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Подесувања на резервна копија"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Резервна копија на моите подесувања"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронизирај сега"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Откажи синхронизација"</string>
@@ -2048,7 +2057,7 @@
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Подесувања на синхронизација на апликација"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Податоци и синхронизација"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Смени лозинка"</string>
-    <string name="header_account_settings" msgid="5382475087121880626">"Поставки на сметка"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Подесувања на сметка"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Отстрани сметка"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"Додај сметка"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Заврши"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"апликации дозволи безбедност"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"апликациите се стандардни"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"игнорирај оптимизации дремка подготвеност на апликација"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"динамично rgb srgb боја природно стандардно"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"лизгај лозинка шема ПИН"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Поставете Wi-Fi ознака за НФЦ"</string>
     <string name="write_tag" msgid="8571858602896222537">"Пишувај"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Прикажи SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Дополнителни дозволи"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Уште <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Само за полнење"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Пренос на датотеки (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Пренос на фотографии (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Се полни"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Само полни го уредов"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Напојување"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Полни го другиот поврзан уред"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Преноси на датотеки"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Пренесувај датотеки на Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Пренос на фотографии (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Пренесувај фотографии или датотеки ако не е подржан MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"МИДИ"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Користи го уредот за MIDI-влез"</string>
     <string name="usb_use" msgid="3372728031108932425">"Користи УСБ за"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивни апликации"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивно. Допрете за префрлање."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Оваа дозвола овозможува апликацијата да менува поставки на системот."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Завртете двапати за камерата"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Завртете го зглобот двапати за да ја отворите апликација за камера"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Прит. копче за напој. двапати за камера"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Брзо отворете ја камерата без да го отклучувате екранот"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Динамично (стандардно)"</item>
+    <item msgid="8446070607501413455">"Природно"</item>
+    <item msgid="6553408765810699025">"Стандардно"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Подобрени бои"</item>
+    <item msgid="8280754435979370728">"Природни бои како што со гледаат со голо око"</item>
+    <item msgid="5363960654009010371">"Оптимизирани бои за дигитална содржина"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Режим на боја на слика"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Користи sRGB"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index fd6a6b7..15b40a0 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"വിരലടയാള സജ്ജീകരണം"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"നിങ്ങളുടെ സ്‌ക്രീൻ അൺലോക്കുചെയ്യാനോ വാങ്ങലുകൾ സ്ഥിരീകരിക്കാനോ വിരലടയാളം ഉപയോഗിക്കുന്നതിന്, ഞങ്ങൾക്ക് ഇവ ചെയ്യേണ്ടതുണ്ട്:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"നിങ്ങളുടെ ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് രീതി സജ്ജമാക്കുക"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോഴെല്ലാം, തിരിച്ചറിയാനോ ഒരു വാങ്ങലിന് അംഗീകാരം നൽകാനോ വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"നിങ്ങളുടെ ഉപകരണം ഉണർത്താനും അൺലോക്കുചെയ്യാനും വിരലടയാള സെൻസറിൽ തൊട്ടാൽ മതിയാകും."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ഈ ഐക്കൺ കാണുമ്പോൾ, നിങ്ങൾക്ക് വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"വിരലടയാളം സജ്ജമാക്കൽ ഒഴിവാക്കണോ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനുള്ള ഒരു മാർഗ്ഗമായി നിങ്ങൾ വിരലടലാളം ഉപയോഗിക്കുന്നതിന് തീരുമാനിച്ചിരിക്കുന്നു. നിങ്ങളിത് ഇപ്പോൾ ഒഴിവാക്കുന്നുവെങ്കിൽ, പിന്നീട് സജ്ജമാക്കേണ്ടി വരും. സജ്ജീകരിക്കലിന് ഒരൽപ്പസമയമേ എടുക്കുകയുള്ളൂ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"പൂർത്തിയായി"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ക്ഷമിക്കണം, അത് സെൻസർ അല്ല"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഫിംഗർപ്രിന്റ് സെൻസർ ഉപയോഗിക്കുക."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"എൻറോൾമെന്റ് പൂർത്തിയായിട്ടില്ല"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"വിരലടയാള എൻറോൾമെന്റിന്റെ സമയ പരിധി എത്തി. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"വിരലടയാള എൻറോൾമെന്റ് പ്രവർത്തിച്ചില്ല. വീണ്ടും ശ്രമിക്കുകയോ മറ്റൊരു വിരൽ ഉപയോഗിക്കുകയോ ചെയ്യുക."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"മറ്റൊന്ന് ചേർക്കുക"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"അടുത്തത്"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതുകൂടാതെ, വാങ്ങലുകളും അപ്ലിക്കേഷൻ ആക്‌സസ്സും അംഗീകരിക്കാൻ നിങ്ങൾക്ക് വിരലടയാളം ഉപയോഗിക്കാനുമാകും. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"നിയമ വിവരം, നില, സോഫ്‌റ്റ്‌വെയർ പതിപ്പ് എന്നിവ കാണുക"</string>
     <string name="legal_information" msgid="5769301644270604095">"നിയമപരമായ വിവരം"</string>
     <string name="contributors_title" msgid="5917703088825286504">"സംഭാവകർ"</string>
+    <string name="manual" msgid="3025943393642974445">"മാനുവൽ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"റെഗുലേറ്ററി വിവരം"</string>
     <string name="copyright_title" msgid="865906688917260647">"പകര്‍പ്പവകാശം"</string>
     <string name="license_title" msgid="1990487604356037871">"ലൈസന്‍സ്"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"സിസ്‌റ്റം WebView ലൈസൻസ്"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"വാൾപേപ്പറുകൾ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ഉപഗ്രഹ ഇമേജറി ദാതാക്കൾ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"മാനുവൽ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"മാനുവൽ ലോഡുചെയ്യുന്നതിൽ ഒരു പ്രശ്നമുണ്ട്."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസുകൾ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ലൈസൻസുകൾ ലോഡുചെയ്യുന്നതിൽ ഒരു പ്രശ്നമുണ്ട്."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ലോഡുചെയ്യുന്നു..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"അപ്ലിക്കേഷൻ അനുമതി സുരക്ഷ"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"സ്ഥിര അപ്ലിക്കേഷനുകൾ"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ഒപ്റ്റിമൈസേഷൻ ഡോസ് ആപ്പ് സ്‌റ്റാൻഡ്‌ബൈ അവഗണിക്കുക"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"വൈബ്രന്റ് rgb srgb വർണ്ണ സ്വാഭാവിക സ്റ്റാൻഡേർഡ്"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"പാസ്‌വേഡ് പാറ്റേൺ പിൻ സ്ലൈഡുചെയ്യുക"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"വൈഫൈ NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ട്യൂണർ കാണിക്കുക"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"അധിക അനുമതികൾ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> എണ്ണം കൂടി"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ചാർജ്ജിംഗ് മാത്രം"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ഫയലുകൾ കൈമാറുക (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ഫോട്ടോകൾ കൈമാറുക (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ചാർജ്ജുചെയ്യുന്നു"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ഈ ഉപകരണം ചാർജുചെയ്താൽ മാത്രം മതി"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"പവർ സപ്ലെ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ബന്ധിപ്പിച്ചിട്ടുള്ള രണ്ടാമത്തെ ഉപകരണം ചാർജുചെയ്യുക"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ഫയൽ കൈമാറ്റങ്ങൾ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows-ലേക്കോ Mac-ലേക്കോ ഫയലുകൾ കൈമാറുക (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ഫോട്ടോ കൈമാറുക (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP പിന്തുണയ്ക്കുന്നില്ലെങ്കിൽ ഫോട്ടോകളോ ഫയലുകളോ കൈമാറുക (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ഇൻപുട്ടിനായി ഉപകരണം ഉപയോഗിക്കുക"</string>
     <string name="usb_use" msgid="3372728031108932425">"ഇതിനായി USB ഉപയോഗിക്കുക"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"നിഷ്‌ക്രിയ ആപ്പ്‌സ്"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"നിഷ്‌ക്രിയം. ടോഗിൾ ചെയ്യാൻ സ്‌പർശിക്കുക."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കുന്നതിന് ഒരു ആപ്പിനെ ഈ അനുമതി അനുവദിക്കുന്നു."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"അതെ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ഇല്ല"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ക്യാമറയ്ക്കായി രണ്ടുതവണ തിരിക്കുക"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"നിങ്ങളുടെ കൈത്തണ്ട രണ്ടുപ്രാവശ്യം തിരിച്ചുകൊണ്ട് ക്യാമറാ ആപ്പ് തുറക്കുക"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ക്യാമറയ്ക്കായി പവർ ബട്ടൺ രണ്ടുതവണ അമർത്തുക"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"സ്ക്രീൻ അൺലോക്ക് ചെയ്യാതെ തന്നെ, അതിവേഗം ക്യാമറ തുറക്കുക"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"വൈബ്രന്റ് (സ്ഥിരമായത്)"</item>
+    <item msgid="8446070607501413455">"സ്വാഭാവികം"</item>
+    <item msgid="6553408765810699025">"സ്റ്റാന്‍ഡേര്‍ഡ്"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"മെച്ചപ്പെടുത്തിയ വര്‍ണ്ണങ്ങൾ"</item>
+    <item msgid="8280754435979370728">"നമ്മൾ കാണുന്നത് പോലെയുള്ള സ്വാഭാവിക വർണ്ണങ്ങൾ"</item>
+    <item msgid="5363960654009010371">"ഡിജിറ്റൽ ഉള്ളടക്കത്തിനായി വർണ്ണങ്ങൾ ഒപ്റ്റിമൈസ് ചെയ്തു"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"ചിത്ര വർണ്ണ മോഡ്"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ഉപയോഗിക്കുക"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 6e2e5a1..5d236a7 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Хурууны хээний тохиргоо"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Таны хурууны хээг ашиглан дэлгэцийн түгжээг тайлах эсвэл худалдан авалт баталгаажуулахын тулд бид дараах зүйлийг хийх шаардлагатай:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Нөөцлөлтийн дэлгэц түгжих аргыг тохируулах"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Энэ тэмдэг гарч ирсэн тохиолдолд та өөрийн хурууны хээг оруулах эсвэл худалдан авалт хийх зөвшөөрөл олгох боломжтой болох юм."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Утсаа сэрээх, түгжээг тайлахдаа хурууны хээ мэдрэгчид хүрээрэй."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Энэ тэмдэг гарахад хурууны хээгээ оруулна."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Хурууны хээн тохиргоог алгасах уу?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Та утасны түгжээг тайлах нэг хувилбараар хурууны хээн тохиргоог сонголоо. Хэрэв та одоо алгасвал энэ тохиргоог дараа хийх шаардлагатай болно. Тохиргоо хийхэд хэдхэн хором шаардлагатай."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Дэлгэцийн түгжээ тохируулах"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Үйлдлийг гүйцэтгэсэн байна"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Уучлаарай, энэ мэдрэгч биш байна"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Төхөөрөмж дээрээ хурууны хээ мэдрэгчээ ашиглана уу"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Бүртгэлийг гүйцэт хийж чадсангүй"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Хурууны хээ оруулах хугацаа өнгөрсөн байна. Дахин оруулна уу."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Хурууны хээг оруулж чадсангүй. Дахин оролдох, эсвэл өөр хуруу ашиглана уу."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Өөрийг нэмэх"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Дараах"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Хурууны хээгээ ашиглан утасны түгжээг нээхээс гадна, худалдан авалт хийж, апп-д нэвтэрч болно. "<annotation id="url">"Дэлгэрэнгүй мэдээлэл"</annotation></string>
@@ -1198,6 +1204,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Хууль эрх зүйн мэдээлэл, статус, програмын хувилбарыг харах"</string>
     <string name="legal_information" msgid="5769301644270604095">"Хууль эрх зүйн мэдээлэл"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Хувь оруулагчид"</string>
+    <string name="manual" msgid="3025943393642974445">"Гар ажиллагаатай"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Зохицуулалтын мэдээлэл"</string>
     <string name="copyright_title" msgid="865906688917260647">"Зохиогчийн эрх"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
@@ -1205,6 +1212,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Системийн WebView-ийн лиценз"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ханын зураг"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Сансрын зураг нийлүүлэгчид: \n © 2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Гар ажиллагаатай"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Гар ажиллагааг ачаалах явцад алдаа гарлаа."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Нээлттэй Эхийн Лиценз"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензүүдийг ачааллах явцад алдаа гарлаа."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ачаалж байна..."</string>
@@ -2492,6 +2501,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"апп-уудын зөвшөөрлийн аюулгүй байдал"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"үндсэн апликейшнүүд"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"Апп түр зогсонги үед оновчлолыг алгасах"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"байгалийн стандарт хурц rgb srgb өнгө"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"слайд нууц үг хээ пин"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
@@ -2787,10 +2797,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner харуулах"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Нэмэлт зөвшөөрөл"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> бусад"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Зөвхөн цэнэглэх"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Дамжуулах файл (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Дамжуулах зураг (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Цэнэглэж байна"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Энэ төхөөрөмжийг л цэнэглэх"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Эрчим хүчний хангамж"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Бусад холбосон төхөөрөмжийг цэнэглэх"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Файл шилжүүлэх"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows эсвэл Mac (MTP) рүү файл шилжүүлэх"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Зураг шилжүүлэх (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP дэмждэггүй бол зураг, файл илгээх (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI оролтод төхөөрөмжийг ашиглах"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB-ыг ашиглах"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Идэвхгүй апп-ууд"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Идэвхгүй. Сэлгэхийн тулд хүрнэ үү."</string>
@@ -2856,4 +2872,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Энэ нь апп-д системийн тохиргоог өөрчлөхийг зөвшөөрдөг."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Тийм"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Үгүй"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Камер нээхийн тулд бугуйгаа 2 удаа эргүүлэх"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Бугуйгаа 2 удаа эргүүлэн камерын апп-ыг нээгээрэй"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камер нээхийн тулд асаах/унтраах товчлуурыг 2 удаа дараарай"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Камерыг дэлгэцийн түгжээ тайлалгүйгээр төвөггүй нээх"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Хурц (үндсэн)"</item>
+    <item msgid="8446070607501413455">"Байгалийн"</item>
+    <item msgid="6553408765810699025">"Стандарт"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Сайжруулсан өнгө"</item>
+    <item msgid="8280754435979370728">"Нүдээр харж болох байгалийн өнгө"</item>
+    <item msgid="5363960654009010371">"Дижитал агуулгад зориулан тааруулсан өнгө"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"\"Зургийн өнгө\" горим"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB-г ашиглах"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 446f8d5..0d78a17 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"फिंगरप्रिंट सेटअप करा"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"आपली स्क्रीन अनलॉक किंवा खरेदीची पुष्टी करण्याकरिता आपले फिंगरप्रिंट वापरण्यासाठी, आम्हाला याची आवश्यकता असेल:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"आपली बॅकअप स्क्रीन लॉक पद्धत सेट करा"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जेव्हाही आपण हे चिन्ह पाहता, तेव्हा आपण ओळखीसाठी किंवा खरेदी अधिकृत करण्यासाठी आपले फिंगरप्रिंट वापरू शकता."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"आपले डिव्‍हाइस सक्रिय आणि अनलॉक करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"आपण हे चिन्ह पाहता तेव्‍हा, आपण आपले फिंगरप्रिंट वापरू शकता."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिंट सेटअप वगळायचे?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपण आपला फोन अनलॉक करण्याची एक पद्धत म्हणून आपण आपले फिंगरप्रिंट वापरणे निवडले. आता आपण वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रीन लॉक सेट करा"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"पूर्ण झाले"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"अरेरे, तो सेन्सर नाही"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"आपल्या डिव्हाइसवर फिंगरप्रिंट सेन्सर वापरा."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"नोंदणी पूर्ण झाली नाही"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फिंगरप्रिंट नोंदणी वेळ मर्यादा गाठली. पुन्हा प्रयत्न करा."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फिंगरप्रिंट नोंदणीने कार्य केले नाही. पुन्हा प्रयत्न करा किंवा भिन्न बोट वापरून पहा."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"दुसरे जोडा"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"पुढील"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"आपला फोन अनलॉक करण्‍याव्यतिरिक्त, आपण आपल्या फिंगरप्रिंटचा वापर खरेदी आणि अ‍ॅप प्रवेश प्रमाणित करण्‍यासाठी देखील करू शकता. "<annotation id="url">"अधिक जाणून घ्‍या"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"कायदेशीर माहिती, स्थिती, सॉफ्टवेअर आवृत्ती पहा"</string>
     <string name="legal_information" msgid="5769301644270604095">"कायदेशीर माहिती"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ते"</string>
+    <string name="manual" msgid="3025943393642974445">"व्यक्तिचलित"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"नियामक माहिती"</string>
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"परवाना"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"सिस्टीम WebView परवाना"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वॉलपेपर"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह प्रतिमा प्रदाते:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"व्यक्तिचलित"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"व्यक्तिचलित लोड करताना समस्या आली."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"मुक्त स्त्रोत परवाने"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"परवाने लोड करताना समस्या आली."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड करत आहे..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"अॅप्स परवानग्या सुरक्षितता"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"अ‍ॅप्‍स डीफॉल्‍ट"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ऑप्टिमायझेशन निष्क्रियता अॅप स्टँडबायकडे दुर्लक्ष करा"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"सशक्त rgb srgb रंग नैसर्गिक मानक"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"संकेतशब्द नमुना पिन स्लाइड करा"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दर्शवा"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त परवानग्या"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"केवळ चार्जिंग"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"फायली स्थानांतरित करा (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फोटो स्थानांतरित करा (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"चार्ज होत आहे"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"फक्त हे डिव्‍हाइस चार्ज करा"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"उर्जा पुरवठा"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"इतर कनेक्‍ट केलेले डिव्‍हाइस चार्ज करा"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"फाईल स्‍थानांतरण"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows किंवा Mac (MTP) वर फायली स्थानांतरित करा"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"फोटो स्थानांतरण (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP (PTP) समर्थित नसल्‍यास फोटो किंवा फायली स्थानांतरित  करा"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI इनपुटसाठी डिव्‍हाइस वापरा"</string>
     <string name="usb_use" msgid="3372728031108932425">"यासाठी USB वापरा"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"निष्क्रिय अ‍ॅप्स"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"निष्क्रिय. टॉगल करण्‍यासाठी स्पर्श करा."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ही परवानगी अॅपला सिस्टीम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"होय"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"नाही"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"कॅमेर्‍यासाठी दोनदा वळवा"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"आपले मनगट दोनदा वळवून कॅमेरा अॅप उघडा"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कॅमेर्‍यासाठी उर्जा बटण दोनदा दाबा"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"आपली स्क्रीन अनलॉक न करता कॅमेरा दृतपणे उघडा"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"सशक्त (डीफॉल्ट)"</item>
+    <item msgid="8446070607501413455">"नैसर्गिक"</item>
+    <item msgid="6553408765810699025">"मानक"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"वर्धित रंग"</item>
+    <item msgid="8280754435979370728">"डोळ्यांनी पाहिले तसे नैसर्गिक रंग"</item>
+    <item msgid="5363960654009010371">"डिजिटल सामग्रीसाठी ऑप्टिमाइझ केलेले रंग"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रंग मोड"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB वापरा"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3d36374..fe7c99e 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> cap jari disediakan</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> cap jari disediakan</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Persediaan cap jari"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Untuk menggunakan cap jari anda untuk membuka kunci skrin anda atau mengesahkan pembelian, anda perlu:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Sediakan kaedah kunci skrin sandaran anda"</string>
@@ -346,10 +347,15 @@
     <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="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Sentuh sahaja penderia cap jari untuk membangunkan dan membuka kunci peranti anda."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Anda boleh menggunakan cap jari setiap kali ikon ini kelihatan."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Langkau persediaan cap jari?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan cap jari sebagai satu cara untuk membuka kunci telefon anda. Jika anda melangkaui sekarang, anda perlu menyediakannya kemudian. Persediaan hanya mengambil sedikit masa."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Sediakan kunci skrin"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Selesai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Op, itu bukan penderia"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gunakan penderia cap jari pada peranti anda."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Pendaftaran tidak selesai"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Had masa pendaftaran cap jari dicapai. Cuba lagi."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Pendaftaran cap jari tidak berjaya. Cuba lagi atau gunakan jari yang lain."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Tambah yang lain"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seterusnya"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Selain membuka kunci telefon anda, anda boleh menggunakan cap jari untuk membenarkan pembelian dan akses apl juga. "<annotation id="url">"Ketahui lebih lanjut"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Lihat maklumat undang-undang, status, versi perisian"</string>
     <string name="legal_information" msgid="5769301644270604095">"Maklumat undang-undang"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Penyumbang"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Maklumat kawal selia"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lesen"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Lesen WebView Sistem"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Kertas dinding"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Pembekal imej satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Terdapat masalah memuatkan manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Lesen sumber terbuka"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Terdapat masalah memuatkan lesen."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Memuatkan..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"keselamatan kebenaran apl"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apl lalai"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"abaikan pengoptimuman tidurkan apl tunggu sedia"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"terang rgb srgb warna semula jadi standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"luncur kata laluan corak pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Tunjukkan Penala SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Kebenaran tambahan"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> lagi"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Pengecasan sahaja"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Pindahkan fail (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Pindahkan foto (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Mengecas"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Cas sahaja peranti ini"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Bekalan kuasa"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Caskan peranti tersambung yang lain"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Pemindahan fail"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Memindahkan fail ke Windows atau Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Pemindahan foto (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Pindahkan foto atau fail jika MTP tidak disokong (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gunakan peranti untuk input MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gunakan USB untuk"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Apl yang tidak aktif"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Tidak aktif. Sentuh untuk menogol."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Kebenaran ini membolehkan apl mengubah suai tetapan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Pusing dua kali untuk membuka kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Buka apl kamera dengan memusingkan pergelangan tangan anda dua kali"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tekan butang kuasa dua kali untuk kamera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Buka kamera dengan cepat tanpa membuka kunci skrin"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Terang (lalai)"</item>
+    <item msgid="8446070607501413455">"Semula Jadi"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Warna dipertingkat"</item>
+    <item msgid="8280754435979370728">"Warna semula jadi seperti yang dilihat oleh mata"</item>
+    <item msgid="5363960654009010371">"Warna dioptimumkan untuk kandungan digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Mod warna gambar"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gunakan sRGB"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 6239d56..3cecd91 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"လက်ဗွေရာကို တပ်ဆင်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"သင့်ရဲ့ဖုန်းဖန်သားပြင်ကို သော့ဖွင့်ရန် သို့မဟုတ် ၀ယ်ယူမှုများကို အတည်ပြုရန် ကျွန်တော့တို့ လုပ်ဖို့လိုသည်မှာ-"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"သင့်ဖုန်း ဖန်သားပြင်သော့စနစ်အား သတ်မှတ်ပါ"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ဤကိုယ်စားပြုရုပ်ပုံကို သင်တွေ့တိုင်း၊  သက်သေခံခြင်းအတွက်သို့မဟုတ် ဝယ်ယူခြင်းကို ခွင့်ပြုရန်အတွက် သင့်လက်ဗွေရာကို အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"သင်၏ ကိရိယာကို နှိုးပေးရန် နှင့် သော့ဖွင့်ရန် လက်ဗွေ အာရုံခံ ကိရိယာကို ထိလိုက်ရုံပါပဲ။"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"သင်သည် ဤအိုင်ကွန်ကို မြင်သောလျှင်၊ သင်သည် သင်၏ လက်ဗွေကို သုံးနိုင်သည်။"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"လက်ဗွေရာ သတ်မှတ်မှုကို ကျော်မလား"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"သင့်လက်ဗွေဖြင့် သင့်ဖုန်းကို သော့ဖွင့်ရန် နည်းလမ်းတစ်ခုအဖြစ် ရွေးချယ်ခဲ့သည်။ အကယ်၍ယခုကျော်သွားလျှင်၊ ၎င်းကိုနောက်နှောင်တွင် သတ်မှတ်ရပါလိမ့်မည်။ သတ်မှတ်ခြင်းသည် မိနစ်အနည်းငယ်သာ ကြာပါသည်။"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ဖုန်းဖန်သားပြင် သော့စနစ် သတ်မှတ်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ပြီးပါပြီ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"အိုး။ ဒါ အာရုံခံကိရိယာမဟုတ်ဘူး"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"သင့်ရဲ့ စက်ကိရိယာပေါ်တွင် လက်ဗွေအာရုံခံစက်ကိုအသုံးပြုပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"စာရင်းသွင်းမှု မပြီးစီးခဲ့ပါ"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"လက်ဗွေ ပေးသွင်းမှု ကန့်သတ်ချိန် ကုန်သွားပြီ။ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"လက်ဗွေ ပေးသွင်းမှု အလုပ်မဖြစ်ခဲ့ပါ။ အခြား လက်ချောင်းကို သုံးရန် ထပ်စမ်းကြည်ပါ။"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"အခြား ကြော်ငြာ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"နောက်တစ်ခု"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"သင့်ဖုန်းကို သော့ဖွင့်ရန်အပြင်၊ သင်သည်သင့်လက်ဗွေကို ဝယ်ယူမှုများနှင့် အပ်ဖ်အသုံးပြုခွင့်ကို ခွင့်ပြုရန် အသုံးပြုနိုင်သည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"ဥပဒေဆိုင်ရာအချက်အလက်၊ အခြေအနေ၊ ဆော့ဝဲလ်ဗားရှင်းအား ကြည့်ရှုရန်"</string>
     <string name="legal_information" msgid="5769301644270604095">"ဥပဒေဆိုင်ရာအချက်အလက်များ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ထောက်ပံ့သူများ"</string>
+    <string name="manual" msgid="3025943393642974445">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"စံစည်းမျဉ်း လိုက်နာမှု"</string>
     <string name="copyright_title" msgid="865906688917260647">"မူပိုင်ခွင့်"</string>
     <string name="license_title" msgid="1990487604356037871">"လိုင်စင်"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"စနစ် WebView လိုင်စင်"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"နောက်ခံပုံများ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ဂြိုဟ်တုပုံ ပေးပို့သူများ-\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"လမ်းညွှန်ကို ဖတ်တင်ရန် ပြသနာရှိနေပါသည်"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"အိုးပင်းဆော့လိုင်စင်များအားဖွင့်ရန်"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"လိုင်စင်များကို ဖတ်တင်ရန် ပြသနာရှိနေပါသည်"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ဖွင့်နေစဉ်"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"အပ်ဖ်များ ခွင့်ပြုချက်လုံခြုံရေး"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apps များ ပုံမှန်"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"Doze app အရံသင့်ထားခြင်းအား လျစ်လျူရှုရန်"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"တက်ကြွသည့် rgb srgb အရောင်စံသဘာဝ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"စကားဝှက် ပုံစံ ပင်ကို ရွှေ့ရန်"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner ပြရန်"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ထပ်တိုး ခွင့်ပြုချက်များ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"နောက်ထပ် <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"အားသွင်းရန် အတွက်သာ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ဖိုင်များ လွှဲပြောင်းရန် (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ဓာတ်ပုံများ လွှဲပြောင်းရန် (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"အားသွင်းနေ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ဒီဖုန်းကို အားသွင်းရုံပါ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ပါဝါ ဆက်သွယ်မှု"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ချိတ်ဆက်ထားသည့် အခြား device ကို အားသွင်းရန်"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ဖိုင် လွှဲပြောင်းမှုများ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"ဖိုင်များကို Windows သို့မဟုတ် Mac (MTP) ထံ လွှဲပြောင်းရန်"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ဓာတ်ပုံ လွှဲပြောင်းမှု (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ကို မပံ့ပိုးလျှင် (PTP) ဓာတ်ပုံများ သို့မဟုတ် ဖိုင်များကို လွှဲပြောင်းရန်"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ထည့်သွင်းမှု အတွက် ကိရိယာကို သုံးရန်"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB သုံးပါ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"အလုပ်မလုပ်သော app များ"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"အလုပ်မလုပ်ပါ။ ခလုတ်ကို ထိပါ။"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ဤခွင့်ပြုချက်သည် အပ်ဖ်ကို စနစ်ချိန်ညှိချက်များအား ပြန်ပြင်ခွင့်ပေးသည်။"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ဟုတ်"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"မလို"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ကင်မရာအတွက် နှစ်ကြိမ် လှည့်ပါ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"သင့်လက်ကိုနှစ်ကြိမ်လှည့်ခြင်းဖြင့် ကင်မရာအပ်ဖ်ကို ဖွင့်ပါ"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ကင်မရာအတွက် ပါဝါခလုတ်ကို နှစ်ကြိမ် နှိပ်ပါ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"သင်၏ မျက်နှာပြင်ကို သော့မဖွင့်ဘဲနှင့် ကင်မရာကို အမြန်ဖွင့်ပါ"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"တက်ကြွခြင်း (မူလ)"</item>
+    <item msgid="8446070607501413455">"သဘာဝ"</item>
+    <item msgid="6553408765810699025">"စံ"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"ပိုမိုကောင်းမွန်အောင်ပြုလုပ်ထားသည့် အရောင်များ"</item>
+    <item msgid="8280754435979370728">"မျက်လုံးမှတွေ့ရသည့် သဘာဝအရောင်"</item>
+    <item msgid="5363960654009010371">"ဒီဂျစ်တယ်အကြောင်းအရာအတွက် ပြင်ဆင်ထားသည့် အရောင်များ"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"ဓာတ်ပုံအရောင်မုဒ်"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ကို အသုံးပြုပါ"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 291f241..37f6f6b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingeravtrykk er registrert</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingeravtrykk er registrert</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Fingeravtrykkonfig."</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Hvis du vil bruke fingeravtrykk til å låse opp skjermen eller bekrefte kjøp, må du"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Konfigurer låsemetoden for bakgrunnsskjermen din"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt som identifikasjon eller til å godkjenne kjøp."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Bare trykk på fingeravtrykksensoren for å vekke og låse opp enheten din."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du hoppe over fingeravtrykk-konfig.?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt å bruke fingeravtrykket ditt som én måte å låse opp telefonen din på. Hvis du hopper over konfigureringen nå, må du fullføre den senere. Konfigureringen tar bare et par minutter."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skjermlås"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Ferdig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ops, det er ikke sensoren"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Bruk fingeravtrykksensoren på enheten."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrering er ikke fullført"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tidsgrensen for registrering av fingeravtrykk er nådd. Prøv på nytt."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrering av fingeravtrykket mislyktes. Prøv på nytt, eller bruk en annen finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Legg til ett til"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Neste"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"I tillegg til å låse opp telefonen din, kan du bruke fingeravtrykket ditt til å godkjenne kjøp og apptilgang. "<annotation id="url">"Finn ut mer"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Vis juridisk informasjon, status og programvareversjon"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medvirkende"</string>
+    <string name="manual" msgid="3025943393642974445">"Brukerveiledning"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Standarder/bestemmelser"</string>
     <string name="copyright_title" msgid="865906688917260647">"Opphavsrett"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisens"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"System WebView License"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Bakgrunner"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Leverandører av satellittbilder:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Brukerveiledning"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Det oppsto et problem ved innlasting av brukerveiledningen."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Åpen kildekode-lisenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kunne ikke hente lisensene."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"henter…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"sikkerhet for apptillatelser"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"standardapper"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorer optimaliseringer hvilemodus app ventemodus"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"krystallklar rgb srgb farge naturlig standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra passord mønster PIN-kode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Vis SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Flere tillatelser"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> til"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Bare lading"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Overfør filer (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Overfør bilder (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Lader"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Bare lad enheten"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strømforsyning"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Lading av den andre tilkoblede enheten"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Filoverføring"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Filoverføring til Windows eller Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Bildeoverføring (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Overføring av bilder eller filer hvis MTP ikke er støttet (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Bruk MIDI-inngang for enheten"</string>
     <string name="usb_use" msgid="3372728031108932425">"Bruk USB for"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktive apper"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Trykk for slå av/på."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Med denne tillatelsen kan apper endre systeminnstillingene."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Vri to ganger for å åpne kameraet"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Åpne kameraappen ved å vri to ganger på håndleddet"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tykk på av/på-knappen to ganger for kamera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Åpne kameraet raskt uten å låse opp skjermen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Krystallklar (standard)"</item>
+    <item msgid="8446070607501413455">"Naturlig"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Forbedrede farger"</item>
+    <item msgid="8280754435979370728">"Naturlige farger – som øyet ser dem"</item>
+    <item msgid="5363960654009010371">"Farger som er optimalisert for digitalt innhold"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Fargemodus for bilder"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Bruk sRGB"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 6b60a02..a4d9663 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"औँठाछाप सेटअप"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"तपाईँको स्क्रिन अनलक गर्न वा खरीदहरू पुष्टि गर्नको लागि आफ्नो औंठाछाप प्रयोग गर्न, हामीले गर्नुपर्ने कार्यहरु:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"तपाईँको ब्याकअप स्क्रिन लक विधि सेटअप गर्नुहोस्"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईँ यस आइकन जहिले देख्नुहुन्छ, तपाईँ पहिचानको लागि वा एक खरीद अधिकारको निम्ति आफ्नो औठाछाप प्रयोग गर्न सक्नुहुन्छ।"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"जगाउन र तपाईँको यन्त्रलाई अनलक गर्न फिंगरप्रिन्ट सेन्सरमा छुनुहोस्।"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"तपाईँले यो आइकन देखेको बेला तपाईँ आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ।"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिन्ट सेटअप छोड्न चाहनुहुन्छ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तपाईँले आफ्नो फोन अनलक गर्ने एक तरिका रूपमा फिंगरप्रिन्ट छान्‍नुभएको छ। यदि तपाईँले अहिले छोड्नु भएमा पछि पुन: सेटअप गर्न पर्नेछ। सेटअप गर्न मात्र केहि मिनेट लाग्‍नेछ।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रिन लक सेटअप गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"सम्पन्न भयो"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"आच्यौं, त्यो सेन्सर होइन नि त"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"तपाईँको यन्त्रमा फिंगरप्रिन्ट सेन्सर प्रयोग गर्नुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"दर्ता पूर्ण भएको थिएन"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फिंगरप्रिन्ट दर्ताको समय सीमा पुग्यो। पुन: प्रयास गर्नुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फिंगरप्रिन्ट दर्ताले काम गरेन। पुन: प्रयास गर्नुहोस् वा अरू औँलाको प्रयोग गर्नुहोस्।"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"अर्को थप्नुहोस्"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"अर्को"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"तपाईँले आफ्नो फोन खोल्नका अतिरिक्त खरिद र अनुप्रयोग पहुँच प्राधिकरण गर्नका लागि पनि आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"कानुनी जानकारी, वस्तुस्थिति, सफ्ट्वेयर संस्करण हेर्नुहोस्"</string>
     <string name="legal_information" msgid="5769301644270604095">"कानुनी जानकारी"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ताहरू"</string>
+    <string name="manual" msgid="3025943393642974445">"म्यानुअल"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"नियमित जानकारी"</string>
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"प्रणाली वेबभ्यु लाइसेन्स"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वालपेपरहरु"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"स्याटलाइट कल्पना प्रदायकहरू:\n©२०१४ CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"म्यानुअल"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"म्यानुअल लोड गर्दा एउटा समस्या आएको छ।"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"खुला स्रोत लाइसेन्स"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"लाइसेन्स लोड गर्न समस्या आएको छ।"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड हुँदै..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"अनुप्रयोगहरू अनुमति सुरक्षा"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"पूर्वनिर्धारित अनुप्रयोगहरू"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"अनुकूलन मात्रा अनुप्रयोग स्ट्यान्डबाइ बेवास्ता गर्नुहोस्"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"जोसिलो rgb srgb रङ्ग प्राकृतिक मानक"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"पासवर्ड प्याटर्न पिन स्लाइड गर्नुहोस्"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner देखाउनुहोस्"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त अनुमतिहरू"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> थप"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"चार्ज गर्नका लागि मात्र"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"फाइलहरू (MTP) स्थानान्तरण गर्नुहोस्"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"तस्बिरहरु (PTP) स्थानान्तरण गर्नुहोस्"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"चार्ज हुँदै"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"केवल यो उपकरण चार्ज गर्नुहोस्"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"विद्युत आपूर्ति"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"अर्को जडान भएको उपकरण चार्ज गर्नुहोस्"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"फाइल ट्रान्सफर"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows वा म्याक  Mac (MTP) मा फाइलहरू ट्रान्सफर गर्नुहोस्"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"तस्विर ट्रान्सफर (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"यदि MTP ले (PTP) समर्थित गर्दैन भने तस्विर वा फाइलहरू ट्रान्सफर गर्नुहोस्"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI इनपुटका लागि उपकरण प्रयोग गर्नुहोस्"</string>
     <string name="usb_use" msgid="3372728031108932425">"का लागि USB प्रयोग गर्नुहोस्"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"निष्क्रिय अनुप्रयोगहरू"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"निष्क्रिय। टगल गर्न छुनुहोस्।"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"यस अनुमतिले अनुप्रयोगलाई प्रणाली सेटिङहरू परिमार्जन गर्न दिन्छ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"हो"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"होइन"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"क्यामेराका लागि दुई पटक बटार्नुहोस्"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"दुई पटक आफ्नो नारी बटारेर क्यामेरा अनुप्रयोग खोल्नुहोस्"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"क्यामेराका लागि दुई पटक पावर बटन थिच्नुहोस्"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"स्क्रिन अनलक नगरी क्यामेरा चाँडै खोल्नुहोस्"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"जोसिलो (पूर्व निर्धारित)"</item>
+    <item msgid="8446070607501413455">"प्राकृतिक"</item>
+    <item msgid="6553408765810699025">"मानक"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"परिष्कृत रङ्गहरू"</item>
+    <item msgid="8280754435979370728">"आँखाले देख्ने प्राकृतिक रङ्गहरू"</item>
+    <item msgid="5363960654009010371">"डिजिटल सामग्रीको लागि अनुकूलित रङ्गहरु"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रङ्ग मोड"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB प्रयोग गर्नुहोस्"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 54ac70d..afa7ab6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vingerafdrukken ingesteld</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vingerafdruk ingesteld</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Vingerafdruk config."</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Als je je vingerafdruk wilt gebruiken om je scherm te ontgrendelen of aankopen te bevestigen, moeten we het volgende doen:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Je achterliggende schermvergrendelingsmethode instellen"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak de vingerafdruksensor aan om je apparaat te activeren en te ontgrendelen."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wanneer dit pictogram wordt weergegeven, kun je je vingerafdruk gebruiken."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Instellen van vingerafdruk overslaan?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Je hebt ervoor gekozen je vingerafdruk te gebruiken als manier om je telefoon te ontgrendelen. Als je dit nu overslaat, moet je het later instellen. Het instellen neemt ongeveer een minuut in beslag."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Schermvergrendeling instellen"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gereed"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Dat is niet de sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gebruik de vingerafdruksensor op je apparaat."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registratie is niet voltooid"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tijdlimiet voor vingerafdrukregistratie is bereikt. Probeer het opnieuw."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Vingerafdrukregistratie is mislukt. Probeer het opnieuw of gebruik een andere vinger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Nog een toevoegen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Behalve voor het ontgrendelen van je telefoon kun je je vingerafdruk ook gebruiken voor het autoriseren van aankopen en app-toegang. "<annotation id="url">"Meer informatie"</annotation></string>
@@ -673,7 +679,7 @@
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld.\n\nDit toestaan voor alle apps die willen scannen?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ga in het overloopmenu naar \'Geavanceerd\' om dit uit te schakelen."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
-    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Weigeren"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Afwijzen"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Inloggen om te koppelen?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"Voor <xliff:g id="APP_NAME">%1$s</xliff:g> moet je online inloggen vóór je met het netwerk koppelt."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOPPELEN"</string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Juridische info, status, softwareversie weergeven"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridische informatie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bijdragers"</string>
+    <string name="manual" msgid="3025943393642974445">"Handleiding"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Wettelijke informatie"</string>
     <string name="copyright_title" msgid="865906688917260647">"Auteursrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Licentie"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Systeemlicentie voor webweergave"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Achtergronden"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Providers van satellietbeelden:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Handleiding"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Er is een probleem bij het laden van de handleiding."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Er is een probleem bij het laden van de licenties."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laden..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"apps rechten beveiliging"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"standaard voor apps"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"negeren optimalisaties sluimeren app standby"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"levendig rgb srgb kleur natuurlijk standaard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vegen wachtwoord patroon pincode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag instellen"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner weergeven"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Aanvullende rechten"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Nog <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Alleen opladen"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Bestanden overzetten (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Foto\'s overzetten (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Opladen"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Dit apparaat gewoon opladen"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Stroomvoorziening"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Het andere verbonden apparaat opladen"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Bestandsoverdracht"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Bestanden overzetten naar Windows of Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Foto-overdracht (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Foto\'s of bestanden overzetten als MTP niet wordt ondersteund (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Apparaat voor MIDI-invoer gebruiken"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB gebruiken voor"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inactieve apps"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactief. Tik om te schakelen."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Met deze rechten kan een app de systeeminstellingen aanpassen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Twee keer draaien voor camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Open de camera-app door je pols twee keer te draaien"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Druk twee keer op aan/uit voor de camera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Camera snel openen zonder het scherm te ontgrendelen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Levendig (standaard)"</item>
+    <item msgid="8446070607501413455">"Natuurlijk"</item>
+    <item msgid="6553408765810699025">"Standaard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Verbeterde kleuren"</item>
+    <item msgid="8280754435979370728">"Natuurlijke kleuren zoals gezien door het menselijk oog"</item>
+    <item msgid="5363960654009010371">"Kleuren geoptimaliseerd voor digitale content"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Kleurenmodus voor afbeeldingen"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB gebruiken"</string>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index e54dc2d..b681785 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਜਾਂ ਖ਼ਰੀਦਾਰੀਆਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਉਪਯੋਗ ਕਰਨ, ਤੁਹਾਨੂੰ ਇਹ ਕਰਨਾ ਹੋਵੇਗਾ:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਧੀ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਇਹ ਆਈਕਨ ਦੇਖੋ, ਤਾਂ ਤੁਸੀਂ ਪਛਾਣ ਲਈ ਜਾਂ ਇੱਕ ਖ਼ਰੀਦ ਦਾ ਅਧਿਕਾਰ ਦੇਣ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ਆਪਣੀ ਡਿਵਾਈਸ ਨੂੰ ਸਕਿਰਿਆ ਅਤੇ ਅਨਲੌਕ ਕਰਨ ਲਈ ਕੇਵਲ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਛੋਹਵੋ।"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ਜਦੋਂ ਤੁਸੀਂ ਇਹ ਆਈਕਨ ਦੇਖੋ, ਤਾਂ ਤੁਸੀਂ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ਸੰਪੂਰਣ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ਓਹੋ, ਉਹ ਸੈਂਸਰ ਨਹੀਂ ਹੈ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ਆਪਣੀ ਡਿਵਾਈਸ \'ਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਦਾ ਉਪਯੋਗ ਕਰੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ਦਾਖਲਾ ਪੂਰਾ ਨਾ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾਖ਼ਲੇ ਦੀ ਸਮਾਂ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾਖ਼ਲੇ ਨੇ ਕੰਮ ਨਹੀਂ ਕੀਤਾ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ ਕੋਈ ਵੱਖਰੀ ਉਂਗਲ ਉਪਯੋਗ ਕਰੋ।"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ਕੋਈ ਹੋਰ ਜੋੜੋ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ਅਗਲਾ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਖਰੀਦਾਰੀਆਂ ਅਤੇ ਐਪ ਐਕਸੈਸ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਉਪਯੋਗ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ, ਸਥਿਤੀ, ਸੌਫਟਵੇਅਰ ਵਰਜਨ ਦੇਖੋ"</string>
     <string name="legal_information" msgid="5769301644270604095">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ਸਹਿਯੋਗੀ"</string>
+    <string name="manual" msgid="3025943393642974445">"ਮੈਨੁਅਲ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"ਨਿਯਾਮਕ ਜਾਣਕਾਰੀ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ਕਾਪੀਰਾਈਟ"</string>
     <string name="license_title" msgid="1990487604356037871">"ਲਸੰਸ"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"ਸਿਸਟਮ WebView ਲਸੰਸ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ਵਾਲਪੇਪਰ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ਸੈਟੇਲਾਈਟ ਇਮੇਜਰੀ ਪ੍ਰਦਾਤਾ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"ਮੈਨੁਅਲ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ਮੈਨੁਅਲ ਲੋਡ ਕਰਨ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਹੋਈ ਸੀ।"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ਓਪਨ ਸ੍ਰੋਤ ਲਸੰਸ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ਲਸੰਸ ਲੋਡ ਕਰਨ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਹੋਈ ਸੀ।"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ਐਪ ਅਨੁਮਤੀਆਂ ਦੀ ਸੁਰੱਖਿਆ"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ਡਿਫੌਲਟ ਐਪਸ"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ਅਨੁਕੂਲਤਾ ਡੋਜ਼ ਐਪ ਸਟੈਂਡਬਾਇ ਦੀ ਉਪੇਖਿਆ ਕਰੋ"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ਚਮਕੀਲਾ rgb srgb ਰੰਗ ਕੁਦਰਤੀ ਸਟੈਂਡਰਡ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ਸਲਾਈਡ ਪਾਸਵਰਡ ਪੈਟਰਨ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ਟੈਗ ਸੈਟ ਅਪ ਕਰੋ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ਲਿਖੋ"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ਟਿਊਨਰ ਦਿਖਾਓ"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"ਅਤਿਰਿਕਤ ਅਨੁਮਤੀਆਂ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ਹੋਰ"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ਸਿਰਫ ਚਾਰਜਿੰਗ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ਫ਼ਾਈਲਾਂ ਨੂੰ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰੋ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ਫੋਟੋਆਂ ਨੂੰ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰੋ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ਚਾਰਜਿੰਗ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ਕੇਵਲ ਇਸ ਜੰਤਰ ਨੂੰ ਚਾਰਜ ਕਰੋ"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"ਬਿਜਲੀ ਸਪਲਾਈ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ਹੋਰ ਜੁੜੀਆਂ ਡਿਵਾਈਸਾਂ ਨੂੰ ਚਾਰਜ ਕਰੋ"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ਫਾਈਲ ਤਬਾਦਲਾ"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows ਜਾਂ ਮੈਕ (MTP) ਨੂੰ ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ਫੋਟੋ ਤਬਾਦਲਾ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ਫੋਟੋਆਂ ਜਾਂ ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ ਜੇਕਰ MTP (PTP) ਨੂੰ ਸਹਿਯੋਗ ਨਹੀਂ ਕਰਦਾ"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ਇੰਪੁੱਟ ਲਈ ਡਿਵਾਈਸ ਵਰਤੋਂ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ਇਸ ਲਈ USB ਦਾ ਉਪਯੋਗ ਕਰੋ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"ਕਿਰਿਆਸ਼ੀਲ ਐਪਸ"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ਅਕਿਰਿਆਸ਼ੀਲ। ਟੌਗਲ ਕਰਨ ਲਈ ਸਪਰਸ਼ ਕਰੋ।"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਅਨੁਮਤੀ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ਹਾਂ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ਨਹੀਂ"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"ਕੈਮਰੇ ਲਈ ਦੋ ਵਾਰ ਮੋੜੋ"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ਆਪਣੇ ਗੁੱਟ ਨੂੰ ਦੋ ਵਾਰ ਮੋੜਕੇ ਕੈਮਰਾ ਐਪ ਖੋਲ੍ਹੋ"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ਕੈਮਰੇ ਲਈ ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰੀ ਦਬਾਓ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਬਗੈਰ ਤਤਕਾਲ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"ਚਮਕੀਲਾ (ਡਿਫੌਲਟ)"</item>
+    <item msgid="8446070607501413455">"ਕੁਦਰਤੀ"</item>
+    <item msgid="6553408765810699025">"ਸਟੈਂਡਰਡ"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"ਵਿਸਤ੍ਰਿਤ ਰੰਗ"</item>
+    <item msgid="8280754435979370728">"ਕੁਦਰਤੀ ਰੰਗ ਜਿਵੇਂ ਅੱਖ ਰਾਹੀਂ ਦੇਖੇ ਜਾਂਦੇ ਹਨ"</item>
+    <item msgid="5363960654009010371">"ਡਿਜੀਟਲ ਸਮੱਗਰੀ ਲਈ ਰੰਗ ਅਨੁਕੂਲ ਕੀਤੇ"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"ਤਸਵੀਰ ਰੰਗ ਮੋਡ"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ਵਰਤੋਂ ਕਰੋ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0b3d518..2e122fd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -326,6 +326,7 @@
       <item quantity="other">Ustawiono <xliff:g id="COUNT_1">%1$d</xliff:g> odcisku palca</item>
       <item quantity="one">Ustawiono <xliff:g id="COUNT_0">%1$d</xliff:g> odcisk palca</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Ustaw odcisk palca"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Aby odblokowywać ekran lub potwierdzać zakupy przy użyciu odcisku palca, musisz:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Skonfiguruj dodatkową metodę blokowania ekranu"</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Za każdym razem, gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby potwierdzić swoją tożsamość lub autoryzować zakup."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotknij czytnika linii papilarnych, by wybudzić i odblokować urządzenie."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ta ikona oznacza, że możesz użyć odcisku palca."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pominąć konfigurację odcisku palca?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Chcesz odblokowywać telefon m.in. odciskiem palca. Jeśli nie skonfigurujesz tej funkcji teraz, musisz to zrobić później. Zajmie Ci to około minuty."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Skonfiguruj blokadę ekranu"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotowe"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nie jest czytnik"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Użyj czytnika linii papilarnych w urządzeniu."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Nie ukończono rejestracji"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Osiągnięto limit czasu rejestracji odcisku palca. Spróbuj ponownie."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Nie udało się zarejestrować odcisku palca. Spróbuj ponownie lub przyłóż inny palec."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj kolejny"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalej"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Odcisk palca pozwala nie tylko odblokowywać telefon, ale też autoryzować zakupy i dostęp do aplikacji. "<annotation id="url">"Więcej informacji"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Wyświetl informacje prawne, stan, wersję oprogramowania"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Współautorzy"</string>
+    <string name="manual" msgid="3025943393642974445">"Instrukcja"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Certyfikaty"</string>
     <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencja"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Systemowa licencja na WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Tapety"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Dostawcy zdjęć satelitarnych:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Instrukcja"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Podczas wczytywania instrukcji wystąpił problem."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencje open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Wystąpił problem podczas ładowania licencji."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ładowanie..."</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpieczenia uprawnień aplikacji"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"wartość domyślna aplikacji"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignoruj optymalizacje uśpienie aplikacja tryb gotowości"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"żywe rgb srgb kolor naturalne standardowe"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"przesuwanie hasło wzór pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Skonfiguruj tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
@@ -2833,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Pokaż kalibrator SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Dodatkowe uprawnienia"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> więcej"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Tylko ładowanie"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Przesyłanie plików (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Przesyłanie zdjęć (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Ładowanie"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Tylko ładowanie tego urządzenia"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Zasilacz"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Ładowanie drugiego podłączonego urządzenia"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Przesyłanie plików"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Przesyłanie plików do systemu Windows lub Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Przesyłanie zdjęć (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Przesyłanie zdjęć lub plików, jeśli MTP nie jest obsługiwane (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Używaj urządzenia jako wejścia MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Użyj USB do:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Nieaktywne aplikacje"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Nieaktywna. Kliknij, by włączyć."</string>
@@ -2904,4 +2920,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To uprawnienie umożliwia aplikacji modyfikowanie ustawień systemu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Tak"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dwukrotny obrót otwiera aparat"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Otwórz aplikację aparatu, obracając dwukrotnie nadgarstkiem"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Aparat: dwukrotnie naciśnij przyc. zasilania"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Szybko uruchom aparat bez odblokowywania ekranu"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Żywe (domyślnie)"</item>
+    <item msgid="8446070607501413455">"Naturalne"</item>
+    <item msgid="6553408765810699025">"Standardowe"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Bogatsze kolory"</item>
+    <item msgid="8280754435979370728">"Naturalne kolory widziane przez ludzkie oko"</item>
+    <item msgid="5363960654009010371">"Kolory dostosowane do wyświetlania treści cyfrowych"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Tryb kolorów obrazu"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Użyj sRGB"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 296118a..3b99130 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. de imp digital"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Para usar sua impressão digital para desbloquear sua tela ou confirmar compras, precisaremos:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configure seu método secundário de bloqueio de tela"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Opa, este não é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use o sensor de impr. digital do seu disp."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próximo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informação regulamentar"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licença do sistema Webview"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Planos de fundo"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Provedores de imagens de satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ocorreu um problema ao carregar o manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças código aberto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Há um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Carregando..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"segurança das permissões de apps"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apps padrão"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar otimizações hibernação app em espera"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"cor vibrante RGB sRGB natural padrão"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar senha padrão pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permissões adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Mais <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Carregamento apenas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir arquivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Carregar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentação"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carregar o outro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferências de arquivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir arquivos para Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferência de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos ou arquivos se o MTP não for compatível (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Usar dispositivo para entrada de MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Apps inativos"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inativo. Toque para alternar."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press. o botão liga/desliga duas vezes p/ abrir a câmera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abrir a câmera rapidamente sem desbloquear a tela"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrante (padrão)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Padrão"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Cores aprimoradas"</item>
+    <item msgid="8280754435979370728">"Cores naturais, como vistas pelos olhos"</item>
+    <item msgid="5363960654009010371">"Cores otimizadas para conteúdo digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usar sRGB"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b1d1208..f25e248 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital configurada</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Conf. impres. digital"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Para utilizar a sua impressão digital para desbloquear o ecrã ou para confirmar compras, é necessário:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurar o seu método de bloqueio de ecrã em segundo plano"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando vir este ícone, pode utilizar a sua impressão digital para identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressões digitais para ativar e desbloquear o dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Quando vir este ícone, pode utilizar as impressões digitais."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorar configur. de impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Optou por utilizar a sua impressão digital como uma forma de desbloquear o telemóvel. Se ignorar agora, terá de configurar esta opção mais tarde. A configuração demora apenas alguns minutos."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar o bloqueio de ecrã"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, isso não é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilize o sensor de impr. digit. no seu disp."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"A inscrição não foi concluída"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Atingiu o tempo limite da inscrição de impressões digitais. Tente novamente."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"A inscrição de impressões digitais não funcionou. Tente novamente ou utilize um dedo diferente."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Para além de desbloquear o telemóvel, também pode utilizar a sua impressão digital para autorizar compras e o acesso de aplicações. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações jurídicas, estado, versão de software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuintes"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informações regulamentares"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licença WebView do sistema"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imagens de fundo"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Fornecedores de imagens de satélite:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ocorreu um problema ao carregar o manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ocorreu um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"A carregar..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicações autorizações segurança"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplicações predefinidas"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar otimizações fechar aplicação modo de suspensão"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrante rgb srgb cor natural padrão"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar lentamente palavra-passe sequência pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Autorizações adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Mais <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Apenas carregamento"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir ficheiros (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Carregamento"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Apenas carregar este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentação"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carregar o outro dispositivo ligado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferências de ficheiros"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir ficheiros para Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferência de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos ou ficheiros se o MTP não for suportado (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Utilizar o dispositivo para entrada MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicações inativas"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inativa. Toque para ativar."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta autorização permite que uma aplicação modifique as definições do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Torção dupla para a câmara"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir a aplicação de câmara ao torcer o dispositivo no seu pulso"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Premir ligar/desligar 2 vezes p/ câmara"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abrir rapidamente a câmara sem desbloquear o ecrã"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrante (predefinição)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Padrão"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Cores melhoradas"</item>
+    <item msgid="8280754435979370728">"Cores naturais e realistas"</item>
+    <item msgid="5363960654009010371">"Cores otimizadas para conteúdos digitais"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utilizar sRGB"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 296118a..3b99130 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. de imp digital"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Para usar sua impressão digital para desbloquear sua tela ou confirmar compras, precisaremos:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configure seu método secundário de bloqueio de tela"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Opa, este não é o sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use o sensor de impr. digital do seu disp."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próximo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informação regulamentar"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licença do sistema Webview"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Planos de fundo"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Provedores de imagens de satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ocorreu um problema ao carregar o manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças código aberto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Há um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Carregando..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"segurança das permissões de apps"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"apps padrão"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorar otimizações hibernação app em espera"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"cor vibrante RGB sRGB natural padrão"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar senha padrão pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar sintonizador SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permissões adicionais"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Mais <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Carregamento apenas"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferir arquivos (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Carregar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Fonte de alimentação"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Carregar o outro dispositivo conectado"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferências de arquivos"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferir arquivos para Windows ou Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferência de fotos (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferir fotos ou arquivos se o MTP não for compatível (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Usar dispositivo para entrada de MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Apps inativos"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inativo. Toque para alternar."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press. o botão liga/desliga duas vezes p/ abrir a câmera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Abrir a câmera rapidamente sem desbloquear a tela"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrante (padrão)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Padrão"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Cores aprimoradas"</item>
+    <item msgid="8280754435979370728">"Cores naturais, como vistas pelos olhos"</item>
+    <item msgid="5363960654009010371">"Cores otimizadas para conteúdo digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usar sRGB"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b694aa6..c93dd0d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -324,6 +324,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> de amprente configurate</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> amprentă configurată</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Configurarea amprentei"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Pentru a debloca ecranul sau a confirma achiziții folosind amprenta, va trebui să:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurați metoda de rezervă de blocare a ecranului"</string>
@@ -348,10 +349,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"De fiecare dată când vedeți această pictogramă vă puteți folosi amprenta pentru autentificare sau pentru a autoriza o achiziție."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ca să activați și să deblocați dispozitivul, este suficient să atingeți senzorul pentru amprentă."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Când vedeți această pictogramă, vă puteți folosi amprenta."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omiteți configurarea amprentei?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ați ales ca amprenta să fie una dintre modalitățile de deblocare a telefonului. Dacă omiteți acum această etapă, va trebui să o configurați mai târziu. Configurarea durează în jur de un minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurați blocarea ecranului"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Terminat"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hopa, acela nu este senzorul"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Folosiți senzorul de amprentă pe dispozitiv."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Înregistrarea nu a fost finalizată"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Timpul limită pentru înregistrarea amprentei a expirat. Încercați din nou."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Înregistrarea amprentei nu a funcționat. Încercați din nou sau folosiți un alt deget."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adăugați altă amprentă"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Înainte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Pe lângă deblocarea telefonului, vă puteți folosi amprenta pentru a autoriza achizițiile și accesul aplicațiilor. "<annotation id="url">"Aflați mai multe"</annotation></string>
@@ -1217,6 +1223,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Afișați informații legale, starea și versiunea programului software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informații de ordin juridic"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboratori"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informații reglementare"</string>
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licență"</string>
@@ -1224,6 +1231,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licență de sistem pentru WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imagini de fundal"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Furnizorii de imagini din satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"A apărut o problemă la încărcarea manualului."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licențe open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"A apărut o problemă la încărcarea licențelor."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Se încarcă…"</string>
@@ -2512,6 +2521,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicații permisiuni securitate"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplicații prestabilite"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorați opțiuni optimizare inactiv aplicație în așteptare"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrant rgb srgb culoare natural standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisare parolă model PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurarea etichetei NFC pentru Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
@@ -2817,10 +2827,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Afișați Tunerul SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Permisiuni suplimentare"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Încă <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Doar la încărcare"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferați fișiere (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferați fotografii (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Încărcare"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Doar încarcă acest dispozitiv"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Sursă de energie"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Încărcați celălalt dispozitiv conectat"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferuri de fișiere"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transferați fișiere în Windows sau Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transfer de fotografii (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferați fotografii sau fișiere dacă MTP nu este acceptat (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Folosiți dispozitivul pentru intrarea MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Folosiți conexiunea USB pentru"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicații inactive"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inactivă. Atingeți pentru a comuta."</string>
@@ -2887,4 +2903,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Având această permisiune, o aplicație poate să modifice setările de sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nu"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Două răsuciri pentru camera foto"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Deschideți aplicația Cameră foto răsucind din încheietura mâinii de două ori"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Apăsați pornire de 2 ori pentru cameră"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Deschideți rapid camera foto fără să deblocați ecranul"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrant (prestabilit)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Culori îmbunătățite"</item>
+    <item msgid="8280754435979370728">"Culori naturale, așa cum le percepe ochiul"</item>
+    <item msgid="5363960654009010371">"Culori optimizate pentru conținutul digital"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modul de culori pentru imagini"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Folosiți sRGB"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e7ccc15..5216355 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -326,6 +326,7 @@
       <item quantity="many">Настроено <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Добавление отпечатка"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Чтобы использовать сканер для разблокировки экрана и подтверждения покупок:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Настройте дополнительный способ блокировки экрана"</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Этот значок сообщает, что вы можете подтверждать покупки и проходить индентификацию с помощью отпечатка пальца."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Чтобы разблокировать устройство, приложите палец к сканеру."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Этот значок сообщает, что вы можете использовать отпечаток пальца."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Не настраивать доступ по отпечаткам?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Для разблокировки телефона вы выбрали сканирование отпечатка пальца. Настройка займет около минуты. Если вы пропустите ее сейчас, вам все равно придется сделать это позже."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Настроить блокировку экрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Мимо! Это не сканер отпечатков пальцев..."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Он точно есть на устройстве. Найдите его!"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Отпечаток не добавлен"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Превышен срок ожидания. Повторите попытку"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Не удалось добавить отпечаток. Повторите попытку или попробуйте сохранить отпечаток другого пальца."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Добавить еще"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далее"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Добавьте отпечаток пальца, чтобы только вы смогли разблокировать телефон, совершать покупки и открывать приложения. "<annotation id="url">"Подробнее…"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Просмотр юридической информации, состояния планшетного ПК и версии ПО"</string>
     <string name="legal_information" msgid="5769301644270604095">"Юридическая информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Участники"</string>
+    <string name="manual" msgid="3025943393642974445">"Руководство"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Сертификация"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Системная лицензия WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Обои"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Фотографии со спутника:\n© CNES 2014/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Руководство пользователя"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Не удалось загрузить руководство пользователя."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензии открытого ПО"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"При загрузке лицензий возникла неполадка."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Загрузка…"</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"Защита разрешений для приложений"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"приложения по умолчанию"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"игнорировать ограничения оптимизация спящий режим"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"насыщенный RGB SRGB цвет естественный стандартный"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем по экрану пароль графический ключ PIN-код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
@@ -2833,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Показать SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ещё разрешения"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Ещё <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Только зарядка"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Передача файлов (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Передача фото (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Зарядка"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Просто зарядка устройства"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Источник питания"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Зарядка другого подключенного устройства"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Передача файлов"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Передача файлов на компьютер Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Передача фото (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Передача фотографий или файлов, если МТР не поддерживается (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Использование MIDI-входа на устройстве"</string>
     <string name="usb_use" msgid="3372728031108932425">"Использование USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивные приложения"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивно. Нажмите для переключения."</string>
@@ -2904,4 +2920,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Приложение сможет изменять системные настройки."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Нет"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Включать камеру движением запястья"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Чтобы открыть приложение \"Камера\", дважды поверните запястье."</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера двойным нажатием кнопки питания"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Быстро открывать камеру, не снимая блокировку экрана."</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Насыщенный (по умолчанию)"</item>
+    <item msgid="8446070607501413455">"Естественный"</item>
+    <item msgid="6553408765810699025">"Стандартный"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Улучшенные цвета"</item>
+    <item msgid="8280754435979370728">"Натуральные цвета, привычные глазу"</item>
+    <item msgid="5363960654009010371">"Цвета, оптимизированные для цифрового контента"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Цветовой режим"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Использовать sRGB"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index fcffa5c..e9ecf78 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"ඇඟිලි සලකුණු පිහිටුවීම"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"ඔබේ තිරය අගුලු හැරීමට හෝ මිලදී ගැනීම් තහවුරු කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට, අපට පහත දේ අවශ්‍ය වනු ඇත:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"ඔබේ උපස්ථ තිර අගුලු ක්‍රමය පිහිටුවන්න"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"මෙම නිරූපකය ඔබ දුටු විට, ඔබව හඳුනා ගැනීම සඳහා හෝ මිලදි ගැනීමක් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණු යොදා ගත හැක."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ඔබේ උපාංගය අවදි කර අගුලු හැරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ඔබ මෙම අයිකනය දකින විට, ඔබට ඔබේ ඇඟිලි සලකුණ භාවිත කළ හැකිය."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ඇඟිලි සලකුණ පිහිටුවීම මග හරින්නද?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ඔබ ඔබේ දුරකථනය අගුලු හැරීමේ එක් ක්‍රමයක් ලෙස ඔබේ ඇඟිලි සලකුණ භාවිත කිරීම තෝරා ඇත. ඔබ දැන් මග හැරියොත්, ඔබට මෙය පසුව පිහිටුවීමට අවශ්‍ය වනු ඇත. පිහිටුවීම මිනිත්තුවක් හෝ කිහිපයක් ගනු ඇත."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"තිර අගුළු දැමීම සකසන්න"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"නිමයි"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"අපොයි, එය සංවේදකය නොවෙයි"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ඔබගේ උපාංගයේ ඇති ඇඟිලි සලකුණු සංවේදකය භාවිත කරන්න."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"බඳවා ගැනීම අවසන් නොකරන ලදී"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ඇඟිලි සලකුණ ඇතුළත් කිරිමේ කාල සීමාව ළඟා විය. නැවත උත්සාහ කරන්න."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ඇඟිලි සලකුණ ඇතුළත් කිරිම ක්‍රියා කළේ නැත. නැවත උත්සාහ කරන්න, නැතහොත් වෙනත් ඇඟිල්ලක් භාවිත කරන්න."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"තවත් එකක් එක් කරන්න"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"මීළඟ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ඔබේ දුරකථනය අගුලු හැරීමට අමතරව, ඔබට ඔබේ ඇඟිලි සලකුණ මිලදී ගැනීම් සහ යෙදුම් ප්‍රවේශ සත්‍යාපනය සඳහාද භාවිත කළ හැකිය. "<annotation id="url">"තව දැන ගන්න"</annotation></string>
@@ -1210,6 +1216,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"නීතිමය තොරතුරු, තත්වය, මෘදුකාංග අනුවාදය පෙන්වන්න"</string>
     <string name="legal_information" msgid="5769301644270604095">"නීතිමය තොරතුරු"</string>
     <string name="contributors_title" msgid="5917703088825286504">"දායකයන්"</string>
+    <string name="manual" msgid="3025943393642974445">"අත්පොත"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"යාමන තොරතුරු"</string>
     <string name="copyright_title" msgid="865906688917260647">"ප්‍රකාශන හිමිකම"</string>
     <string name="license_title" msgid="1990487604356037871">"බලපත්‍රය"</string>
@@ -1217,6 +1224,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"පද්ධති WebView බලපත"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"වෝල්පේපර"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"චන්‍ද්‍රිකා රූප සපයන්නන්:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"අත්පොත"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"අත්පොත පූරණය කිරීමේදී ගැටලුවක් ඇතිවිය."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"විවෘත කේත බලපත්‍ර"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"බලපත්‍ර පුර්ණය කිරීමේදී ගැටලුවක් ඇතිවිය."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"පූරණය වෙමින්..."</string>
@@ -2504,6 +2513,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"යෙදුම් අවසර ආරක්ෂාව"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"යෙදුම් පෙරනිමි"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ප්‍රශස්තකරණ මග හැරීම doze යෙදුම ස්ටෑන්ඩ්බයි"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"දීප්තිමත් rgb srgb වර්ණ ස්වභාවික සම්මතය"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"සර්පණය මුරපදය රටාව pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
@@ -2801,10 +2811,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI සුසරකය පෙන්වන්න"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"අතිරේක අවසර"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"තවත් <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ආරෝපණය පමණි"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ගොනු හුවමාරුව (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ඡායාරූප හුවමාරුව (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ආරෝපණය වෙමින්"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"මෙම උපාංගය දැන් ආරෝපනය කරන්න"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"බල සැපයුම"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"වෙනත් සම්බන්ධිත උපාංග ආරෝපනය කරන්න"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ගොනු මාරු"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows හෝ Mac (MTP) වෙත ගොනු මාරු කරන්න"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ඡායාරූප හුවමාරුව (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP සහාය නොදක්වන්නේනම් ඡායාරූප හෝ ගොනු මාරු කරන්න (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ආදානය සඳහා උපාංගය භාවිත කරන්න"</string>
     <string name="usb_use" msgid="3372728031108932425">"පහත සඳහා USB භාවිතා කරන්න"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"අක්‍රිය යෙදුම්"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"අක්‍රියයි. ටොගල කිරීමට ස්පර්ශ කරන්න."</string>
@@ -2870,4 +2886,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"මෙම අවසරය යෙදුමකට පද්ධති සැකසීම් විකරණය කිරීමට ඉඩ දෙයි."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ඔව්"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"නැත"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"කැමරාව සඳහා දෙවරක් කරකවන්න"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"ඔබේ මැණික් කටුව දෙවරක් කරකවා කැමරා යෙදුම විවෘත කරන්න"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"කැමරාව සඳහා බල බොත්තම දෙවරක් ඔබන්න"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ඔබගේ තිරය අගුලු හැරීමෙන් තොරව ඉක්මනින් කැමරාව විවෘත කරන්න"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"දීප්තිමත් (පෙරනිමිය)"</item>
+    <item msgid="8446070607501413455">"ස්වභාවික"</item>
+    <item msgid="6553408765810699025">"සම්මත"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"වැඩිදියුණු කරන ලද වර්ණ"</item>
+    <item msgid="8280754435979370728">"ඇස දකින ස්වභාවික වර්ණ"</item>
+    <item msgid="5363960654009010371">"ඩිජිටල් අන්තර්ගතය සඳහා වර්ණ ප්‍රශස්ත කරන ලද"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"පින්තූර වර්ණ ප්‍රකාරය"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB භාවිතා කරන්න"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index fc65037..7e2a1e9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -326,6 +326,7 @@
       <item quantity="other">Nastavenie <xliff:g id="COUNT_1">%1$d</xliff:g> odtlačkov</item>
       <item quantity="one">Nastavenie <xliff:g id="COUNT_0">%1$d</xliff:g> odtlačku</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nastavenie odtlačku"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Na to, aby ste mohli používať odtlačok prsta na odomknutie obrazovky alebo potvrdenie nákupov, musíte:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Nastavte záložnú zámku obrazovky"</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kedykoľvek uvidíte túto ikonu, môžete na identifikáciu alebo povolenie nákupu použiť odtlačok prsta."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ak chcete prebudiť a odomknúť svoje zariadenie, stačí sa dotknúť senzora odtlačkov prstov."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Keď uvidíte túto ikonu, môžete použiť odtlačok prsta."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiť nastavenie odtlačkov prstov?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vybrali ste, že chcete používať odtlačok prsta ako jeden zo spôsobov odomknutia telefónu. Ak tento krok preskočíte, budete musieť odtlačok nastaviť neskôr. Trvá to približne minútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastaviť zámku obrazovky"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ojoj, to nie je senzor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Použite senzor odtlačku prsta na zariadení."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrácia nebola dokončená"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Časový limit registrácie odtlačku prsta vypršal. Skúste to znova."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrácia odtlačku prsta nefungovala. Skúste to znova alebo použite iný prst."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pridať ďalší"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Ďalej"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Okrem odomknutia svojho telefónu môžete pomocou odtlačku autorizovať nákupy a prístup aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Zobrazuje právne informácie, stav a verziu softvéru"</string>
     <string name="legal_information" msgid="5769301644270604095">"Právne informácie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Prispievatelia"</string>
+    <string name="manual" msgid="3025943393642974445">"Príručka"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Regulačné informácie"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorské práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licencia systému WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Tapety"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Poskytovatelia satelitných snímok:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Príručka"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Pri načítavaní príručky sa vyskytla chyba."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencie open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Pri načítavaní licencií sa vyskytla chyba."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Prebieha načítavanie…"</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpečenie povolení aplikácií"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"predvolené aplikácie"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorovať optimalizácie spánok aplikácia pohotovostný režim"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"sýty rgb srgb farba prirodzený štandardný"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"prejsť prstom heslo vzor pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie značky NFC (Wi-Fi)"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
@@ -2833,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Zobraziť tuner SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ďalšie povolenia"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Počet ďalších povolení: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Iba na nabíjanie"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"prenos súborov (MTP),"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"prenos fotiek (PTP)."</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Nabíja sa"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Iba nabiť toto zariadenie"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Zdroj napájania"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Nabiť ďalšie pripojené zariadenie"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Prenosy súborov"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Prenos súborov do systému Windows alebo počítača Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Prenos fotiek (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenos fotiek alebo súborov, keď nie je podporovaný protokol MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"pripojenie zariadenia MIDI,"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Použiť zariadenie pre vstup MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Použiť rozhranie USB na"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktívne aplikácie"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktívna. Zapnete ju klepnutím."</string>
@@ -2904,4 +2920,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Áno"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Fotoaparát – dvakrát pokrúťte zápästím"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvorte aplikáciu fotoaparátu tak, že dvakrát pokrútite zápästím"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Fotoaparát dvojitým stlačením vypínača"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Rýchlo otvorí fotoaparát bez odomknutia obrazovky"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Sýty (predvolený)"</item>
+    <item msgid="8446070607501413455">"Prirodzený"</item>
+    <item msgid="6553408765810699025">"Štandardný"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Vylepšené farby"</item>
+    <item msgid="8280754435979370728">"Prirodzené farby, ako ich vidí ľudské oko"</item>
+    <item msgid="5363960654009010371">"Farby optimalizované pre digitálny obsah"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Farebný režim obrázka"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Použije sa sRGB"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index be151eb..9bc8a5d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -326,6 +326,7 @@
       <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> prstni odtisi so nastavljeni</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> prstnih odtisov je nastavljenih</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Nast. prstnega odtisa"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Če želite za odklepanje zaslona ali potrjevanje nakupov uporabljati prstni odtis, morate:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Nastavite nadomestni način zaklepanja zaslona"</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ko vidite to ikono, lahko za preverjanje istovetnosti ali odobritev nakupa uporabite prstni odtis."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotaknite se tipala za prstne odtise, da preklopite napravo iz stanja pripravljenosti in jo odklenete."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ko je prikazana ta ikona, lahko uporabite prstni odtis."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Želite preskočiti nast. prstnega odtisa?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Za odklepanja telefona ste izbrali možnost prstnega odtisa. Če zdaj preskočite, boste to morali nastaviti pozneje. Nastavitev traja samo približno eno minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavi zaklepanje zaslona"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Končano"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to ni tipalo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Uporabite tipalo prstnih odtisov na napravi."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Včlanitev ni bila dokončana."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Dosežena časovna omejitev za včlanitev prstnega odtisa. Poskusite znova."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Včlanitev prstnega odtisa ni uspela. Poskusite znova ali uporabite drug prst."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj še enega"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Naprej"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Prstni odtis lahko uporabljate za odklepanje zaslona ter potrjevanje nakupov in dostop do aplikacij. "<annotation id="url">"Več o tem"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ogled pravnih informacij, stanja, različice programske opreme"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Sodelavci"</string>
+    <string name="manual" msgid="3025943393642974445">"Ročno"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Zakonsko predpisani podatki"</string>
     <string name="copyright_title" msgid="865906688917260647">"Avtorska pravica"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licenca za WebView v sistemu"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Ozadja"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Ponudniki satelitskih posnetkov: \n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Priročnik"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Težava pri nalaganju priročnika."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence za odprto kodo"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Pri nalaganju licenc je prišlo do težave."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Nalaganje …"</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"varnost dovoljenj za aplikacije"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacije privzeto"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"prezri optimizacije prehod aplikacije stanje pripravljenosti"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"živo rgb srgb barva naravno standardno"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"podrsanje geslo vzorec pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
@@ -2833,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Prikaži sprejemnik upor. vmes. sistema"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Dodatna dovoljenja"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Še <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Samo za polnjenje"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Prenos datotek (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prenos fotografij (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Polnjenje"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Samo polnjenje akumulatorja naprave"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Napajanje"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Polnjenje druge povezane naprave"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Prenos datotek"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Prenos datotek v sistem Windows ali Mac OS (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Prenos fotografij (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenos fotografij ali datotek, če MTP ni podprt (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Uporaba naprave za izhod MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Uporaba povezave USB za"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Neaktivne aplikacije"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Neaktivno. Dotaknite se za preklop."</string>
@@ -2904,4 +2920,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To dovoljenje aplikaciji dovoljuje spreminjanje sistemskih nastavitev."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dvakratno sukanje za fotoaparat"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Odprite aplikacijo za fotografiranje, tako da dvakrat zasukate zapestje"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Dva dotika gumba za vklop za fotoaparat"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Hitro odpre fotoaparat brez odklepanja zaslona"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Živo (privzeto)"</item>
+    <item msgid="8446070607501413455">"Naravno"</item>
+    <item msgid="6553408765810699025">"Standardno"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Izboljšane barve"</item>
+    <item msgid="8280754435979370728">"Naravne barve, kot jih vidimo s prostim očesom"</item>
+    <item msgid="5363960654009010371">"Barve, optimizirane za digitalno vsebino"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Način barv slike"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Uporaba sRGB-ja"</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index c118901..4c98ac2 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> gjurmë gishti u konfiguruan</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> gjurmë gishti u konfigurua</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Konfigurimi i gjurmës"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Për të përdorur gjurmën e gishtit për të shkyçur ekranin ose për të konfirmuar blerjet, të duhet që:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Konfiguro metodën rezervë të kyçjes së ekranit"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sa herë që shikon këtë ikonë, mund të përdorësh gjurmën e gishtit për identifikim ose për të autorizuar një blerje."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Mjafton të prekësh sensorin e gjurmës së gishtit për të zgjuar dhe shkyçur pajisjen."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kur të shohësh këtë ikonë, mund të përdorësh gjurmën e gishtit."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kapërce konfigurimin e gjurmës së gishtit?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ke zgjedhur që të përdorësh gjurmën e gishtit si një mënyrë për ta shkyçur telefonin. Nëse e kapërcen teni, do të duhet ta konfigurosh këtë më vonë. Konfigurimi do të zgjasë vetëm afro një minutë."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguro kyçjen e ekranit"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"U krye"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Jo, sensori nuk është ai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Përdor sensorin e gjurmës së gishtit në pajisje."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Regjistrimi nuk përfundoi"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"U arrit kufiri kohor për regjistrimin e gjurmës së gishtit. Provo përsëri."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Regjistrimi i gjurmës së gishtit nuk funksionoi. Provo përsëri ose përdor një gisht tjetër."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Shto një tjetër"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Përpara"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Përveç shkyçjes së telefonit, gjurmën e gishtit mund ta përdorësh edhe për të autorizuar blerjet dhe qasjen në aplikacione. "<annotation id="url">"Mëso më shumë"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Shiko informacionin ligjor, statusin dhe versionin e softuerit"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informacioni ligjor"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontribuuesit"</string>
+    <string name="manual" msgid="3025943393642974445">"Manuale"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Informacion për rregullat"</string>
     <string name="copyright_title" msgid="865906688917260647">"Të drejtat e autorit"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Licenca e WebView në sistem"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imazhet e sfondit"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Ofruesit e imazheve satelitore:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manuale"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ka një problem me ngarkimin e manualit."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencat me burim të hapur"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ka një problem me ngarkimin e licencave."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Po ngarkon..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"siguria e lejeve të aplikacioneve"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"aplikacionet e parazgjedhura"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"sasia e shpërfilljes së optimizimeve aplikacioni në modalitet gatishmërie"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"ngjyrë e gjallë rgb srgb natyrale standarde"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"rrëshqit fjalëkalim motiv pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Cakto një etiketë NFC për Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Shkruaj"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Shfaq sintonizuesin SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Lejet shtesë"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> të tjera"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Vetëm për ngarkim"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Transferimin e skedarëve (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferimin e fotografive (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Po ngarkohet"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Vetëm karikoje këtë pajisje"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Furnizim me energji"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Kariko pajisjen tjetër të lidhur"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Transferimet e dosjeve"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Transfero dosjet në Windows ose Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Transferim fotosh (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfero foto ose dosje, nëse MTP-ja nuk mbështetet (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Përdor pajisjen për hyrjen MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Përdore USB-në për"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Aplikacionet joaktive"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Joaktiv. Preke për ta ndryshuar."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Kjo leje e lejon një aplikacion të modifikojë cilësimet e sistemit."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Po"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Jo"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Rrotullo dy herë për kamerën"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Hap aplikacionin e kamerës duke rrotulluar kyçin e dorës dy herë"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Shtyp butonin e energjisë dy herë për kamerën"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Hap me shpejtësi kamerën pa e shkyçur ekranin"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Të gjalla (parazgjedhja)"</item>
+    <item msgid="8446070607501413455">"Natyrale"</item>
+    <item msgid="6553408765810699025">"Standarde"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Ngjyra të përmirësuara"</item>
+    <item msgid="8280754435979370728">"Ngjyra natyrale siç shikohen me sy të lirë"</item>
+    <item msgid="5363960654009010371">"Ngjyra të optimizuara për përmbajtjet dixhitale"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Modalitti i ngjyrave të figurës"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Përdor sRGB"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 52f6085..d817324 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -324,6 +324,7 @@
       <item quantity="few">Подешена су <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Подешав. отиска прста"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Да бисте користили отисак прста за откључавање екрана или потврду куповина, потребно је:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Подесите резервни метод за закључавање екрана"</string>
@@ -348,10 +349,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Када год видите ову икону, можете да користите отисак прста ради идентификације или да бисте одобрили куповину."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само додирните сензор за отисак прста да бисте активирали и откључали уређај."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Када видите ову икону, можете да користите отисак прста."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Прескочити подешавање отиска прста?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Изабрали сте да користите отисак прста као један начин за откључавање телефона. Ако сада прескочите, мораћете касније да обавите ово подешавање. За подешавање је потребно само око минут времена."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Подеси закључавање екрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Упс, то није сензор"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Користите сензор за отисак прста на уређају."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Регистрација није завршена"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Временско ограничење за регистрацију отиска прста је истекло. Покушајте поново."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Регистрација отиска прста није успела. Покушајте поново или користите други прст."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додајте још један"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Даље"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Осим за откључавање телефона, отисак прста можете да користите и да бисте дали овлашћење за куповине и приступ апликацијама. "<annotation id="url">"Сазнајте више"</annotation></string>
@@ -1217,6 +1223,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Преглед правних информација, статуса, верзије софтвера"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правне информације"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сарадници"</string>
+    <string name="manual" msgid="3025943393642974445">"Упутство"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Регулативне информације"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ауторска права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
@@ -1224,6 +1231,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Лиценца за системски WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Позадине"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Добављачи сателитских слика:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Упутство"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Дошло је до проблема при учитавању упутства."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценца отвореног кода"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Дошло је до проблема при учитавању лиценци."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Учитава се…"</string>
@@ -2511,6 +2520,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"апликације дозволе безбедност"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"подразумевано подешавање апликација"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"игнорисање оптимизација стање неактивности апликације стање приправности"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"живописан rgb srgb боје природан стандардан"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"превлачење лозинка шаблон pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите Wi-Fi NFC ознаку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
@@ -2816,10 +2826,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Прикажи Тјунер за кор. интерфејс система"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Додатне дозволе"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"још <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Само пуњење"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Пренос датотека (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Пренос слика (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Пуњење"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Само пуните овај уређај"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Напајање"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Пуните други повезани уређај"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Пренос датотека"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Преносите датотеке на Windows или Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Пренос слика (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Преносите слике или датотеке ако MTP није подржан (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Користите уређај за MIDI улаз"</string>
     <string name="usb_use" msgid="3372728031108932425">"Користи USB за"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивне апликације"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивна. Додирните да бисте је активирали."</string>
@@ -2886,4 +2902,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ова дозвола дозвољава апликацији да мења подешавања система."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Двапут заокрените за камеру"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Отворите апликацију Камера тако што ћете двапут заокренути ручни зглоб"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Притисните дугме за напајање двапут за камеру"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Брзо отворите камеру без откључавања екрана"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Живописан (подразумевано)"</item>
+    <item msgid="8446070607501413455">"Природан"</item>
+    <item msgid="6553408765810699025">"Стандардан"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Побољшане боје"</item>
+    <item msgid="8280754435979370728">"Природне боје налик онима које региструје око"</item>
+    <item msgid="5363960654009010371">"Боје оптимизоване за дигитални садржај"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Режим боја слика"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Користи sRGB"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3f47efe..3baef98 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingeravtryck har konfigurerats</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingeravtryck har konfigurerats</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Konfig. fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Om du vill använda ditt fingeravtryck för att låsa upp skärmen eller bekräfta köp måste vi göra följande:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Ange reservmetod för skärmlås"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"När du ser den här ikonen kan du identifiera dig eller auktorisera ett köp med hjälp av ditt fingeravtryck."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Väck och lås upp enheten genom att trycka på fingeravtryckssensorn."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"När den här ikonen visas kan du använda fingeravtryck."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hoppa över fingeravtryckskonfigurering?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valt att låsa upp mobilen med hjälp av ditt fingeravtryck. Om du hoppar över konfigureringen nu måste du slutföra den senare. Konfigureringen tar bara en minut eller två."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ställ in skärmlåset"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Klar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hoppsan! Det där är inte sensorn"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Använd fingeravtryckssensorn på enheten."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreringen slutfördes inte"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tidsgränsen för registreringen av fingeravtryck har uppnåtts. Försök igen."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Det gick inte att registrera fingeravtrycket. Försök igen eller använd ett annat finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lägg till en till"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Nästa"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Förutom att låsa upp mobilen kan du använda fingeravtrycket för att godkänna köp och åtkomst för appar. "<annotation id="url">"Läs mer"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Visa juridisk information, status, programversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medarbetare"</string>
+    <string name="manual" msgid="3025943393642974445">"Handbok"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Föreskrifter"</string>
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Systemets WebView-licens"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Bakgrunder"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Satellitbildsleverantörer:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Handbok"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ett problem inträffade när handboken lästes in."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Öppen källkodslicens"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ett problem inträffade när licenserna lästes in."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Läser in…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"appar behörigheter säkerhet"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"appar standard"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ignorera optimeringar för slumrande app i standbyläge"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"starka rgb srgb färg naturliga standardfärger"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra lösenord mönster pinkod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg för Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Visa inställningar för systemgränssnitt"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ytterligare behörigheter"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> till"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Endast laddning"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Överföring av filer (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Överföring av foton (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Laddar"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Ladda bara den här enheten"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Strömförsörjning"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Ladda den andra anslutna enheten"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Filöverföringar"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Överföra filer till Windows eller Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoöverföring (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Överföra foton eller filer om MTP inte stöds (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Använd enheten för MIDI-indata"</string>
     <string name="usb_use" msgid="3372728031108932425">"Använd USB för"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Inaktiva appar"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Inaktiv. Aktivera genom att trycka."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Med den här behörigheten kan appen ändra systeminställningarna."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Två handledsvridningar öppnar kameran"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Öppna kameran med två handledsvridningar"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Öppna kameran med två tryck på strömbr."</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Öppna kameran snabbt utan att låsa upp skärmen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Starka (standard)"</item>
+    <item msgid="8446070607501413455">"Naturliga"</item>
+    <item msgid="6553408765810699025">"Standardfärger"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Berikade färger"</item>
+    <item msgid="8280754435979370728">"Naturliga färger så som ögat ser dem"</item>
+    <item msgid="5363960654009010371">"Färger som har anpassats för digitalt innehåll"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Färgläge för bilder"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Använd sRGB"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 8355a8a..daf733c 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -290,8 +290,8 @@
     <item msgid="4671646036128214513">"kamera"</item>
     <item msgid="1097324338692486211">"rekodi sauti"</item>
     <item msgid="5031552983987798163">"cheza sauti"</item>
-    <item msgid="8374996688066472414">"soma ubao wa kunakili"</item>
-    <item msgid="3045529469061083747">"badilisha ubao wa kunakili"</item>
+    <item msgid="8374996688066472414">"soma ubao klipu"</item>
+    <item msgid="3045529469061083747">"badilisha ubao klipu"</item>
     <item msgid="5124443975763747838">"vitufe vya vyombo vya habari"</item>
     <item msgid="4547883971364273343">"mkazo wa sauti"</item>
     <item msgid="2603878814882344450">"sauti kuu"</item>
@@ -342,8 +342,8 @@
     <item msgid="781213371706962767">"Kamera"</item>
     <item msgid="1720492593061838172">"Rekodi sauti"</item>
     <item msgid="3493046322001257041">"Cheza sauti"</item>
-    <item msgid="136815868796597058">"Soma ubao wa kunakili"</item>
-    <item msgid="5238692940326972503">"Rekebisha ubao wa kunakili"</item>
+    <item msgid="136815868796597058">"Soma ubao klipu"</item>
+    <item msgid="5238692940326972503">"Rekebisha ubao klipu"</item>
     <item msgid="5753789168376302997">"Vitufe vya media"</item>
     <item msgid="3265262911688671938">"Kotovu cha sauti"</item>
     <item msgid="2098976479485046797">"Sauti kuu"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 186fb3f..336607c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -324,6 +324,7 @@
       <item quantity="other">Vitambulisho <xliff:g id="COUNT_1">%1$d</xliff:g> vimewekwa</item>
       <item quantity="one">Kitambulisho <xliff:g id="COUNT_0">%1$d</xliff:g> kimewekwa</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Kitambulisho kimesanidiwa!"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Kutumia kitambulisho chako kufungua skrini yako au kuidhinisha ununuzi, tutahitaji:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Sanidi mbinu yako mbadala ya kufunga skrini"</string>
@@ -348,10 +349,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kila unapoona aikoni hii, unaweza kutumia kitambulisho chako kujitambulisha au kuidhinisha ununuzi."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Gusa tu kihisi cha alama za vidole ili uanzishe na kufungua kifaa chako."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Ukiona aikoni hii, unaweza kutumia alama yako ya kidole."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ungependa kuruka kusanidi kitambulisho?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Umechagua kutumia kitambulisho kama njia ya kufungua simu yako. Ukiruka sasa, utahitajika kusanidi hii baadaye. Usanidi huchukua takriban dakika moja."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Weka mbinu ya kufunga skrini"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Nimemaliza"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Lo, hicho si kihisi"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Tumia kihisi cha kitambulisho kwenye kifaa chako."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Hukukamilisha kujiandikishaji"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Muda wa uandikishaji wa kitambulisho umefikia kikomo. Jaribu tena."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Uandikishaji wa kitambulisho haukufanya kazi. Jaribu tena au utumie kitambulisho tofauti."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ongeza kingine"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Inayofuata"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Mbali na kufungua simu yako, unaweza pia kutumia kitambulisho chako kuidhinisha ununuzi na ufikiaji programu. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
@@ -1214,6 +1220,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Angalia maelezo ya kisheria, hadhi, toleo la programu"</string>
     <string name="legal_information" msgid="5769301644270604095">"Maelezo ya kisheria"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Wachangiaji"</string>
+    <string name="manual" msgid="3025943393642974445">"Mwongozo"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Maelezo ya udhibiti"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hakimiliki"</string>
     <string name="license_title" msgid="1990487604356037871">"Leseni"</string>
@@ -1221,6 +1228,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Leseni ya WebView ya Mfumo"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Mandhari"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Watoa huduma wa picha za setilaiti: \n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Mwongozo"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Kumekuwa na hitilafu katika kupakia mwongozo."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Chanzo cha leseni huria"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kuna hitilafu wakati wa kupakia leseni"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Inapakia…"</string>
@@ -2508,6 +2517,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"usalama wa ruhusa za programu"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"chaguo-msingi ya programu"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"puuza kuokoa betri wakati wa programu kuwa katika hali tulivu"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"Muundo-msingi wa asili wa rangi maridadi ya RGB sRGB"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"telezesha kidole nenosiri mchoro pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
@@ -2805,10 +2815,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Onyesha Kipokea Ishara cha SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ruhusa za ziada"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> zaidi"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Kuchaji pekee"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Kuhamisha faili (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Kuhamisha picha (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Inachaji"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Chaji tu kifaa hiki"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Umeme"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Chaji kifaa kingine kilichounganishwa"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Uhamishaji wa faili"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Hamishia faili katika Windows au Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Uhamishaji wa picha (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Hamisha picha au faili ikiwa MPT haiwezi kutumika (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Tumia kifaa kwa vifaa vya kuingiza sauti vya MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Tumia USB kwa ajili ya"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Programu zilizozimwa"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Imezimwa. Gusa ili ubadilishe."</string>
@@ -2874,4 +2890,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Idhini hii huruhusu programu kubadilisha mipangilio ya mfumo"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ndiyo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hapana"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kunja mkon mara mbili ili ufungue kamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Fungua programu ya kamera kwa kukunja kifundo cha mkono wako mara mbili"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Bonyeza kitufe cha kuwasha/kuzima mara mbili ili utumie kamera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Fungua kamera kwa haraka bila kufungua skrini yako"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Maridadi (chaguo-msingi)"</item>
+    <item msgid="8446070607501413455">"Asili"</item>
+    <item msgid="6553408765810699025">"Muundo-msingi"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Rangi zilizoboreshwa"</item>
+    <item msgid="8280754435979370728">"Rangi asili kama zinavyoonekana kwa macho"</item>
+    <item msgid="5363960654009010371">"Rangi zilizoboreshwa kwa ajili ya maudhui dijitali"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Hali ya rangi ya picha"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Tumia sRGB"</string>
 </resources>
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 8e679e9..9c82d90 100755
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -23,6 +23,6 @@
     <dimen name="fingerprint_in_app_indicator_size">176dp</dimen>
     <dimen name="fingerprint_find_sensor_graphic_size">240dp</dimen>
 
-    <dimen name="setup_fingerprint_ring_radius">106dp</dimen>
-    <dimen name="setup_fingerprint_progress_bar_size">220dp</dimen>
+    <dimen name="setup_fingerprint_ring_radius">92dp</dimen>
+    <dimen name="setup_fingerprint_progress_bar_size">192dp</dimen>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index f81c862..87a7021 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"கைரேகையை அமைக்கவும்"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"திரையைத் திறக்க அல்லது பர்ச்சேஸ்களை உறுதிப்படுத்த, உங்கள் கைரேகையைப் பயன்படுத்த, நீங்கள் செய்ய வேண்டியது:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"பின்புலத் திரைப் பூட்டு முறையை அமைக்கவும்"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், அடையாளப்படுத்தலுக்காக அல்லது வாங்குதலை அங்கீகரிக்க, நீங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"சாதனத்தைச் செயல்படச் செய்து, அதைத் திறக்க, கைரேகை உணர்வியைத் தொட்டால் போதும்."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், உங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"கைரேகை அமைவைத் தவிர்க்கவா?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"கைரேகையை மட்டும் பயன்படுத்தி மொபைலைத் திறக்கும் முறையைத் தேர்வுசெய்துள்ளீர்கள். இப்போது தவிர்த்தால், இதைப் பின்னர் அமைக்க வேண்டியிருக்கும். அமைவுக்குத் தோராயமாக ஒரு நிமிடம் மட்டுமே எடுக்கும்."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"திரைப் பூட்டை அமை"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"முடிந்தது"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"அச்சச்சோ, அது உணர்வி இல்லை"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"சாதனத்தின் கைரேகை உணர்வியைப் பயன்படுத்தவும்."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"பதிவுசெய்ய முடியவில்லை"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"கைரேகையைப் பதிவுசெய்வதற்கான நேரம் முடிந்தது. மீண்டும் முயற்சிக்கவும்."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"கைரேகையைப் பதிவுசெய்ய முடியவில்லை. மீண்டும் முயற்சிக்கவும் அல்லது வேறு விரலைப் பயன்படுத்தவும்."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"மற்றொன்றைச் சேர்"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"அடுத்து"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"மொபைலைத் திறக்க மட்டுமில்லாமல், பர்ச்சேஸ்களை உறுதிப்படுத்தவும் பயன்பாட்டை அணுகவும் கைரேகையைப் பயன்படுத்தலாம். "<annotation id="url">"மேலும் அறிக"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"சட்டத் தகவல், நிலை மற்றும் மென்பொருள் பதிப்பைக் காட்டு"</string>
     <string name="legal_information" msgid="5769301644270604095">"சட்டத் தகவல்"</string>
     <string name="contributors_title" msgid="5917703088825286504">"பங்களிப்பாளர்கள்"</string>
+    <string name="manual" msgid="3025943393642974445">"கைமுறை"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"ஒழுங்குமுறைத் தகவல்"</string>
     <string name="copyright_title" msgid="865906688917260647">"பதிப்புரிமை"</string>
     <string name="license_title" msgid="1990487604356037871">"உரிமம்"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"சிஸ்டம் WebView உரிமம்"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"வால்பேப்பர்கள்"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"செயற்கை கோள் படங்களை வழங்குபவர்கள்:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"கைமுறை"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"கைமுறைச் செயலாக்கத்தை ஏற்றுவதில் சிக்கல்."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"உரிமங்களை ஏற்றுவதில் சிக்கல் உள்ளது."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ஏற்றுகிறது..."</string>
@@ -2292,11 +2301,11 @@
     <string name="user_list_title" msgid="7937158411137563543">"பயனர்கள் &amp; சுயவிவரங்கள்"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"பயனர் அல்லது சுயவிவரத்தைச் சேர்"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"பயனரைச் சேர்"</string>
-    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"வரையறுக்கப்பட்ட சுயவிவரம்"</string>
     <string name="user_need_lock_message" msgid="5879715064416886811">"நீங்கள் வரையறுக்கப்பட்டச் சுயவிவரத்தை உருவாக்குவதற்கு முன்பு, உங்கள் பயன்பாடுகள் மற்றும் தனிப்பட்ட தரவைப் பாதுகாக்கும் வகையில் நீங்கள் திரைப் பூட்டை அமைக்க வேண்டும்."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"பூட்டை அமை"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"அமைக்கவில்லை"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"அமைக்கவில்லை - கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"அமைக்கவில்லை - வரையறுக்கப்பட்ட சுயவிவரம்"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"பணி சுயவிவரம் அமைக்கப்படவில்லை"</string>
     <string name="user_owner" msgid="3879126011135546571">"உரிமையாளர்"</string>
     <string name="user_you" msgid="1639158809315025986">"நீங்கள் (<xliff:g id="NAME">%s</xliff:g>)"</string>
@@ -2306,7 +2315,7 @@
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"பயனர்கள் தங்களுக்குச் சொந்தமான பயன்பாடுகள் மற்றும் உள்ளடக்கத்தை வைத்திருக்க வேண்டும்"</string>
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"உங்கள் கணக்கிலிருந்து பயன்பாடுகள் மற்றும் உள்ளடக்கத்திற்கான அணுகலை நீங்கள் வரையறுக்கலாம்"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"பயனர்"</string>
-    <string name="user_add_profile_item_title" msgid="8353515490730363621">"கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"வரையறுக்கப்பட்ட சுயவிவரம்"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"புதியவரைச் சேர்க்கவா?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும் பயன்பாடுகள், வால்பேப்பர் மற்றும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\n\nபுதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"புதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"பயன்பாடுகள் அனுமதிகள் பாதுகாப்பு"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"பயன்பாடுகள் இயல்பு"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"தவிர் மேம்படுத்தல்கள் doze பயன்பாடு காத்திருப்பு நிலை"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"வைபிரன்ட் rgb srgb வண்ணம் இயற்கை வழக்கம்"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ஸ்லைடு கடவுச்சொல் வடிவம் pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ட்யூனரைக் காட்டு"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"கூடுதல் அனுமதிகள்"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"மேலும் <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"சார்ஜிங்கின் போது மட்டும்"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"கோப்புகள் பரிமாற்றம் (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"படங்கள் பரிமாற்றம் (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"சார்ஜ் செய்தல்"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"இந்தச் சாதனத்தைச் சார்ஜ் செய்யும்"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"பவர் சப்ளை"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"இணைக்கப்பட்ட பிற சாதனத்தைச் சார்ஜ் செய்யும்"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"கோப்புப் பரிமாற்றங்கள்"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows அல்லது Mac (MTP)க்கு கோப்புகளைப் பரிமாற்றும்"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"படப் பரிமாற்றம் (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ஆதரிக்கப்படவில்லை எனில், படங்கள் அல்லது கோப்புகளைப் பரிமாற்றும் (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI உள்ளீட்டிற்குச் சாதனத்தைப் பயன்படுத்தும்"</string>
     <string name="usb_use" msgid="3372728031108932425">"இதற்காக USBஐப் பயன்படுத்து:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"செயலில் இல்லாத பயன்பாடுகள்"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"செயலில் இல்லை. மாற்ற, தொடவும்."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"இது முறைமை அமைப்புகளை மாற்ற, பயன்பாட்டை அனுமதிக்கும்."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"அனுமதிக்கப்பட்டது"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"அனுமதிக்கப்படவில்லை"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"கேமராவைத் திறக்க, இருமுறை திருப்புதல்"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"உங்கள் மணிக்கட்டை இருமுறை திருப்புவதன் மூலம் கேமரா பயன்பாட்டைத் திறக்கலாம்"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"கேமராவிற்கு பவர் பட்டனை இருமுறை அழுத்துக"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"திரையைத் திறக்காமலேயே கேமராவை வேகமாகத் திறக்கும்"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"வைபிரன்ட் (இயல்பு)"</item>
+    <item msgid="8446070607501413455">"இயற்கை வண்ணம்"</item>
+    <item msgid="6553408765810699025">"வழக்கமான வண்ணம்"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"மேம்படுத்தப்பட்ட வண்ணங்கள்"</item>
+    <item msgid="8280754435979370728">"கண்களால் பார்ப்பதைப் போலவே இயற்கையான வண்ணங்கள்"</item>
+    <item msgid="5363960654009010371">"டிஜிட்டல் உள்ளடக்கத்திற்கு ஏற்ப மேம்படுத்தப்பட்ட வண்ணங்கள்"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"படத்தின் வண்ணப் பயன்முறை"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGBஐப் பயன்படுத்தும்"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index c625287..27f7f8f 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"వేలిముద్ర సెటప్"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"మీ స్క్రీన్ అన్‌లాక్ చేసేందుకు లేదా కొనుగోళ్లను నిర్ధారించేందుకు మీ వేలిముద్రను ఉపయోగించడానికి, మేము వీటిని చేయాల్సి ఉంటుంది:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని సెటప్ చేయండి"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"మీ పరికరం సక్రియం చేయడానికి మరియు అన్‌లాక్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకితే సరిపోతుంది."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, మీరు మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"వేలిముద్ర సెటప్‌ను దాటవేయాలా?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"మీరు మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఒక మార్గంగా ఎంచుకున్నారు. ఇప్పుడు దాటవేసినా, దీన్ని తర్వాత సెటప్ చేయాల్సి ఉంటుంది. కేవలం ఒక నిమిషంలో సెటప్‌ను పూర్తి చేయవచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"స్క్రీన్ లాక్‌ను సెటప్ చేయి"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"పూర్తయింది"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"అయ్యో, అది సెన్సార్ కాదు"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"మీ పరికరం వేలిముద్ర సెన్సార్‌ను ఉపయోగించండి."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"నమోదు పూర్తి కాలేదు"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"వేలిముద్ర నమోదు సమయ పరిమితి చేరుకుంది. మళ్లీ ప్రయత్నించండి."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"వేలిముద్ర నమోదు పని చేయలేదు. మళ్లీ ప్రయత్నించండి లేదా మరొక వేలిని ఉపయోగించండి."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"మరొకటి జోడించు"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"తదుపరి"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"మీ ఫోన్‌ను అన్‌లాక్ చేయడంతో పాటుగా, కొనుగోళ్లు మరియు అనువర్తనం ప్రాప్యతను అనుమతించడానికి కూడా మీ వేలిముద్రను ఉపయోగించవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"చట్టపరమైన సమాచారం, స్థితి, సాఫ్ట్‌వేర్ సంస్కరణను వీక్షించండి"</string>
     <string name="legal_information" msgid="5769301644270604095">"చట్టబద్ధమైన సమాచారం"</string>
     <string name="contributors_title" msgid="5917703088825286504">"సహకారులు"</string>
+    <string name="manual" msgid="3025943393642974445">"మాన్యువల్"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"నియంత్రిత సమాచారం"</string>
     <string name="copyright_title" msgid="865906688917260647">"కాపీరైట్"</string>
     <string name="license_title" msgid="1990487604356037871">"లైసెన్స్"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"సిస్టమ్ వెబ్‌వ్యూ లైసెన్స్"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"వాల్‌పేపర్‌లు"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ఉపగ్రహ చిత్రాల ప్రదాతలు:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"మాన్యువల్"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"మాన్యువల్‌ను లోడ్ చేయడంలో సమస్య ఏర్పడింది."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"లైసెన్స్‌లను లోడ్ చేయడంలో సమస్య ఉంది."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"లోడ్ చేస్తోంది…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"అనువర్తనాల అనుమతుల భద్రత"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"డిఫాల్ట్‌గా ఉన్న అనువర్తనాలు"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"విస్మరించు అనుకూలీకరణలు నిద్రావస్థ అనువర్తనం స్టాండ్‌బై"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"సచేతనం rgb srgb రంగు సహజం ప్రామాణికం"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"స్లయిడ్ చేయడం పాస్‌వర్డ్ నమూనా పిన్"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ట్యూనర్‌ను చూపు"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"అదనపు అనుమతులు"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"మరో <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"ఛార్జింగ్ మాత్రమే"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"ఫైల్‌లను బదిలీ చేయడం (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ఫోటోలను బదిలీ చేయడం (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"ఛార్జింగ్"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"కేవలం ఈ పరికరాన్ని ఛార్జ్ చేస్తుంది"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"విద్యుత్ శక్తి సరఫరా"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"కనెక్ట్ చేసిన మరొక పరికరాన్ని ఛార్జ్ చేస్తుంది"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"ఫైల్ బదిలీలు"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Windows లేదా Macకి ఫైల్‌లను బదిలీ చేస్తుంది (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"ఫోటో బదిలీ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTPకి మద్దతు లేకపోతే ఫోటోలు లేదా ఫైల్‌లను బదిలీ చేస్తుంది (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"MIDI ఇన్‌పుట్ కోసం పరికరాన్ని ఉపయోగిస్తుంది"</string>
     <string name="usb_use" msgid="3372728031108932425">"దీని కోసం USBని ఉపయోగించండి"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"నిష్క్రియ అనువర్తనాలు"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"నిష్క్రియంగా ఉంది. టోగుల్ చేయడానికి తాకండి."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"అవును"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"లేదు"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"కెమెరా కోసం రెండు సార్లు తిప్పడం"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"మీ ఫోన్ పట్టుకున్న ముంజేతిని రెండు సార్లు తిప్పితే కెమెరా అనువర్తనం తెరవబడుతుంది"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"కెమెరాకై పవర్ బటన్ రెండుసార్లు నొక్కండి"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"మీ స్క్రీన్‌ను అన్‌లాక్ చేయకుండానే కెమెరాను శీఘ్రంగా తెరుస్తుంది"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"సచేతనం (డిఫాల్ట్)"</item>
+    <item msgid="8446070607501413455">"సహజం"</item>
+    <item msgid="6553408765810699025">"ప్రామాణికం"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"మెరుగైన రంగులు"</item>
+    <item msgid="8280754435979370728">"కంటికి కనిపించే విధంగా సహజమైన రంగులు"</item>
+    <item msgid="5363960654009010371">"డిజిటల్ కంటెంట్ కోసం అనుకూలీకరించిన రంగులు"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"చిత్రం రంగు మోడ్"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ఉపయోగిస్తుంది"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 743bac9..56bb1de 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -116,8 +116,8 @@
     <string name="bluetooth_device" msgid="5291950341750186887">"อุปกรณ์บลูทูธที่ไม่มีชื่อ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"กำลังค้นหา"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ไม่พบอุปกรณ์บลูทูธในบริเวณใกล้เคียง"</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอจับคู่อุปกรณ์ผ่านบลูทูธ"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอจับคู่อุปกรณ์"</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"แตะเพื่อจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
     <string name="device_picker" msgid="4978696506172252813">"เลือกอุปกรณ์บลูทูธ"</string>
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"การตั้งค่าลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"หากต้องการใช้ลายนิ้วมือเพื่อปลดล็อกหน้าจอหรือยืนยันการซื้อ เราจะต้อง:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"ตั้งค่าวิธีการล็อกหน้าจอสำรอง"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"เมื่อใดก็ตามที่คุณเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุญาตการซื้อได้"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"เพียงแค่แตะเซ็นเซอร์ลายนิ้วมือเพื่อปลุกและปลดล็อกอุปกรณ์"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"เมื่อเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือได้"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าคุณลักษณะนี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ตั้งค่าการล็อกหน้าจอ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"เสร็จสิ้น"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"อ๊ะ นั่นไม่ใช่เซ็นเซอร์"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ใช้เซ็นเซอร์ลายนิ้วมือบนอุปกรณ์"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"การลงทะเบียนยังไม่เสร็จสมบูรณ์"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"หมดเวลาลงทะเบียนลายนิ้วมือ โปรดลองอีกครั้ง"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"การลงทะเบียนลายนิ้วมือไม่ทำงาน โปรดลองอีกครั้งหรือใช้นิ้วอื่น"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"เพิ่มอีกหนึ่ง"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ถัดไป"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"นอกเหนือจากการปลดล็อกโทรศัพท์ คุณยังสามารถใช้ลายนิ้วมือเพื่อให้สิทธิ์การซื้อและการเข้าถึงแอปได้"<annotation id="url">"เรียนรู้เพิ่มเติม"</annotation></string>
@@ -523,9 +529,9 @@
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ไม่พบอุปกรณ์"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"เชื่อมต่อ"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"ตัดการเชื่อมต่อ"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"จับคู่อุปกรณ์และเชื่อมต่อ"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"เลิกจับคู่อุปกรณ์"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ตัดการเชื่อมต่อและเลิกจับคู่อุปกรณ์"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"กำหนดค่าอุปกรณ์ให้ตรงกันและเชื่อมต่อ"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"ยกเลิกการกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ตัดการเชื่อมต่อและยกเลิกการกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ตัวเลือก…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ขั้นสูง"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"บลูทูธขั้นสูง"</string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"ดูข้อมูลกฎหมาย สถานะ รุ่นซอฟต์แวร์"</string>
     <string name="legal_information" msgid="5769301644270604095">"ข้อมูลทางกฎหมาย"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ผู้ร่วมให้ข้อมูล"</string>
+    <string name="manual" msgid="3025943393642974445">"คู่มือ"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"ข้อมูลเกี่ยวกับกฎระเบียบ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ลิขสิทธิ์"</string>
     <string name="license_title" msgid="1990487604356037871">"สัญญาอนุญาต"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"ใบอนุญาต WebView ของระบบ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"วอลเปเปอร์"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ผู้ให้บริการภาพถ่ายดาวเทียม:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"คู่มือ"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"พบปัญหาในการโหลดคู่มือ"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"สัญญาอนุญาตสำหรับโอเพนซอร์ส"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"พบปัญหาในการโหลดสัญญาอนุญาต"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"กำลังโหลด…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ความปลอดภัยในการอนุญาตแอป"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"แอป ค่าเริ่มต้น"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ละเว้นการเพิ่มประสิทธิภาพการสแตนด์บายแอปแบบสลีป"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"สด rgb srgb สี ธรรมชาติ มาตรฐาน"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"เลื่อน รหัสผ่าน รูปแบบ PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"แสดงตัวรับสัญญาณ SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"สิทธิ์เพิ่มเติม"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"และอีก <xliff:g id="COUNT">%1$d</xliff:g> สิทธิ์"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"การชาร์จเท่านั้น"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"โอนไฟล์ (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"โอนรูปภาพ (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"การชาร์จ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"เพียงแค่ชาร์จอุปกรณ์นี้"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"แหล่งจ่ายไฟ"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"ชาร์จอุปกรณ์อื่นที่เชื่อมต่ออยู่"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"การโอนไฟล์"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"โอนไฟล์ไปยัง Windows หรือ Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"การโอนรูปภาพ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"โอนรูปภาพหรือไฟล์ หากระบบไม่สนับสนุน MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"ใช้อุปกรณ์สำหรับการป้อนข้อมูล MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"ใช้ USB สำหรับ"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"แอปที่ไม่ได้ใช้งาน"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"ไม่ได้ใช้งานอยู่ แตะเพื่อสลับ"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"สิทธิ์นี้อนุญาตให้แอปแก้ไขการตั้งค่าระบบได้"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ใช่"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ไม่"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"บิด 2 ครั้งเพื่อเปิดกล้อง"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"เปิดแอปกล้องถ่ายรูปโดยบิดข้อมือ 2 ครั้ง"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"กดปุ่มเปิด/ปิด 2 ครั้งสำหรับกล้อง"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"เปิดกล้องอย่างรวดเร็วโดยไม่ต้องปลดล็อกหน้าจอ"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"สด (ค่าเริ่มต้น)"</item>
+    <item msgid="8446070607501413455">"ธรรมชาติ"</item>
+    <item msgid="6553408765810699025">"มาตรฐาน"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"สีที่ได้รับการปรับปรุง"</item>
+    <item msgid="8280754435979370728">"สีธรรมชาติตามที่ดวงตามองเห็น"</item>
+    <item msgid="5363960654009010371">"สีที่เหมาะกับเนื้อหาดิจิทัล"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"โหมดสีของรูปภาพ"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"ใช้ sRGB"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7de93a6..dabb63b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one">Pag-set up ng <xliff:g id="COUNT_1">%1$d</xliff:g> fingerprint</item>
       <item quantity="other">Pag-set up ng <xliff:g id="COUNT_1">%1$d</xliff:g> na fingerprint</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Setup ng fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Upang magamit ang iyong fingerprint upang i-unlock ang iyong screen o kumpirmahin ang mga pagbili, kakailanganin naming:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"I-set up ang iyong backup na paraan ng pag-lock ng screen"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kapag nakikita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint para sa pagkakakilanlan o upang pahintulutan ang isang pagbili."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Hawakan lang ang sensor ng fingerprint upang i-wake at i-unlock ang iyong device."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Kapag nakita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Laktawan ang pag-set up ng fingerprint?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pinili mong gamitin ang iyong fingerprint bilang isang paraan upang i-unlock ang iyong telepono. Kung lalaktaw ka ngayon, kakailanganin mo itong i-set up sa ibang pagkakataon. Tumatagal lang nang isang minuto o higit pa ang pag-setup."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"I-set up ang lock ng screen"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Tapos na"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Naku, hindi iyan ang sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gamitin ang fingerprint sensor sa device mo."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Hindi nakumpleto ang pagpapatala"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Naabot na ang limitasyon sa oras ng pagpapatala ng fingerprint. Subukang muli."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Hindi gumana ang pagpapatala ng fingerprint. Subukang muli o gumamit ng ibang daliri."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Magdagdag ng isa pa"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Susunod"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Bukod pa sa pag-a-unlock ng iyong telepono, maaari mo ring gamitin ang iyong fingerprint upang pahintulutan ang mga pagbili at pag-access sa app. "<annotation id="url">"Matuto nang higit pa"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Tingnan ang impormasyong legal, katayuan, bersyon ng software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal na impormasyon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mga Taga-ambag"</string>
+    <string name="manual" msgid="3025943393642974445">"Manual"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Impormasyon sa regulasyon"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensya"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Lisensya ng System WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Mga Wallpaper"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Mga provider ng koleksyon ng imahe na galing sa satellite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Nagkakaproblema sa paglo-load sa manual."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Mga lisensya ng open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"May problema sa pag-load ng mga lisensya."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Naglo-load…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad ng mga pahintulot sa mga app"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"default ng mga app"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"balewalain ang mga pag-optimize sa pag-doze sa standby ng app"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"vibrant rgb srgb kulay natural standard"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"i-slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"I-set up ang Tag ng NFC sa Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Ipakita ang SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Mga karagdagang pahintulot"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> pa"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Pagcha-charge lang"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Maglipat ng mga file (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Maglipat ng mga larawan (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Nagcha-charge"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"I-charge lang ang device na ito"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Power supply"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"I-charge ang isa pang nakakonektang device"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Mga paglilipat ng file"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Maglipat ng mga file sa Windows o Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Paglilipat ng larawan (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Maglipat ng mga larawan o file kung hindi sinusuportahan ang MTP (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Gamitin ang device para sa MIDI input"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gamitin ang USB para sa"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Mga hindi aktibong app"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Hindi aktibo. Pindutin upang ma-toggle."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Nagbibigay-daan ang pahintulot na ito sa isang app na baguhin ang mga setting ng system."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hindi"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Dobleng pag-twist para sa camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Buksan ang camera app sa pamamagitan ng pag-twist sa iyong kamay nang dalawang beses"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Pindutin nang dalawang beses ang power button para sa camera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Mabilisang buksan ang camera nang hindi ina-unlock ang iyong screen"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Vibrant (default)"</item>
+    <item msgid="8446070607501413455">"Natural"</item>
+    <item msgid="6553408765810699025">"Standard"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Mga pinagandang kulay"</item>
+    <item msgid="8280754435979370728">"Mga natural na kulay tulad ng nakikita ng mata"</item>
+    <item msgid="5363960654009010371">"Mga kulay na naka-optimize para sa digital na content"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Mode ng kulay ng larawan"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gamitin ang sRGB"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9069cad..f34d8c9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> parmak izi ayarlandı</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> parmak izi ayarlandı</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Parmak izi ayarlandı"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Ekranınızın kilidini açmak veya satın alma işlemlerini onaylamak üzere parmak izinizi kullanmak için şunları yapmanız gerekiyor:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Yedek ekran kilitleme yönteminizi ayarlayın"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu simgeyi her gördüğünüzde, kimlik belirlemek veya bir satın alma işlemine onay vermek için parmak izinizi kullanabilirsiniz."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cihazınızı uyandırmak ve kilidini açmak için parmak izi sensörüne dokunmanız yeterli."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Bu simgeyi gördüğünüzde parmak izinizi kullanabilirsiniz."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Parmak izi ayarlama atlansın mı?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefonunuzun kilidini açmak için tek yöntem olarak parmak izinizi kullanmayı seçtiniz. Şimdi atlarsanız bunu daha sonra ayarlamanız gerekecek. Ayarlama işlemi yalnızca bir veya birkaç dakika sürer."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidini ayarla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Bitti"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Yanlış oldu, bu sensör değil"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Cihazınızda parmak izi sensörünü kullanın."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Kayıt işlemi tamamlanmadı"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Parmak izi kayıt işlemi için süre sınırı aşıldı. Tekrar deneyin."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Parmak izi kaydı çalışmadı. Tekrar deneyin veya farklı bir parmak kullanın."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Başka ekle"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Sonraki"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Telefonunuzun kilidini açmanın yanında satın alma işlemlerini ve uygulama erişimini yetkilendirmek için de parmak izinizi kullanabilirsiniz. "<annotation id="url">"Daha fazla bilgi edinin"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Yasal bilgileri, durumu, yazılım sürümünü görüntüle"</string>
     <string name="legal_information" msgid="5769301644270604095">"Yasal bilgiler"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Katkıda bulunanlar"</string>
+    <string name="manual" msgid="3025943393642974445">"Manuel"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Düzenleme bilgileri"</string>
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Sistem WebView Lisansı"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Duvar kağıtları"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Uydu görüntüleri sağlayıcıları:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manuel"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Kılavuzun yüklenmesiyle ilgili bir sorun var."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Açık kaynak lisansları"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Lisanslar yüklenirken bir sorun oluştu."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Yükleniyor…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"uygulama izinleri güvenliği"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"uygulama varsayılanı"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"optimizasyonları yoksay doz uygulama bekleme"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"canlı rgb srgb renk doğal standart"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kaydırma şifre desen pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Ayarlayıcısını Göster"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Ek izinler"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> tane daha"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Yalnızca şarj"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dosya aktarma (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotoğraf aktarma (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Şarj etme"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Yalnızca bu cihazı şarj et"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Güç kaynağı"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Diğer bağlı cihazı şarj et"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Dosya aktarımları"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dosyaları Windows\'a veya Mac\'e aktar (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Fotoğraf aktarımı (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP desteklenmiyorsa fotoğrafları veya dosyaları aktar (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Cihazı MIDI girişi için kullan"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB\'yi şunun için kullan:"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Devre dışı uygulamalar"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Devre dışı. Değiştirmek için dokunun."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu izin, bir uygulanın sistem ayarlarını değiştirmesine olanak sağlar."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Evet"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hayır"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera için iki kez bükün"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Bileğinizi iki kez bükerek kamera uygulamasını açın"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera için güç düğmesine iki kez basın"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ekranınızı kilitlemeden kamerayı hızlıca açın"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Canlı (varsayılan)"</item>
+    <item msgid="8446070607501413455">"Doğal"</item>
+    <item msgid="6553408765810699025">"Standart"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Geliştirilmiş renkler"</item>
+    <item msgid="8280754435979370728">"Göze göründüğü şekilde doğal renkler"</item>
+    <item msgid="5363960654009010371">"Dijital içerik için optimize edilmiş renkler"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Resim renk modu"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB\'yi kullan"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7f3aed4..0850094 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -326,6 +326,7 @@
       <item quantity="many">Налаштовано <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Налаштування відбитка"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Щоб розблоковувати екран або підтверджувати покупки за допомогою цифрового відбитка, виконайте вказані нижче дії."</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Виберіть резервний спосіб блокування екрана"</string>
@@ -350,10 +351,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Цей значок означає, що ви можете підтвердити свою особу або покупку за допомогою цифрового відбитка."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Щоб активувати та розблокувати пристрій, просто торкніться датчика відбитків пальців."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Коли з’явиться цей значок, ви можете прикласти палець."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропустити налаштування відбитка?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ви вибрали відбиток пальця як один зі способів розблокування телефона. Якщо пропустити цей крок зараз, потрібно буде налаштувати відбиток пізніше. Це займає близько хвилини."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Налаштувати блокування екрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Це не датчик"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Скористайтеся датчиком відбитків на пристрої."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Відбиток не зареєстровано"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Час для реєстрації відбитка минув. Повторіть спробу."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Відбиток не зареєстровано. Повторіть спробу або прикладіть інший палець."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додати ще"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далі"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"За допомогою цифрового відбитка можна не лише розблоковувати телефон, а й підтверджувати покупки та входити в додатки. "<annotation id="url">"Докладніше"</annotation></string>
@@ -1226,6 +1232,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Переглянути правову інф-ю, стан, версію ПЗ"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правова інформація"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Співавтори"</string>
+    <string name="manual" msgid="3025943393642974445">"Посібник"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Нормативна інформація"</string>
     <string name="copyright_title" msgid="865906688917260647">"Автор. право"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцензія"</string>
@@ -1233,6 +1240,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Ліцензія компонента WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Фонові малюнки"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Постачальники супутникових зображень:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Посібник"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Не вдалося завантажити посібник."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ліцензії відкритого коду"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Під час завантаж. ліцензій виникла пробл."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Завант-ня…"</string>
@@ -2520,6 +2529,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"додатки дозволи безпека"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"додатки за умовчанням"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ігнорувати оптимізація сон додаток очікування"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"насичений rgb srgb колір природний стандартний"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем пароль ключ PIN-код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
@@ -2833,10 +2843,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Показати SystemUI Tuner"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Додаткові дозволи"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Ще <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Лише заряджання"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Перенесення файлів (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Перенесення фотографій (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Заряджання"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Лише зарядити пристрій"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Джерело живлення"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Зарядити інший підключений пристрій"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Перенесення файлів"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Перенести файли на Windows або Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Перенесення фотографій (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Перенести фотографії або файли, якщо МТР не підтримується (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Використовувати пристрій для входу MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Використання USB"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Неактивні додатки"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Неактивний додаток. Торкніться, щоб активувати."</string>
@@ -2904,4 +2920,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Додаток зможе змінювати налаштування системи."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ні"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Відкривати Камеру, покрутивши зап’ястям"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Додаток Камера відкриється, якщо двічі покрутити зап’ястям"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера: двічі натиснути кнопку живлення"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Швидко запускайте камеру, не розблоковуючи екран"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Насичений (за умовчанням)"</item>
+    <item msgid="8446070607501413455">"Природний"</item>
+    <item msgid="6553408765810699025">"Стандартний"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Покращені кольори"</item>
+    <item msgid="8280754435979370728">"Природні кольори"</item>
+    <item msgid="5363960654009010371">"Кольори для цифрового вмісту"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Режим кольору"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Використовувати sRGB"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 3dba40b..850fd46 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"فنگر پرنٹ سیٹ اپ"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"آپ کی اسکرین کو غیر مقفل کرنے یا خریداریوں کی توثیق کرنے کیلئے آپ کے فنگر پرنٹ کا استعمال کرنے کیلئے، ہمیں یہ کرنے کی ضرورت ہوگی:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"بیک اپ اسکرین لاک کے اپنے طریقے کو ترتیب دیں"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ شناخت کرنے یا خریداری کی توثیق کرنے کیلئے اپنا فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"اپنے آلے کو جگانے اور غیر مقفل کرنے کیلئے بس فنگرپرنٹ سنسر کو ٹچ کریں۔"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"جب آپ اس آئیکن کو دیکھیں تو آپ اپنا فنگرپرنٹ استعمال کر سکتے ہیں۔"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"فنگر پرنٹ سیٹ اپ نظر انداز کریں؟"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"آپ نے اپنا فون غیر مقفل کرنے کیلئے ایک طریقہ اپنے فنگرپرنٹ کا استعمال منتخب کیا ہے۔ اگر آپ اب نظر انداز کرتے ہیں تو آپ کو اسے بعد میں سیٹ اپ کرنا ہوگا۔ سیٹ اپ میں کم و بیش ایک منٹ کا وقت لگتا ہے۔"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"اسکرین لاک کو ترتیب دیں"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ہوگیا"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"افوہ، یہ سینسر نہیں ہے"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"اپنے آلہ پر فنگر پرنٹ سینسر کا استعمال کریں"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"اندراج مکمل نہیں ہوا تھا"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"فنگر پرنٹ اندراج کی حدِ وقت پوری ہو گئی۔ دوبارہ کوشش کریں۔"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"فنگر پرنٹ اندراج نہیں ہوا۔ دوبارہ کوشش کریں یا مختلف انگلی استعمال کریں۔"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"کوئی دوسرا شامل کریں"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"آگے جائیں"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"اپنے فون کو غیر مقفل کرنے کے علاوہ، آپ خریداریوں کی توثیق کرنے اور ایپ تک رسائی حاصل کرنے کیلئے اپنے فنگر پرنٹ کا بھی استعمال کر سکتے ہیں۔ "<annotation id="url">"مزید جانیں"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"قانونی معلومات، اسٹیٹس، سافٹ ویئر ورژن دیکھیں"</string>
     <string name="legal_information" msgid="5769301644270604095">"قانونی معلومات"</string>
     <string name="contributors_title" msgid="5917703088825286504">"معاونین"</string>
+    <string name="manual" msgid="3025943393642974445">"مینوئل"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"انضباطی معلومات"</string>
     <string name="copyright_title" msgid="865906688917260647">"کاپی رائٹ"</string>
     <string name="license_title" msgid="1990487604356037871">"لائسنس"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"‏سسٹم WebView کا لائسنس"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"وال پیپرز"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏سیٹلائٹ تصاویر کے فراہم کنندگان:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"مینوئل"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"مینوئل لوڈ کرنے میں ایک مسئلہ ہے۔"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"اوپن سورس لائسنسز"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"لائسنسز لوڈ کرنے میں ایک مسئلہ ہے۔"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"لوڈ ہو رہا ہے…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ایپس کی اجازتوں کی سیکیورٹی"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ڈیفالٹ ایپس"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"نظر انداز کریں بہتریاں ڈوز ایپ اسٹینڈ بائی"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"‏پرجوش rgb srgb رنگ کا قدرتی معیار"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏سلائیڈ پاس ورڈ پیٹرن pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"‏SystemUI ٹیونر دکھائیں"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"اضافی اجازتیں"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> مزید"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"صرف چارجنگ"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"‏فائلز منتقل کریں (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"‏تصاویر منتقل کریں (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"چارجنگ"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"صرف یہ آلہ چارج کریں"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"پاور سپلائی"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"دوسرا منسلک آلہ چارج کریں"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"فائل منتقلیاں"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"‏فائلیں Windows یا Mac (MTP)‎ میں منتقل کریں"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"‏تصویر منتقلی (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏اگر MTP تعاون یافتہ نہیں ہے تو تصاویر اور فائلیں منتقل کریں (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"‏MIDI ان پٹ کے لئے آلہ استعمال کریں"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏اس کیلئے USB استعمال کریں"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"غیر فعال ایپس"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"غیر فعال۔ ٹوگل کرنے کیلئے ٹچ کریں۔"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"یہ اجازت ایپ کو سسٹم ترتیبات میں ترمیم کرنے دیتی ہے۔"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ہاں"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"نہیں"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"کیمرا کیلئے دو بار مروڑیں"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"اپنی کلائی کو دو بار مروڑ کر کیمرا ایپ کھولیں"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"کیمرا کیلئے پاور بٹن دو بار دبائیں"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"اپنی اسکرین غیر مقفل کئے بغیر تیزی سے کیمرا کھولیں"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"پرجوش (ڈیفالٹ)"</item>
+    <item msgid="8446070607501413455">"قدرتی"</item>
+    <item msgid="6553408765810699025">"معیاری"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"بہتر رنگ"</item>
+    <item msgid="8280754435979370728">"آنکھ سے نظر آنے والے قدرتی رنگ"</item>
+    <item msgid="5363960654009010371">"ڈیجیٹیل مواد کیلئے بہترین کردہ رنگ"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"تصویری رنگ موڈ"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏sRGB استعمال کریں"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 7d774a7..bed4e2d 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta barmoq izi qo‘shilgan</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta barmoq izi qo‘shilgan</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Barmoq izini sozlash"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Ekranni qulfdan chiqarish yoki xaridlarni tasdiqlashda barmoq izidan foydalanish uchun:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Ekranni qulflash uchun muqobil usulni sozlang"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ushbu belgi ko‘rinsa, siz identifikatsiya yoki xaridlarnini amalga oshirish uchun barmoq izidan foydalanishingiz mumkin."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Qurilmani uyg‘otish va uni qulfdan chiqarish uchun shunchaki barmoq izi skaneriga tegining."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Agar shu belgi ko‘rinsa, barmoq izidan foydalanish mumkin."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmoq izini sozlash o‘tkazib yuborilsinmi?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Siz telefoningizni qulfdan chiqarishning bir usuli sifatida barmoq izini tanlagansiz. Agar buni hozir o‘tkazib yuborsangiz, uni keyinroq sozlashga to‘g‘ri keladi. Sozlash atigi bir daqiqa atrofida vaqt oladi."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekranni qulfini sozlash"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Tayyor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Obbo, bu sensor emas."</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Qurilmadagi barmoq izi skanerini toping."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Barmoq izini kiritish tugallanmadi"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Barmoq izini kiritish vaqti tugab qoldi. Qayta urinib ko‘ring."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Barmoq izini kiritish amalga oshmadi. Qayta urinib ko‘ring yoki boshqa barmoqdan foydalaning."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Boshqa barmoq izini qo‘shish"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Keyingi"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Shuningdek, telefoningizni qulfdan chiqarish, xaridlarni tasdiqlash va ilovalarga kirish uchun ham barmoq izidan foydalanishingiz mumkin. "<annotation id="url">"Batafsil ma’lumot"</annotation></string>
@@ -595,7 +601,7 @@
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tarmoq haqida bildirishnoma"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Hamma uchun ochiq tarmoqlar haqida xabar qilinsin"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Sifatsiz ulanishdan chetlashish"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Internet aloqasi yomon bo‘lsa, Wi-Fi tarmog‘iga ulanilmasin"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Sifatli Internet ulanishi mavjud bo‘lmaganicha, Wi‑Fi tarmog‘iga ulanmasin."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Faqat kuchli signalga ega tarmoqlardan foydalanilsin"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ochiq Wi-Fi tarmog‘iga avtomatik ulanish"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi yordamchisiga ochiq tarmoqlar ichidan eng kuchlisiga avtomatik ulanishi uchun ruxsat bering"</string>
@@ -813,7 +819,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Qidiruv"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Qidiruv sozlamalari va tarix boshqaruvi"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Ekranni avtomatik burish"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Ekranni avto-burish"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ekran joylashuvini telefon burilganda avtomatik almashtirish"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish"</string>
@@ -943,7 +949,7 @@
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Bo‘lishilgan xotirani uzish"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartani uzish"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ichki USB xotirani uzish"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD kartani xavfsiz chiqarib olish uchun uni avval tizimda uzing"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD kartani uzib, havfsiz chiqarishingiz mumkin"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Ulanadigan USB xotirani joylang"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Ulanadigan SD kartani joylang"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB xotira ulash"</string>
@@ -1076,12 +1082,12 @@
     <string name="apn_protocol" msgid="3272222921649348640">"APN protokoli"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN rouming protokoli"</string>
     <string name="carrier_enabled" msgid="407655861175280806">"APNni yoqish/o‘chirish"</string>
-    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN yoniq"</string>
-    <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN o‘chiq"</string>
+    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN yoqilgan"</string>
+    <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN o‘chirilgan"</string>
     <string name="bearer" msgid="594270280031923558">"Kanal"</string>
     <string name="mvno_type" msgid="2543253857818336421">"MVNO turi"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO qiymati"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"APNni o‘chirish"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"APN’ni o‘chirish"</string>
     <string name="menu_new" msgid="3014205883303921729">"Yangi APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Saqlash"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Bekor qilish"</string>
@@ -1090,7 +1096,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN to‘ldirilishi shart"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 3 ta raqamdan iborat bo‘lishi shart."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 2 yoki 3 ta raqamdan iborat bo‘lishi shart."</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"APN standart sozlamalari tiklanmoqda."</string>
+    <string name="restore_default_apn" msgid="8178010218751639581">"APN standart sozlamalar tiklanmoqda."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Sozlamalarni tiklash"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standart sozlamalar tiklandi."</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Tarmoq sozlamalarini tiklash"</string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Yuridik ma’lumotlar, holat, dasturiy ta’minot versiyasini ko‘rish"</string>
     <string name="legal_information" msgid="5769301644270604095">"Huquqiy ma’lumotlar"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Hissa qo‘shganlar"</string>
+    <string name="manual" msgid="3025943393642974445">"Qo‘llanma"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Normativ ma‘lumot"</string>
     <string name="copyright_title" msgid="865906688917260647">"Mualliflik huquqi"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsenziya"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"WebView tizim litsenziyasi"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Fon rasmlari"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Sun’iy yo‘ldoshdan olingan rasmlar:\n© CNES 2014/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Qo‘llanma"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Qo‘llanmani yuklashda muammo yuz berdi."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ochiq kodli DT litsenziyalari"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Litsenziyalarni yuklashda muammo yuz berdi."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Yuklanmoqda…"</string>
@@ -1508,7 +1517,7 @@
     <string name="development_settings_not_available" msgid="4308569041701535607">"Bu foydalanuvchiga dasturchi imkoniyatlari taqdim etilmagan"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"Ushbu foydalanuvchi uchun VPN sozlamalari mavjud emas"</string>
     <string name="tethering_settings_not_available" msgid="6765770438438291012">"Ushbu foydalanuvchi uchun Modem rejimi sozlamalari mavjud emas"</string>
-    <string name="apn_settings_not_available" msgid="7873729032165324000">"Ushbu foydalanuvchi uchun Internetga kirish nuqtasi (APN) sozlamalari mavjud emas"</string>
+    <string name="apn_settings_not_available" msgid="7873729032165324000">"Ushbu foydalanuvchi uchun Ulanish nuqtasi nomi (APN) sozlamalari mavjud emas"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB orqali nosozliklarni tuzatish"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB orqali kompyuterga ulanganda tuzatish rejimi yoqilsin"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USB orqali nosozliklarni tuzatishni taqiqlash"</string>
@@ -2029,7 +2038,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Ilovalar sinxronlanishi, ma’lumotlarni istalgan paytda jo‘natishi va qabul qilishi mumkin"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Ma’lumotlarni fonda yuklash to‘xtatilsinmi?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Trafikni fonda yuklashni o‘chirib qo‘yish bilan batareya yaroqlilik vaqtini uzaytirib, ma’lumotlardan foydalanishni kamaytirish mumkin. Ba’zi ilovalar baribir trafikni fonda yuklashi mumkin."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Sinxronlash"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Ilova ma‘lumotlarining avto-sinxronlashuvi"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinxronlash yoqilgan"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sinxronlash o‘chiq"</string>
     <string name="sync_error" msgid="5060969083117872149">"Sinx-lashda xatolik"</string>
@@ -2191,10 +2200,10 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Fondagi internetni cheklash"</string>
     <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"Ushbu funksiya faqat mobil tarmoqlar mavjud bo‘lganida orqa fonda internetdan foydalanishga bog‘liq ilovaning ishlashini to‘xtatib qo‘yishi mumkin.\n\nIlovadagi mavjud sozlamalar yordamida internetdan foydalanishni o‘zingizga mos tarzda nazorat qilishingiz mumkin."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="1493134803720421674">"Orqa fonda internetdan foydalanishni cheklashdan oldin mobil internet uchun cheklovni o‘rnatish lozim."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Avto-sinxronizatsiya yoqilsinmi?"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Avto-sinxronlash yoqilsinmi?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Internet orqali hisoblaringizda qilingan har qanday o‘zgarish avtomatik tarzda planshetingizda ham aks etadi.\n\nBa’zi hisoblar planshet orqali qilingan o‘zgarishlarni internetga nusxalash imkoniyati ham mavjud. Google hisobi xuddi shunday ishlaydi."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Internet orqali hisoblaringizda qilingan har qanday o‘zgarish avtomatik tarzda telefoningizda ham aks etadi.\n\nBa’zi hisoblar telefon orqali qilingan o‘zgarishlarni internetga nusxalash imkoniyati ham mavjud. Google hisobi xuddi shunday ishlaydi."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Avto-sinxronizatsiya o‘chirilsinmi?"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Avto-sinxronlash o‘chirilsinmi?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Bu trafik va batareya quvvati sarfini tejaydi. Biroq, yangi ma’lumotlarni olish uchun har bir hisobni qo‘lda sinxronlash lozim. Bunda, yangilanishlar haqida hech qanday bildirishnoma ko‘rsatilmaydi."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Trafik sarfini yangilash sanasi"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Har oylik sana:"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ilovalar ruxsatnomalar xavfsizlik"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ilovalar birlamchi"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"cheklovlarni e’tiborsiz qoldirish kutish rejimi"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"yorqin rgb srgb rang tabiiy standart"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"surish, parol, chizmali parol, PIN-kod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi’ni sozlash u-n NFC yorliq"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yozish"</string>
@@ -2651,7 +2661,7 @@
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tomonidan boshqariladi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tajribaviy)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Qurilma aylanganda"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Tasvir ham burilsin"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Tasvir ham aylansin"</string>
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Tik holatda qolsin"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yotiq holatda qolsin"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Joriy holatda qolsin"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner ko‘rsatilsin"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Qo‘shimcha ruxsatlar"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Yana <xliff:g id="COUNT">%1$d</xliff:g> ta"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Faqat qurilmani quvvatlash"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Fayl o‘tkazish (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Rasm o‘tkazish (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Quvvatlash"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Shunchaki ushbu qurilmani quvvatlash"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Quvvat manbai"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Boshqa ulangan qurilmani quvvatlash"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Fayl o‘tkazish"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Fayllarni Windows yoki Mac kompyuterga o‘tkazish (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Rasm o‘tkazish (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Agar MTP protokoli qo‘llab-quvvatlanmasa, rasm yoki fayllarni o‘tkazish (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Qurilmada MIDI-kirishdan foydalanish"</string>
     <string name="usb_use" msgid="3372728031108932425">"USBdan foydalanish"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Nofaol ilovalar"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Nofaol. O‘zgartirish uchun bu yerga bosing."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu ruxsatnoma ilovaga tizim sozlamalarini o‘zgaritish uchun ruxsat beradi."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ha"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Yo‘q"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera uchun bilakni ikki marta bukish"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera ilovasini ochish uchun bilagingizni ikki marta buking"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Quvvat tugmasini ikki marta bosish bilan kamerani ochish"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Ekran qulfini ochmasdan kamerani tezroq ishga tushirish"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Yorqin (birlamchi)"</item>
+    <item msgid="8446070607501413455">"Tabiiy"</item>
+    <item msgid="6553408765810699025">"Standart"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Ishlov berilgan ranglar"</item>
+    <item msgid="8280754435979370728">"Ko‘zga ko‘rinadigan tabiiy ranglar"</item>
+    <item msgid="5363960654009010371">"Raqamli kontentga moslashtirilgan ranglar"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Rang rejimi"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ranglaridan foydalanish"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 59946a3..2b3de04 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="other">Đã thiết lập <xliff:g id="COUNT_1">%1$d</xliff:g> tệp tham chiếu</item>
       <item quantity="one">Đã thiết lập <xliff:g id="COUNT_0">%1$d</xliff:g> tệp tham chiếu</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Thiết lập vân tay"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Để sử dụng vân tay để mở khóa màn hình của bạn hoặc xác nhận mua hàng, chúng tôi cần phải:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Thiết lập phương pháp khóa màn hình dự phòng của bạn"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bất cứ khi nào nhìn thấy biểu tượng này, bạn có thể sử dụng vân tay của mình để nhận dạng hoặc ủy quyền mua hàng."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Chỉ cần chạm vào cảm biến dấu vân tay để đánh thức và mở khóa thiết bị của bạn."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Khi nhìn thấy biểu tượng này, bạn có thể sử dụng dấu vân tay của mình."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Bỏ qua thiết lập vân tay?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Bạn đã chọn sử dụng vân tay là cách mở khóa điện thoại của mình. Nếu bỏ qua ngay bây giờ, bạn sẽ cần thiết lập cài đặt này sau. Thiết lập sẽ chỉ mất ít phút."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Thiết lập khóa màn hình"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Xong"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Rất tiếc, đó không phải là cảm biến"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Sử dụng cảm biến vân tay trên thiết bị của bạn."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Đăng ký chưa hoàn tất"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Đã đến giới hạn thời gian đăng ký dấu vân tay. Hãy thử lại."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Đăng ký dấu vân tay không hoạt động. Hãy thử lại hoặc sử dụng ngón tay khác."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Thêm khác"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tiếp theo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ngoài việc mở khóa điện thoại, bạn còn có thể sử dụng vân tay của mình để ủy quyền mua và truy cập ứng dụng. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Xem thông tin pháp lý, trạng thái, phiên bản phần mềm"</string>
     <string name="legal_information" msgid="5769301644270604095">"Thông tin pháp lý"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Người đóng góp"</string>
+    <string name="manual" msgid="3025943393642974445">"Hướng dẫn sử dụng"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Thông tin về quy định"</string>
     <string name="copyright_title" msgid="865906688917260647">"Bản quyền"</string>
     <string name="license_title" msgid="1990487604356037871">"Giấy phép"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Giấy phép WebView hệ thống"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Hình nền"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Nhà cung cấp ảnh vệ tinh:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Hướng dẫn sử dụng"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Đã xảy ra sự cố khi tải hướng dẫn sử dụng."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Giấy phép nguồn mở"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Đã xảy ra sự cố khi tải giấy phép."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Đang tải…"</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"bảo mật giấy phép ứng dụng"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"ứng dụng mặc định"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"bỏ qua tối ưu hóa ngủ gật ứng dụng chế độ chờ"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"sống động rgb srgb màu tự nhiên tiêu chuẩn"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"trượt mật khẩu hình mẫu mã pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Hiện Bộ điều chỉnh SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Quyền khác"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> khác"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Chỉ sạc"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Truyền tệp (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Truyền ảnh (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Đang sạc"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Chỉ sạc thiết bị này"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Cấp nguồn"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Sạc thiết bị được kết nối khác"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Chuyển tệp"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Chuyển tệp tới Windows hoặc Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Chuyển ảnh (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Chuyển ảnh hoặc tệp nếu MTP không được hỗ trợ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Sử dụng thiết bị cho đầu vào MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Sử dụng USB cho"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Ứng dụng không hoạt động"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Không hoạt động. Chạm để chuyển đổi."</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Quyền này cho phép ứng dụng sửa đổi cài đặt hệ thống."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Có"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Không"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Xoắn đúp cho camera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Mở ứng dụng camera bằng cách vặn cổ tay hai lần"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Nhấn nút nguồn hai lần để mở máy ảnh"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Mở nhanh máy ảnh mà không cần mở khóa màn hình của bạn"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Sống động (mặc định)"</item>
+    <item msgid="8446070607501413455">"Tự nhiên"</item>
+    <item msgid="6553408765810699025">"Tiêu chuẩn"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Màu tăng cường"</item>
+    <item msgid="8280754435979370728">"Màu tự nhiên giống như nhìn bằng mắt"</item>
+    <item msgid="5363960654009010371">"Màu được tối ưu hóa cho nội dung kỹ thuật số"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Chế độ màu của ảnh"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Sử dụng sRGB"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2c15953..58723dc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"指纹设置"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"要使用您的指纹解锁屏幕或确认购买交易，您需要："</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"设置备用屏幕锁定方式"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要您看见此图标，就可以使用指纹进行身份验证或对购买交易进行授权。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需触摸指纹传感器即可唤醒并解锁设备。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"当您看到此图标时，就可以使用指纹。"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要跳过指纹设置？"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已选择使用指纹作为解锁手机的方式之一。如果您现在跳过这项设置，则以后还需要再进行设置。设置过程只需大约一分钟的时间。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"设置屏幕锁定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，这不是传感器"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用您设备上的指纹传感器。"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"未完成注册"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"指纹注册操作超时，请重试。"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"无法注册指纹。请重试或使用其他手指。"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"再添加一个"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了将手机解锁，您还可以在购买物品时和登录应用时使用自己的指纹来验证身份。"<annotation id="url">"了解详情"</annotation></string>
@@ -888,7 +894,7 @@
     <string name="device_info_settings" product="default" msgid="475872867864762157">"手机状态"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"系统更新"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android版本"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android 安全补丁程序级别"</string>
     <string name="model_number" msgid="3765737700545384794">"型号"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"设备 ID"</string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"查看法律信息、状态和软件版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律信息"</string>
     <string name="contributors_title" msgid="5917703088825286504">"活动提供商"</string>
+    <string name="manual" msgid="3025943393642974445">"手册"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"监管信息"</string>
     <string name="copyright_title" msgid="865906688917260647">"版权"</string>
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"系统 WebView 许可"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"壁纸"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"卫星图像提供商：\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"手册"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"加载手册时出现问题。"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"开放源代码许可"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"加载许可时出现问题。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在加载..."</string>
@@ -2502,6 +2511,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"应用 权限 安全"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"应用 默认"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"忽略对低电耗模式应用的待机优化"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"鲜亮 RGB SRGB 颜色 自然 标准"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑动 密码 图案 PIN码"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
@@ -2734,7 +2744,7 @@
     <string name="configure_apps" msgid="6685680790825882528">"配置应用"</string>
     <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
     <string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"应用访问授权"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"应用所需权限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"已授予 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）其他权限"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"已授权 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"点按唤醒"</string>
@@ -2799,10 +2809,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"显示 SystemUI 调整程序"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他权限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"另外 <xliff:g id="COUNT">%1$d</xliff:g> 项"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"仅限充电"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"传输文件 (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"传输照片 (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充电"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"仅为此设备充电"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"电源供给"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"为其他已连接的设备充电"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"文件传输"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"将文件传输到 Windows 或 Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"照片传输 (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"如果 MTP 不受支持，则传输照片或文件 (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"将设备用作 MIDI 输入设备"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 的用途"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"未启用的应用"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"未启用。触摸即可切换。"</string>
@@ -2868,4 +2884,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"此权限允许应用修改系统设置。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"允许"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不允许"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"扭转两次即可打开相机"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"扭转手腕两次即可打开相机应用"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"按电源按钮两次即可打开相机"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"在不解锁屏幕的情况下快速打开相机"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"鲜亮（默认）"</item>
+    <item msgid="8446070607501413455">"自然"</item>
+    <item msgid="6553408765810699025">"标准"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"增强的颜色"</item>
+    <item msgid="8280754435979370728">"肉眼所看到的自然颜色"</item>
+    <item msgid="5363960654009010371">"针对数字内容优化的颜色"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"图片颜色模式"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c48d927..8965a6a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"已設定指紋"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"要使用您的指紋解鎖屏幕或確認購買，我們需要："</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"設定後備螢幕鎖定的方法"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"如果看到這個圖示，您可以使用您的指紋加以識別或授權購買。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需輕觸指紋感應器即可喚醒裝置或為裝置解鎖。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"只要看到這個圖示，即可使用指紋。"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"略過指紋設定？"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋作為唯一的手機解鎖方式。如果您現在略過，將需要稍後設定。設定過程只需約一分鐘。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，這不是感應器"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用您裝置上的指紋感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"尚未完成註冊"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"已達到指紋註冊次數上限，請重試。"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"無法註冊指紋，請重試或使用另一隻手指。"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"新增其他"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了解鎖您的手機，您也可以使用您的指紋授權購買和存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
@@ -1209,6 +1215,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"查看法律資訊、狀態、軟件版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
     <string name="contributors_title" msgid="5917703088825286504">"作者"</string>
+    <string name="manual" msgid="3025943393642974445">"手動"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"監管資訊"</string>
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
@@ -1216,6 +1223,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"System WebView License"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"桌布"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"衛星影像供應商：\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"手動"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"載入指南時發生問題。"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開放原始碼授權"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"載入授權時發生問題。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在載入..."</string>
@@ -2507,6 +2516,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"應用程式權限安全性"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"應用程式預設"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"略過 優化 非使用中 應用程式 待機"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"生動 RGB SRGB 顏色 自然 標準"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖案 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標籤"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2804,10 +2814,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"顯示系統使用者介面調諧器"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 個"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"只供充電"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"傳送檔案 (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"傳送相片 (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"只為此裝置充電"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"為其他已連接的裝置充電"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"檔案傳輸"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"透過媒體傳輸協定傳送檔案至 Windows 或 Mac"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"相片傳輸 (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"如不支援媒體傳輸協定，則使用相片傳輸協定傳送相片或檔案"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"使用裝置作為 MIDI 輸入"</string>
     <string name="usb_use" msgid="3372728031108932425">"使用 USB 於"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"已暫停的應用程式"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"已暫停。輕觸即可切換。"</string>
@@ -2873,4 +2889,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"此權限允許應用程式修改系統設定。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"允許"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"不允許"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"轉動兩下即可使用相機功能"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"轉動手腕兩下即可開啟相機應用程式"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"按開關按鈕兩次即可開啟相機"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"快速開啟相機，無需解鎖螢幕"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"生動 (預設)"</item>
+    <item msgid="8446070607501413455">"自然"</item>
+    <item msgid="6553408765810699025">"標準"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"顏色已強化"</item>
+    <item msgid="8280754435979370728">"如眼前所見的自然顏色"</item>
+    <item msgid="5363960654009010371">"優化作數碼內容使用的顏色"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"相片顏色模式"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9a75ea6..9253055 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -322,6 +322,7 @@
       <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_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"指紋設定"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"如要使用您的指紋解鎖螢幕或確認購物交易，必須先完成以下工作："</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"設定備用螢幕鎖定方法"</string>
@@ -346,10 +347,15 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示您可以使用指紋來驗證身分或授權進行購物交易。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"輕觸指紋感應器即可將裝置喚醒及解鎖。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"只要看到這個圖示，就表示您可以使用指紋。"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要略過指紋設定程序嗎？"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋做為其中一種手機解鎖方式。如果現在略過這項程序，您必須在稍後完成設定。設定程序只需要一分鐘左右。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，這不是感應器"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用裝置上的指紋感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"未完成註冊"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"已達指紋註冊時間上限，請再試一次。"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"無法註冊指紋。請再試一次或使用不同的手指。"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"新增另一個"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了將手機解鎖，您也可以使用指紋授權購物交易及存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
@@ -1208,6 +1214,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"查看法律資訊、狀態、軟體版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
     <string name="contributors_title" msgid="5917703088825286504">"貢獻者"</string>
+    <string name="manual" msgid="3025943393642974445">"說明書"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"法規資訊"</string>
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
@@ -1215,6 +1222,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"系統 WebView 授權"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"桌布"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"衛星影像提供者：\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"說明書"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"載入說明書時發生問題。"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開放原始碼授權"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"載入授權時發生問題"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"載入中…"</string>
@@ -1793,7 +1802,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式最佳化"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"省電模式"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"節約耗電量"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"永遠不要"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"電量為 %1$s 時"</string>
@@ -2506,6 +2515,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"應用程式權限安全性"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"應用程式 預設"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"忽略 最佳化設定 休眠 應用程式待命"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"鮮活 rgb srgb 色彩 自然 標準"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖形 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2543,10 +2553,10 @@
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號鍵盤音效"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"螢幕鎖定音效"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"充電音效"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"座架插入音效"</string>
+    <string name="docking_sounds_title" msgid="155236288949940607">"固定音效"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"觸控音效"</string>
     <string name="vibrate_on_touch_title" msgid="674710566941697253">"觸控時震動"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"座架喇叭播放音效"</string>
+    <string name="dock_audio_media_title" msgid="1346838179626123900">"固定喇叭播放音效"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"所有音訊"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"僅限媒體音訊"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
@@ -2803,10 +2813,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"顯示 SystemUI 調整精靈"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 項"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"僅限充電"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"傳輸檔案 (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"傳輸相片 (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"僅為這個裝置充電"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"為其他連接的裝置充電"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"檔案轉移"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"將檔案轉移到 Windows 或 Mac (MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"相片轉移 (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"如果 MTP 不受支援，則轉移相片或檔案 (PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"使用裝置做為 MIDI 輸入端"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 用途"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"未啟用的應用程式"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"未啟用。輕觸即可切換。"</string>
@@ -2872,4 +2888,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"這項權限允許應用程式修改系統設定。"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"可"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"否"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"扭兩下即可開啟相機"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"扭動手腕兩次即可開啟「相機」應用程式"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"按兩下電源按鈕即可開啟相機"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"不必將螢幕解鎖就能快速開啟相機"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"鮮活 (預設)"</item>
+    <item msgid="8446070607501413455">"自然"</item>
+    <item msgid="6553408765810699025">"標準"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"增強的色彩"</item>
+    <item msgid="8280754435979370728">"眼睛所見的自然色彩"</item>
+    <item msgid="5363960654009010371">"針對數位內容最佳化的色彩"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"螢幕色彩模式"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9b71c44..0ffa168 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -322,6 +322,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ukusethwa kwezigxivizo zeminwe</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ukusethwa kwezigxivizo zeminwe</item>
     </plurals>
+    <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Ukusetha kwezigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="2655449737443418341">"Ukuze usebenzise izigxivizo zakho zeminwe ukuze uvule isikrini sakho noma uqinisekise ukuthengwa, sizodinga:"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Setha indlela yakho yokwenza isipele ukukhiya isikrini"</string>
@@ -346,10 +347,15 @@
     <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="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Vele uthinte inzwa yezigxivizo zeminwe uphinde uvule idivayisi yakho."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Uma ubona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Yeqa ukusethwa kwezigxivizo zeminwe?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ukhethe ukusebenzisa izigxivizo zakho zeminwe njengendlela eyodwa yokuvula ifoni yakho. Uma weqa manje, kuzomele usethe lokhu ngemuva kwesikhathi. Ukusetha kuthatha iminithi noma isikhathi esingalapho."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Hlela ukuvala isikrini"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Kwenziwe"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hhayi bo, akuyona inzwa leyo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Sebenzisa inzwa yezigxivizo zeminwe kudivayisi yakho."</string>
+    <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Ukubhaliswa akuzange kuqedwe"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Isikhathi sokubhaliswa kwezigxivizo zeminwe sifinyelelwe. Zama futhi."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Ukubhaliswa kwezigxivizo zeminwe akuzange kusebenze. Zama futhi noma sebenzisa umunwe ohlukile."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Engeza enye"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Okulandelayo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ngokungeziwe ekuvuleni ifoni yakho, ungaphinda usebenzise izigxivizo zeminwe zakho ukuze ugunyaze ukuthenga kanye nokufinyelela kokuhlelo lokusebenza. "<annotation id="url">"Funda kabanzi"</annotation></string>
@@ -1209,6 +1215,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Buka ulwazi lomthetho, umumo wefoni, inguqulo yesofthiwe"</string>
     <string name="legal_information" msgid="5769301644270604095">"Uwazi olusemthethweni"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Abanikeli"</string>
+    <string name="manual" msgid="3025943393642974445">"Ngokulawulwa"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"Ulwazi lokuhlola"</string>
     <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Ilayisensi"</string>
@@ -1216,6 +1223,8 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Ilayisense yesistimu ye-WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Izithombe zangemuva"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Abanikezeli bezithombe zesathelayithi:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="settings_manual_activity_title" msgid="8133150693616006051">"Ngokulawulwa"</string>
+    <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Kunenkinga yokulayisha imanuwali."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Vula amalayisensi omthombo"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kunenkinga yokulayisha amalayisensi."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Iyalayisha..."</string>
@@ -2509,6 +2518,7 @@
     <string name="keywords_app_permissions" msgid="8677901415217188314">"ukuvikeleka kwezimvume zezinhlelo zokusebenza"</string>
     <string name="keywords_default_apps" msgid="3581727483175522599">"okuzenzakalelayo kwezinhlelo zokusebenza"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"ziba ukulinda kwebanga lokulungiselelwa kohlelo lokusebenza"</string>
+    <string name="keywords_color_mode" msgid="4670570451841540200">"izinga lombala wemvelo elidlidlizelayo le-rgb srgb"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slayida iphini yephethini yephasiwedi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
@@ -2806,10 +2816,16 @@
     <string name="system_ui_settings" msgid="579824306467081123">"Bonisa ishuna ye-SystemUI"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Izimvume ezingeziwe"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> okuningi"</string>
-    <string name="usb_use_charging_only" msgid="2625934955897625321">"Ukushaja kuphela"</string>
-    <string name="usb_use_file_transfers" msgid="479119385461326763">"Dlulisa amafayela (MTP)"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Dlulisa izithombe (PTP)"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"Iyashaja"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Vele ushaje le divayisi"</string>
+    <string name="usb_use_power_only" msgid="6304554004177083963">"Ukunikezwa kwamandla"</string>
+    <string name="usb_use_power_only_desc" msgid="708134382305728112">"Shaja enye idivayisi exhunyiwe"</string>
+    <string name="usb_use_file_transfers" msgid="6978904665877785548">"Ukudluliselwa kwefayela"</string>
+    <string name="usb_use_file_transfers_desc" msgid="1663579896876922124">"Dlulisela amafayela ku-Windows noma i-Mac (i-MTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="8276445551694259039">"Ukudluliswa kwesithombe (i-PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Dlulisela izithombe noma amafayela uma i-MTP ingasekelwe (i-PTP)"</string>
     <string name="usb_use_MIDI" msgid="5116404702692483166">"I-MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="6895383550910152384">"Sebenzisela idivayisi ukufakwa kwe-MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Sebenzisela i-USB i-"</string>
     <string name="inactive_apps_title" msgid="1317817863508274533">"Izinhlelo zokusebenza ezingasebenzi"</string>
     <string name="inactive_app_inactive_summary" msgid="6768756967594202411">"Akusebenzi. Shintsha ukuze ushintshe."</string>
@@ -2875,4 +2891,20 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Le mvume ivumela uhlelo lokusebenza ukushintsha izilungiselelo zesistimu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yebo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Cha"</string>
+    <string name="camera_gesture_title" msgid="1075838577642393011">"Shinthsa kabili ingalo ukuze uthole ikhamera"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Vula uhlelo lokusebenza lekhamera ngokushintsha ingalo yakho kabili"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Cindezela inkinobho yamandla kabili ukuthola ikhamera"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Vula ngokushesha ikhamera ngaphandle kokuvula isikrini sakho"</string>
+  <string-array name="color_mode_names">
+    <item msgid="2425514299220523812">"Dlidlizela (okuzenzakalelayo)"</item>
+    <item msgid="8446070607501413455">"Kwemvelo"</item>
+    <item msgid="6553408765810699025">"Okujwayelekile"</item>
+  </string-array>
+  <string-array name="color_mode_descriptions">
+    <item msgid="4979629397075120893">"Imibala ethuthukisiwe"</item>
+    <item msgid="8280754435979370728">"Imibala yemvelo njengoba ibonwa yilihlo"</item>
+    <item msgid="5363960654009010371">"Imibala elungiselelwe yokuqukethwe kwedijithali"</item>
+  </string-array>
+    <string name="picture_color_mode" msgid="4560755008730283695">"Imodi yombala wesithombe"</string>
+    <string name="picture_color_mode_desc" msgid="1141891467675548590">"Sebenzisa i-sRGB"</string>
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 0fdc396..5ee0f7c 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -30,9 +30,14 @@
          Can be overridden for specific product builds. -->
     <bool name="auto_confirm_bluetooth_activation_dialog">false</bool>
 
+    <!-- Whether to show a preference item for the manual in About phone -->
+    <bool name="config_show_manual">false</bool>
     <!-- Whether to show a preference item for regulatory information in About phone -->
     <bool name="config_show_regulatory_info">false</bool>
 
     <!-- Whether to show a preference item for mobile plan -->
     <bool name="config_show_mobile_plan">true</bool>
+
+    <!-- Whether none security option is hide or not  (country specific). -->
+    <bool name="config_hide_none_security_option">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d5b04c7..8cef6b4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -707,6 +707,8 @@
         <item quantity="one"><xliff:g id="count">%1$d</xliff:g> fingerprint set up</item>
         <item quantity="other"><xliff:g id="count">%1$d</xliff:g> fingerprints set up</item>
     </plurals>
+    <!-- message shown in summary field when no fingerprints are registered -->
+    <string name="security_settings_fingerprint_preference_summary_none"></string>
     <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
     <string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
     <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
@@ -759,6 +761,11 @@
     <string name="setup_fingerprint_enroll_finish_message">Just touch the fingerprint sensor to wake and unlock your device.</string>
     <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
     <string name="setup_fingerprint_enroll_finish_message_secondary">When you see this icon, you can use your fingerprint.</string>
+    <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+    <string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string>
+    <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+    <string name="setup_fingerprint_enroll_enrolling_skip_message">You\u2019ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you\u2019ll need to set this up later. Setup takes only a minute or so.</string>
+
     <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
     <string name="security_settings_fingerprint_enroll_setup_screen_lock">Set up screen lock</string>
     <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
@@ -767,6 +774,12 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_title">Whoops, that\u2019s not the sensor</string>
     <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
     <string name="security_settings_fingerprint_enroll_touch_dialog_message">Use the fingerprint sensor on your device.</string>
+    <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+    <string name="security_settings_fingerprint_enroll_error_dialog_title">Enrollment was not completed</string>
+    <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message">Fingerprint enrollment time limit reached. Try again.</string>
+    <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message">Fingerprint enrollment didn\'t work. Try again or use a different finger.</string>
     <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
     <string name="fingerprint_enroll_button_add">Add another</string>
     <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
@@ -2867,6 +2880,8 @@
     <string name="legal_information">Legal information</string>
     <!-- About phone settings screen, setting option name to see a list of contributors -->
     <string name="contributors_title">Contributors</string>
+    <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+    <string name="manual">Manual</string>
     <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
     <string name="regulatory_information">Regulatory information</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
@@ -2886,6 +2901,11 @@
     <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
     <string name="wallpaper_attributions_values">Satellite imagery providers:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
 
+    <!-- Phone Manual -->
+    <string name="settings_manual_activity_title">Manual</string>
+    <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+    <string name="settings_manual_activity_unavailable">There is a problem loading the manual.</string>
+
     <!-- Title for actual Settings license activity. --> <skip />
     <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
     <string name="settings_license_activity_title">Open source licenses</string>
@@ -5942,6 +5962,7 @@
     <string name="keywords_app_permissions">apps permissions security</string>
     <string name="keywords_default_apps">apps default</string>
     <string name="keywords_ignore_optimizations">ignore optimizations doze app standby</string>
+    <string name="keywords_color_mode">vibrant rgb srgb color natural standard</string>
     <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
     <string name="keywords_lockscreen">slide password pattern pin</string>
 
@@ -6770,22 +6791,46 @@
     <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
     <string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> more</string>
 
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for charging only. -->
-    <string name="usb_use_charging_only">Charging only</string>
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <string name="usb_use_charging_only">Charging</string>
+    <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+    <string name="usb_use_charging_only_desc">Just charge this device</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+    <string name="usb_use_power_only">Power supply</string>
+    <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+    <string name="usb_use_power_only_desc">Charge the other connected device</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring files via MTP. -->
-    <string name="usb_use_file_transfers">Transfer files (MTP)</string>
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <string name="usb_use_file_transfers">File transfers</string>
+    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+    <string name="usb_use_file_transfers_desc">Transfer files to Windows or Mac (MTP)</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring photos via PTP. -->
-    <string name="usb_use_photo_transfers">Transfer photos (PTP)</string>
-    <!-- One of the choices in a dialog (with title defined in usb_use) that lets the user
+    <string name="usb_use_photo_transfers">Photo transfer (PTP)</string>
+    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+    <string name="usb_use_photo_transfers_desc">Transfer photos or files if MTP is not supported (PTP)</string>
+    <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for entering MIDI mode. -->
     <string name="usb_use_MIDI">MIDI</string>
+    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+    <string name="usb_use_MIDI_desc">Use device for MIDI input</string>
     <!-- The title used in a dialog which lets the user select what the USB connection
          for this device should be used for. Choices are usb_use_charging_only,
          usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
@@ -6959,4 +7004,36 @@
     <string name="write_settings_on">Yes</string>
     <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
     <string name="write_settings_off">No</string>
+
+    <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+    <string name="camera_gesture_title">Double twist for camera</string>
+
+    <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+    <string name="camera_gesture_desc">Open the camera app by twisting your wrist twice</string>
+
+    <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+    <string name="camera_double_tap_power_gesture_title">Press power button twice for camera</string>
+
+    <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+    <string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
+
+    <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+    <string-array name="color_mode_names">
+        <item>Vibrant (default)</item>
+        <item>Natural</item>
+        <item>Standard</item>
+    </string-array>
+
+    <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+    <string-array name="color_mode_descriptions">
+        <item>Enhanced colors</item>
+        <item>Natural colors as seen by the eye</item>
+        <item>Colors optimized for digital content</item>
+    </string-array>
+
+    <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+    <string name="picture_color_mode">Picture color mode</string>
+
+    <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+    <string name="picture_color_mode_desc">Use sRGB</string>
 </resources>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 01f3ba5..c74d335 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -60,6 +60,12 @@
         android:summary="@string/runningservices_settings_summary"
         android:fragment="com.android.settings.applications.RunningServices" />
 
+    <com.android.settings.ColorModePreference
+        android:key="color_mode"
+        android:title="@string/picture_color_mode"
+        android:summary="@string/picture_color_mode_desc"
+        android:persistent="false" />
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 358f3e1..1372ce7 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -41,6 +41,13 @@
                     android:targetClass="com.android.settings.deviceinfo.Status" />
         </PreferenceScreen>
 
+        <!-- Manual -->
+        <PreferenceScreen
+                android:key="manual"
+                android:title="@string/manual">
+            <intent android:action="android.settings.SHOW_MANUAL" />
+        </PreferenceScreen>
+
         <!-- Legal Information -->
         <PreferenceScreen
                 android:key="container"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index e04d818..7150150 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -57,6 +57,18 @@
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
 
+        <SwitchPreference
+                android:key="camera_gesture"
+                android:title="@string/camera_gesture_title"
+                android:summary="@string/camera_gesture_desc"
+                android:persistent="false" />
+
+        <SwitchPreference
+                android:key="camera_double_tap_power_gesture"
+                android:title="@string/camera_double_tap_power_gesture_title"
+                android:summary="@string/camera_double_tap_power_gesture_desc"
+                android:persistent="false" />
+
         <PreferenceScreen
                 android:key="screensaver"
                 android:title="@string/screensaver_settings_title"
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 226f8ab..fdc0914 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -33,12 +33,14 @@
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
+import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
+import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
@@ -111,6 +113,9 @@
 
     private boolean mUnavailable;
 
+    private boolean mHideImsApn;
+    private boolean mAllowAddingApns;
+
     private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -162,6 +167,12 @@
 
         mSubscriptionInfo = SubscriptionManager.from(activity).getActiveSubscriptionInfo(subId);
         mUiccController = UiccController.getInstance();
+
+        CarrierConfigManager configManager = (CarrierConfigManager)
+                getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        PersistableBundle b = configManager.getConfig();
+        mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
+        mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
     }
 
     @Override
@@ -226,13 +237,16 @@
         final String mccmnc = mSubscriptionInfo == null ? ""
             : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId());
         Log.d(TAG, "mccmnc = " + mccmnc);
-        final String where = "numeric=\""
-            + mccmnc
-            + "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL))";
+        StringBuilder where = new StringBuilder("numeric=\"" + mccmnc +
+                "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND user_visible!=0");
+
+        if (mHideImsApn) {
+            where.append(" AND NOT (type='ims')");
+        }
 
         Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
-                "_id", "name", "apn", "type", "mvno_type", "mvno_match_data"}, where, null,
-                Telephony.Carriers.DEFAULT_SORT_ORDER);
+                "_id", "name", "apn", "type", "mvno_type", "mvno_match_data"}, where.toString(),
+                null, Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         if (cursor != null) {
             IccRecords r = null;
@@ -314,10 +328,12 @@
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (!mUnavailable) {
-            menu.add(0, MENU_NEW, 0,
-                    getResources().getString(R.string.menu_new))
-                    .setIcon(android.R.drawable.ic_menu_add)
-                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            if (mAllowAddingApns) {
+                menu.add(0, MENU_NEW, 0,
+                        getResources().getString(R.string.menu_new))
+                        .setIcon(android.R.drawable.ic_menu_add)
+                        .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            }
             menu.add(0, MENU_RESTORE, 0,
                     getResources().getString(R.string.menu_restore))
                     .setIcon(android.R.drawable.ic_menu_upload);
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 1015a45..8c0b0b6 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -109,11 +109,18 @@
             @Override
             public void onRemovalSucceeded(Fingerprint fingerprint) {
                 Log.v(TAG, "Fingerprint removed: " + fingerprint.getFingerId());
+                if (mFingerprintManager.getEnrolledFingerprints().size() == 0) {
+                    finish();
+                }
             }
 
             @Override
             public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
-                Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+                Activity activity = getActivity();
+                if (activity != null) {
+                    Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+                }
+                finish();
             }
         };
 
@@ -354,6 +361,10 @@
                     boolean visible = true;
                     if (KEY_UNLOCK_SET_OFF.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+                        if (getResources().getBoolean(R.bool.config_hide_none_security_option)) {
+                            enabled = false;
+                            visible = false;
+                        }
                     } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
                     } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
@@ -490,18 +501,19 @@
                 mChooseLockSettingsHelper.utils().clearLock(UserHandle.myUserId());
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled,
                         UserHandle.myUserId());
-                removeAllFingerprintTemplates();
+                removeAllFingerprintTemplatesAndFinish();
                 getActivity().setResult(Activity.RESULT_OK);
-                finish();
             } else {
-                removeAllFingerprintTemplates();
-                finish();
+                removeAllFingerprintTemplatesAndFinish();
             }
         }
 
-        private void removeAllFingerprintTemplates() {
-            if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
+        private void removeAllFingerprintTemplatesAndFinish() {
+            if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
+                    && mFingerprintManager.getEnrolledFingerprints().size() > 0) {
                 mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
+            } else {
+                finish();
             }
         }
 
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 64aaaca..54c3620 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -17,11 +17,11 @@
 package com.android.settings;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
 import com.android.internal.widget.TextViewInputDisabler;
+import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.settings.notification.RedactionInterstitial;
 
 import android.app.Activity;
@@ -30,7 +30,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.inputmethodservice.KeyboardView;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -122,12 +121,15 @@
     }
 
     public static class ChooseLockPasswordFragment extends InstrumentedFragment
-            implements OnClickListener, OnEditorActionListener,  TextWatcher {
+            implements OnClickListener, OnEditorActionListener,  TextWatcher,
+            SaveAndFinishWorker.Listener {
         private static final String KEY_FIRST_PIN = "first_pin";
         private static final String KEY_UI_STAGE = "ui_stage";
         private static final String KEY_CURRENT_PASSWORD = "current_password";
+        private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";
 
         private String mCurrentPassword;
+        private String mChosenPassword;
         private boolean mHasChallenge;
         private long mChallenge;
         private TextView mPasswordEntry;
@@ -141,11 +143,11 @@
         private int mPasswordMinNumeric = 0;
         private int mPasswordMinNonLetter = 0;
         private LockPatternUtils mLockPatternUtils;
-        private AsyncTask<?, ?, ?> mPendingLockCheck;
+        private SaveAndFinishWorker mSaveAndFinishWorker;
         private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private Stage mUiStage = Stage.Introduction;
-        private boolean mDone = false;
+
         private TextView mHeaderText;
         private String mFirstPin;
         private KeyboardView mKeyboardView;
@@ -301,8 +303,11 @@
                 if (mCurrentPassword == null) {
                     mCurrentPassword = savedInstanceState.getString(KEY_CURRENT_PASSWORD);
                 }
+
+                // Re-attach to the exiting worker if there is one.
+                mSaveAndFinishWorker = (SaveAndFinishWorker) getFragmentManager().findFragmentByTag(
+                        FRAGMENT_TAG_SAVE_AND_FINISH);
             }
-            mDone = false;
             if (activity instanceof SettingsActivity) {
                 final SettingsActivity sa = (SettingsActivity) activity;
                 int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header
@@ -321,16 +326,18 @@
         public void onResume() {
             super.onResume();
             updateStage(mUiStage);
-            mPasswordEntryInputDisabler.setInputEnabled(true);
-            mKeyboardView.requestFocus();
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(this);
+            } else {
+                mKeyboardView.requestFocus();
+            }
         }
 
         @Override
         public void onPause() {
             mHandler.removeMessages(MSG_SHOW_ERROR);
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(null);
             }
 
             super.onPause();
@@ -479,36 +486,22 @@
         }
 
         public void handleNext() {
-            if (mDone) return;
-
-            final String pin = mPasswordEntry.getText().toString();
-            if (TextUtils.isEmpty(pin)) {
+            if (mSaveAndFinishWorker != null) return;
+            mChosenPassword = mPasswordEntry.getText().toString();
+            if (TextUtils.isEmpty(mChosenPassword)) {
                 return;
             }
             String errorMsg = null;
             if (mUiStage == Stage.Introduction) {
-                errorMsg = validatePassword(pin);
+                errorMsg = validatePassword(mChosenPassword);
                 if (errorMsg == null) {
-                    mFirstPin = pin;
+                    mFirstPin = mChosenPassword;
                     mPasswordEntry.setText("");
                     updateStage(Stage.NeedToConfirm);
                 }
             } else if (mUiStage == Stage.NeedToConfirm) {
-                if (mFirstPin.equals(pin)) {
-                    boolean wasSecureBefore = mLockPatternUtils.isSecure(UserHandle.myUserId());
-                    final boolean required = getActivity().getIntent().getBooleanExtra(
-                            EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
-                    mLockPatternUtils.setCredentialRequiredToDecrypt(required);
-                    mLockPatternUtils.saveLockPassword(pin, mCurrentPassword, mRequestedQuality,
-                            UserHandle.myUserId());
-
-                    if (mHasChallenge) {
-                        startVerifyPassword(pin, wasSecureBefore);
-                        return;
-                    } else {
-                        getActivity().setResult(RESULT_FINISHED);
-                    }
-                    finishConfirmStage(wasSecureBefore);
+                if (mFirstPin.equals(mChosenPassword)) {
+                    startSaveAndFinish();
                 } else {
                     CharSequence tmp = mPasswordEntry.getText();
                     if (tmp != null) {
@@ -522,50 +515,6 @@
             }
         }
 
-        private void startVerifyPassword(final String pin, final boolean wasSecureBefore) {
-            mPasswordEntryInputDisabler.setInputEnabled(false);
-            setNextEnabled(false);
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-            }
-
-            mPendingLockCheck = LockPatternChecker.verifyPassword(
-                    mLockPatternUtils,
-                    pin,
-                    mChallenge,
-                    UserHandle.myUserId(),
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            if (token == null) {
-                                Log.e(TAG, "critical: no token returned from known good password");
-                            }
-
-                            mPasswordEntryInputDisabler.setInputEnabled(true);
-                            setNextEnabled(true);
-                            mPendingLockCheck = null;
-
-                            Intent intent = new Intent();
-                            intent.putExtra(
-                                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
-                                    token);
-                            getActivity().setResult(RESULT_FINISHED, intent);
-                            finishConfirmStage(wasSecureBefore);
-                        }
-                    });
-        }
-
-        private void finishConfirmStage(boolean wasSecureBefore) {
-            getActivity().finish();
-            mDone = true;
-            if (!wasSecureBefore) {
-                Intent intent = getRedactionInterstitialIntent(getActivity());
-                if (intent != null) {
-                    startActivity(intent);
-                }
-            }
-        }
-
         protected void setNextEnabled(boolean enabled) {
             mNextButton.setEnabled(enabled);
         }
@@ -609,6 +558,7 @@
          * Update the hint based on current Stage and length of password entry
          */
         private void updateUi() {
+            final boolean canInput = mSaveAndFinishWorker == null;
             String password = mPasswordEntry.getText().toString();
             final int length = password.length();
             if (mUiStage == Stage.Introduction) {
@@ -629,9 +579,10 @@
                 }
             } else {
                 mHeaderText.setText(mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint);
-                setNextEnabled(length > 0);
+                setNextEnabled(canInput && length > 0);
             }
             setNextText(mUiStage.buttonText);
+            mPasswordEntryInputDisabler.setInputEnabled(canInput);
         }
 
         public void afterTextChanged(Editable s) {
@@ -649,5 +600,83 @@
         public void onTextChanged(CharSequence s, int start, int before, int count) {
 
         }
+
+        private void startSaveAndFinish() {
+            if (mSaveAndFinishWorker != null) {
+                Log.w(TAG, "startSaveAndFinish with an existing SaveAndFinishWorker.");
+                return;
+            }
+
+            mPasswordEntryInputDisabler.setInputEnabled(false);
+            setNextEnabled(false);
+
+            mSaveAndFinishWorker = new SaveAndFinishWorker();
+            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
+                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();
+            mSaveAndFinishWorker.setListener(this);
+
+            final boolean required = getActivity().getIntent().getBooleanExtra(
+                    EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
+            mSaveAndFinishWorker.start(mLockPatternUtils, required, mHasChallenge, mChallenge,
+                    mChosenPassword, mCurrentPassword, mRequestedQuality);
+        }
+
+        @Override
+        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
+            getActivity().setResult(RESULT_FINISHED, resultData);
+            getActivity().finish();
+
+            if (!wasSecureBefore) {
+                Intent intent = getRedactionInterstitialIntent(getActivity());
+                if (intent != null) {
+                    startActivity(intent);
+                }
+            }
+        }
+    }
+
+    private static class SaveAndFinishWorker extends SaveChosenLockWorkerBase {
+
+        private String mChosenPassword;
+        private String mCurrentPassword;
+        private int mRequestedQuality;
+
+        public void start(LockPatternUtils utils, boolean required,
+                boolean hasChallenge, long challenge,
+                String chosenPassword, String currentPassword, int requestedQuality) {
+            prepare(utils, required, hasChallenge, challenge);
+
+            mChosenPassword = chosenPassword;
+            mCurrentPassword = currentPassword;
+            mRequestedQuality = requestedQuality;
+
+            start();
+        }
+
+        @Override
+        protected Intent saveAndVerifyInBackground() {
+            Intent result = null;
+            final int userId = UserHandle.myUserId();
+            mUtils.saveLockPassword(mChosenPassword, mCurrentPassword, mRequestedQuality,
+                    userId);
+
+            if (mHasChallenge) {
+                byte[] token;
+                try {
+                    token = mUtils.verifyPassword(mChosenPassword, mChallenge, userId);
+                } catch (RequestThrottledException e) {
+                    token = null;
+                }
+
+                if (token == null) {
+                    Log.e(TAG, "critical: no token returned for known good password.");
+                }
+
+                result = new Intent();
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+            }
+
+            return result;
+        }
     }
 }
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 087a23e..1dd24f2 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -19,8 +19,8 @@
 import com.android.internal.logging.MetricsLogger;
 import com.google.android.collect.Lists;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
-import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
 import com.android.settings.notification.RedactionInterstitial;
@@ -31,7 +31,6 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.Log;
@@ -125,7 +124,7 @@
     }
 
     public static class ChooseLockPatternFragment extends InstrumentedFragment
-            implements View.OnClickListener {
+            implements View.OnClickListener, SaveAndFinishWorker.Listener {
 
         public static final int CONFIRM_EXISTING_REQUEST = 55;
 
@@ -137,6 +136,8 @@
 
         private static final int ID_EMPTY_MESSAGE = -1;
 
+        private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";
+
         private String mCurrentPattern;
         private boolean mHasChallenge;
         private long mChallenge;
@@ -346,7 +347,6 @@
         }
 
         private Stage mUiStage = Stage.Introduction;
-        private boolean mDone = false;
 
         private Runnable mClearPatternRunnable = new Runnable() {
             public void run() {
@@ -355,7 +355,7 @@
         };
 
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-        private AsyncTask<?, ?, ?> mPendingLockCheck;
+        private SaveAndFinishWorker mSaveAndFinishWorker;
 
         private static final String KEY_UI_STAGE = "uiStage";
         private static final String KEY_PATTERN_CHOICE = "chosenPattern";
@@ -434,22 +434,29 @@
                     mCurrentPattern = savedInstanceState.getString(KEY_CURRENT_PATTERN);
                 }
                 updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
+
+                // Re-attach to the exiting worker if there is one.
+                mSaveAndFinishWorker = (SaveAndFinishWorker) getFragmentManager().findFragmentByTag(
+                        FRAGMENT_TAG_SAVE_AND_FINISH);
             }
-            mDone = false;
         }
 
         @Override
         public void onResume() {
             super.onResume();
-            mLockPatternView.enableInput();
+            updateStage(mUiStage);
+
+            if (mSaveAndFinishWorker != null) {
+                setRightButtonEnabled(false);
+                mSaveAndFinishWorker.setListener(this);
+            }
         }
 
         @Override
         public void onPause() {
             super.onPause();
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(null);
             }
         }
 
@@ -483,7 +490,7 @@
                     throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
                             + " when button is " + RightButtonMode.Confirm);
                 }
-                saveChosenPatternAndFinish();
+                startSaveAndFinish();
             } else if (mUiStage.rightMode == RightButtonMode.Ok) {
                 if (mUiStage != Stage.HelpScreen) {
                     throw new IllegalStateException("Help screen is only mode with ok button, "
@@ -570,7 +577,7 @@
             setRightButtonText(stage.rightMode.text);
             setRightButtonEnabled(stage.rightMode.enabled);
 
-            // same for whether the patten is enabled
+            // same for whether the pattern is enabled
             if (stage.patternEnabled) {
                 mLockPatternView.enableInput();
             } else {
@@ -615,7 +622,6 @@
             }
         }
 
-
         // clear the wrong pattern unless they have started a new one
         // already
         private void postClearPatternRunnable() {
@@ -623,77 +629,90 @@
             mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
         }
 
-        private void saveChosenPatternAndFinish() {
-            if (mDone) return;
-            LockPatternUtils utils = mChooseLockSettingsHelper.utils();
-            final boolean lockVirgin = !utils.isPatternEverChosen(UserHandle.myUserId());
+        private void startSaveAndFinish() {
+            if (mSaveAndFinishWorker != null) {
+                Log.w(TAG, "startSaveAndFinish with an existing SaveAndFinishWorker.");
+                return;
+            }
 
-            boolean wasSecureBefore = utils.isSecure(UserHandle.myUserId());
+            setRightButtonEnabled(false);
+
+            mSaveAndFinishWorker = new SaveAndFinishWorker();
+            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
+                    FRAGMENT_TAG_SAVE_AND_FINISH).commit();
+            mSaveAndFinishWorker.setListener(this);
 
             final boolean required = getActivity().getIntent().getBooleanExtra(
                     EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
+            mSaveAndFinishWorker.start(mChooseLockSettingsHelper.utils(), required,
+                    mHasChallenge, mChallenge, mChosenPattern, mCurrentPattern);
+        }
 
-            utils.setCredentialRequiredToDecrypt(required);
-            utils.saveLockPattern(mChosenPattern, mCurrentPattern, UserHandle.myUserId());
+        @Override
+        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
+            getActivity().setResult(RESULT_FINISHED, resultData);
+            getActivity().finish();
 
-            if (lockVirgin) {
-                utils.setVisiblePatternEnabled(true, UserHandle.myUserId());
+            if (!wasSecureBefore) {
+                Intent intent = getRedactionInterstitialIntent(getActivity());
+                if (intent != null) {
+                    startActivity(intent);
+                }
             }
+        }
+    }
+
+    private static class SaveAndFinishWorker extends SaveChosenLockWorkerBase {
+
+        private List<LockPatternView.Cell> mChosenPattern;
+        private String mCurrentPattern;
+        private boolean mLockVirgin;
+
+        public void start(LockPatternUtils utils, boolean credentialRequired,
+                boolean hasChallenge, long challenge,
+                List<LockPatternView.Cell> chosenPattern, String currentPattern) {
+            prepare(utils, credentialRequired, hasChallenge, challenge);
+
+            mCurrentPattern = currentPattern;
+            mChosenPattern = chosenPattern;
+
+            mLockVirgin = !mUtils.isPatternEverChosen(UserHandle.myUserId());
+
+            start();
+        }
+
+        @Override
+        protected Intent saveAndVerifyInBackground() {
+            Intent result = null;
+            final int userId = UserHandle.myUserId();
+            mUtils.saveLockPattern(mChosenPattern, mCurrentPattern, userId);
 
             if (mHasChallenge) {
-                startVerifyPattern(utils, wasSecureBefore);
-            } else {
-                if (!wasSecureBefore) {
-                    Intent intent = getRedactionInterstitialIntent(getActivity());
-                    if (intent != null) {
-                        startActivity(intent);
-                    }
+                byte[] token;
+                try {
+                    token = mUtils.verifyPattern(mChosenPattern, mChallenge, userId);
+                } catch (RequestThrottledException e) {
+                    token = null;
                 }
-                getActivity().setResult(RESULT_FINISHED);
-                doFinish();
-            }
-        }
 
-        private void startVerifyPattern(LockPatternUtils utils, final boolean wasSecureBefore) {
-            mLockPatternView.disableInput();
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
+                if (token == null) {
+                    Log.e(TAG, "critical: no token returned for known good pattern");
+                }
+
+                result = new Intent();
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
             }
 
-            mPendingLockCheck = LockPatternChecker.verifyPattern(
-                    utils,
-                    mChosenPattern,
-                    mChallenge,
-                    UserHandle.myUserId(),
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            if (token == null) {
-                                Log.e(TAG, "critical: no token returned for known good pattern");
-                            }
-
-                            mLockPatternView.enableInput();
-                            mPendingLockCheck = null;
-
-                            if (!wasSecureBefore) {
-                                Intent intent = getRedactionInterstitialIntent(getActivity());
-                                if (intent != null) {
-                                    startActivity(intent);
-                                }
-                            }
-
-                            Intent intent = new Intent();
-                            intent.putExtra(
-                                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
-                            getActivity().setResult(RESULT_FINISHED, intent);
-                            doFinish();
-                        }
-                    });
+            return result;
         }
 
-        private void doFinish() {
-            getActivity().finish();
-            mDone = true;
+        @Override
+        protected void finish(Intent resultData) {
+            if (mLockVirgin) {
+                mUtils.setVisiblePatternEnabled(true, UserHandle.myUserId());
+            }
+
+            super.finish(resultData);
         }
     }
 }
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index 327e622..665bffe 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -158,10 +158,19 @@
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
         intent.setClassName(ConfirmDeviceCredentialBaseFragment.PACKAGE, activityClass.getName());
-        if (mFragment != null) {
-            mFragment.startActivityForResult(intent, request);
+        if (external) {
+            intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+            if (mFragment != null) {
+                mFragment.startActivity(intent);
+            } else {
+                mActivity.startActivity(intent);
+            }
         } else {
-            mActivity.startActivityForResult(intent, request);
+            if (mFragment != null) {
+                mFragment.startActivityForResult(intent, request);
+            } else {
+                mActivity.startActivityForResult(intent, request);
+            }
         }
         return true;
     }
diff --git a/src/com/android/settings/ColorModePreference.java b/src/com/android/settings/ColorModePreference.java
new file mode 100644
index 0000000..14ffe48
--- /dev/null
+++ b/src/com/android/settings/ColorModePreference.java
@@ -0,0 +1,151 @@
+/*
+ * 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.AlertDialog.Builder;
+import android.content.Context;
+import android.content.res.Resources;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManager.DisplayListener;
+import android.os.Handler;
+import android.os.Looper;
+import android.preference.DialogPreference;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+import android.view.Display;
+import android.view.Display.ColorTransform;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Checkable;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+public class ColorModePreference extends SwitchPreference implements DisplayListener {
+
+    private DisplayManager mDisplayManager;
+    private Display mDisplay;
+
+    private int mCurrentIndex;
+    private ArrayList<ColorTransformDescription> mDescriptions;
+
+    public ColorModePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mDisplayManager = getContext().getSystemService(DisplayManager.class);
+    }
+
+    public int getTransformsCount() {
+        return mDescriptions.size();
+    }
+
+    public void startListening() {
+        mDisplayManager.registerDisplayListener(this, new Handler(Looper.getMainLooper()));
+    }
+
+    public void stopListening() {
+        mDisplayManager.unregisterDisplayListener(this);
+    }
+
+    @Override
+    public void onDisplayAdded(int displayId) {
+        if (displayId == Display.DEFAULT_DISPLAY) {
+            updateCurrentAndSupported();
+        }
+    }
+
+    @Override
+    public void onDisplayChanged(int displayId) {
+        if (displayId == Display.DEFAULT_DISPLAY) {
+            updateCurrentAndSupported();
+        }
+    }
+
+    @Override
+    public void onDisplayRemoved(int displayId) {
+    }
+
+    public void updateCurrentAndSupported() {
+        mDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
+
+        mDescriptions = new ArrayList<>();
+
+        Resources resources = getContext().getResources();
+        int[] transforms = resources.getIntArray(
+                com.android.internal.R.array.config_colorTransforms);
+        String[] titles = resources.getStringArray(R.array.color_mode_names);
+        String[] descriptions = resources.getStringArray(R.array.color_mode_descriptions);
+        // Map the resource information describing color transforms.
+        for (int i = 0; i < transforms.length; i++) {
+            if (transforms[i] != -1 && i != 1 /* Skip Natural for now. */) {
+                ColorTransformDescription desc = new ColorTransformDescription();
+                desc.colorTransform = transforms[i];
+                desc.title = titles[i];
+                desc.summary = descriptions[i];
+                mDescriptions.add(desc);
+            }
+        }
+        // Match up a ColorTransform to every description.
+        ColorTransform[] supportedColorTransforms = mDisplay.getSupportedColorTransforms();
+        for (int i = 0; i < supportedColorTransforms.length; i++) {
+            for (int j = 0; j < mDescriptions.size(); j++) {
+                if (mDescriptions.get(j).colorTransform
+                        == supportedColorTransforms[i].getColorTransform()
+                        && mDescriptions.get(j).transform == null) {
+                    mDescriptions.get(j).transform = supportedColorTransforms[i];
+                    break;
+                }
+            }
+        }
+        // Remove any extras that don't have a transform for some reason.
+        for (int i = 0; i < mDescriptions.size(); i++) {
+            if (mDescriptions.get(i).transform == null) {
+                mDescriptions.remove(i--);
+            }
+        }
+
+        ColorTransform currentTransform = mDisplay.getColorTransform();
+        mCurrentIndex = -1;
+        for (int i = 0; i < mDescriptions.size(); i++) {
+            if (mDescriptions.get(i).colorTransform == currentTransform.getColorTransform()) {
+                mCurrentIndex = i;
+                break;
+            }
+        }
+        setChecked(mCurrentIndex == 1);
+    }
+
+    @Override
+    protected boolean persistBoolean(boolean value) {
+        // Right now this is a switch, so we only support two modes.
+        if (mDescriptions.size() == 2) {
+            ColorTransformDescription desc = mDescriptions.get(value ? 1 : 0);
+
+            mDisplay.requestColorTransform(desc.transform);
+            mCurrentIndex = mDescriptions.indexOf(desc);
+        }
+
+        return true;
+    }
+
+    private static class ColorTransformDescription {
+        private int colorTransform;
+        private String title;
+        private String summary;
+        private ColorTransform transform;
+    }
+}
diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
index da39a0f..86935c3 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -58,23 +58,12 @@
         String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
         String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
 
-        // Ignore rotates and ensure we only launch this once
-        if (savedInstanceState == null) {
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-            if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
-                    details, false /* returnCredentials */, true /* isExternal */)) {
-                Log.d(TAG, "No pattern, password or PIN set.");
-                setResult(Activity.RESULT_OK);
-                finish();
-            }
+        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
+        if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
+                details, false /* returnCredentials */, true /* isExternal */)) {
+            Log.d(TAG, "No pattern, password or PIN set.");
+            setResult(Activity.RESULT_OK);
         }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        boolean credentialsConfirmed = (resultCode == Activity.RESULT_OK);
-        Log.d(TAG, "Device credentials confirmed: " + credentialsConfirmed);
-        setResult(credentialsConfirmed ? Activity.RESULT_OK : Activity.RESULT_CANCELED);
         finish();
     }
 }
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
index 176efbc..d9af800 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
@@ -19,6 +19,7 @@
 import android.app.Fragment;
 import android.app.KeyguardManager;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.MenuItem;
 import android.view.WindowManager;
 
@@ -28,6 +29,7 @@
     private boolean mDark;
     private boolean mEnterAnimationPending;
     private boolean mFirstTimeVisible = true;
+    private final Handler mHandler = new Handler();
 
     @Override
     protected void onCreate(Bundle savedState) {
@@ -67,6 +69,7 @@
             mFirstTimeVisible = false;
             prepareEnterAnimation();
             mEnterAnimationPending = true;
+            mHandler.postDelayed(mEnterAnimationCompleteTimeoutRunnable, 1000);
         }
     }
 
@@ -82,6 +85,7 @@
     public void onEnterAnimationComplete() {
         super.onEnterAnimationComplete();
         if (mEnterAnimationPending) {
+            mHandler.removeCallbacks(mEnterAnimationCompleteTimeoutRunnable);
             startEnterAnimation();
             mEnterAnimationPending = false;
         }
@@ -94,4 +98,15 @@
     public void startEnterAnimation() {
         getFragment().startEnterAnimation();
     }
+
+    /**
+     * Workaround for a bug in window manager which results that onEnterAnimationComplete doesn't
+     * get called in all cases.
+     */
+    private final Runnable mEnterAnimationCompleteTimeoutRunnable = new Runnable() {
+        @Override
+        public void run() {
+            onEnterAnimationComplete();
+        }
+    };
 }
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 1c42045..cce29dd 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -16,10 +16,8 @@
 
 package com.android.settings;
 
-import android.os.UserHandle;
 import android.text.TextUtils;
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.util.ArrayUtils;
 import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.TextViewInputDisabler;
@@ -78,19 +76,20 @@
     }
 
     public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment
-            implements OnClickListener, OnEditorActionListener {
-        private static final String KEY_NUM_WRONG_CONFIRM_ATTEMPTS
-                = "confirm_lock_password_fragment.key_num_wrong_confirm_attempts";
+            implements OnClickListener, OnEditorActionListener,
+            CredentialCheckResultTracker.Listener {
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
+        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
         private TextView mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
         private LockPatternUtils mLockPatternUtils;
         private AsyncTask<?, ?, ?> mPendingLockCheck;
+        private CredentialCheckResultTracker mCredentialCheckResultTracker;
+        private boolean mDisappearing = false;
         private TextView mHeaderTextView;
         private TextView mDetailsTextView;
         private TextView mErrorTextView;
         private Handler mHandler = new Handler();
-        private int mNumWrongConfirmAttempts;
         private CountDownTimer mCountdownTimer;
         private boolean mIsAlpha;
         private InputMethodManager mImm;
@@ -110,11 +109,6 @@
             super.onCreate(savedInstanceState);
             mLockPatternUtils = new LockPatternUtils(getActivity());
             mEffectiveUserId = Utils.getEffectiveUserId(getActivity());
-
-            if (savedInstanceState != null) {
-                mNumWrongConfirmAttempts = savedInstanceState.getInt(
-                        KEY_NUM_WRONG_CONFIRM_ATTEMPTS, 0);
-            }
         }
 
         @Override
@@ -165,6 +159,15 @@
                     0.5f /* delayScale */, AnimationUtils.loadInterpolator(
                             getContext(), android.R.interpolator.fast_out_linear_in));
             setAccessibilityTitle(mHeaderTextView.getText());
+
+            mCredentialCheckResultTracker = (CredentialCheckResultTracker) getFragmentManager()
+                    .findFragmentByTag(FRAGMENT_TAG_CHECK_LOCK_RESULT);
+            if (mCredentialCheckResultTracker == null) {
+                mCredentialCheckResultTracker = new CredentialCheckResultTracker();
+                getFragmentManager().beginTransaction().add(mCredentialCheckResultTracker,
+                        FRAGMENT_TAG_CHECK_LOCK_RESULT).commit();
+            }
+
             return view;
         }
 
@@ -227,10 +230,7 @@
                 mCountdownTimer.cancel();
                 mCountdownTimer = null;
             }
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
-            }
+            mCredentialCheckResultTracker.setListener(null);
         }
 
         @Override
@@ -243,21 +243,17 @@
             super.onResume();
             long deadline = mLockPatternUtils.getLockoutAttemptDeadline(mEffectiveUserId);
             if (deadline != 0) {
+                mCredentialCheckResultTracker.clearResult();
                 handleAttemptLockout(deadline);
             } else {
                 resetState();
             }
-        }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-            outState.putInt(KEY_NUM_WRONG_CONFIRM_ATTEMPTS, mNumWrongConfirmAttempts);
+            mCredentialCheckResultTracker.setListener(this);
         }
 
         @Override
         protected void authenticationSucceeded() {
-            startDisappearAnimation(new Intent());
+            mCredentialCheckResultTracker.setResult(true, new Intent(), 0, mEffectiveUserId);
         }
 
         @Override
@@ -298,11 +294,12 @@
         }
 
         private void handleNext() {
-            mPasswordEntryInputDisabler.setInputEnabled(false);
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
+            if (mPendingLockCheck != null || mDisappearing) {
+                return;
             }
 
+            mPasswordEntryInputDisabler.setInputEnabled(false);
+
             final String pin = mPasswordEntry.getText().toString();
             final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
@@ -317,7 +314,7 @@
                 return;
             }
 
-            onPasswordChecked(false, intent, 0, mEffectiveUserId);
+            mCredentialCheckResultTracker.setResult(false, intent, 0, mEffectiveUserId);
         }
 
         private boolean isInternalActivity() {
@@ -344,7 +341,8 @@
                                         ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
                                         token);
                             }
-                            onPasswordChecked(matched, intent, timeoutMs, localEffectiveUserId);
+                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                    localEffectiveUserId);
                         }
                     });
         }
@@ -366,16 +364,27 @@
                                 intent.putExtra(
                                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin);
                             }
-                            onPasswordChecked(matched, intent, timeoutMs, localEffectiveUserId);
+                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                    localEffectiveUserId);
                         }
                     });
         }
 
         private void startDisappearAnimation(final Intent intent) {
+            if (mDisappearing) {
+                return;
+            }
+            mDisappearing = true;
+
             if (getActivity().getThemeResId() == R.style.Theme_ConfirmDeviceCredentialsDark) {
                 mDisappearAnimationUtils.startAnimation(getActiveViews(), new Runnable() {
                     @Override
                     public void run() {
+                        // Bail if there is no active activity.
+                        if (getActivity() == null || getActivity().isFinishing()) {
+                            return;
+                        }
+
                         getActivity().setResult(RESULT_OK, intent);
                         getActivity().finish();
                         getActivity().overridePendingTransition(
@@ -405,6 +414,12 @@
             }
         }
 
+        @Override
+        public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId) {
+            onPasswordChecked(matched, intent, timeoutMs, effectiveUserId);
+        }
+
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
             long elapsedRealtime = SystemClock.elapsedRealtime();
             mPasswordEntry.setEnabled(false);
@@ -424,7 +439,6 @@
                 public void onFinish() {
                     resetState();
                     mErrorTextView.setText("");
-                    mNumWrongConfirmAttempts = 0;
                 }
             }.start();
         }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 51cde60..94ba01a 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -32,7 +32,6 @@
 import android.os.SystemClock;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.os.storage.StorageManager;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
@@ -76,17 +75,18 @@
     }
 
     public static class ConfirmLockPatternFragment extends ConfirmDeviceCredentialBaseFragment
-            implements AppearAnimationCreator<Object> {
+            implements AppearAnimationCreator<Object>, CredentialCheckResultTracker.Listener {
 
         // how long we wait to clear a wrong pattern
         private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
 
-        private static final String KEY_NUM_WRONG_ATTEMPTS = "num_wrong_attempts";
+        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
 
         private LockPatternView mLockPatternView;
         private LockPatternUtils mLockPatternUtils;
         private AsyncTask<?, ?, ?> mPendingLockCheck;
-        private int mNumWrongConfirmAttempts;
+        private CredentialCheckResultTracker mCredentialCheckResultTracker;
+        private boolean mDisappearing = false;
         private CountDownTimer mCountdownTimer;
 
         private TextView mHeaderTextView;
@@ -148,9 +148,7 @@
             mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
             updateStage(Stage.NeedToUnlock);
 
-            if (savedInstanceState != null) {
-                mNumWrongConfirmAttempts = savedInstanceState.getInt(KEY_NUM_WRONG_ATTEMPTS);
-            } else {
+            if (savedInstanceState == null) {
                 // on first launch, if no lock pattern is set, then finish with
                 // success (don't want user to get stuck confirming something that
                 // doesn't exist).
@@ -174,13 +172,21 @@
                         }
                     });
             setAccessibilityTitle(mHeaderTextView.getText());
+
+            mCredentialCheckResultTracker = (CredentialCheckResultTracker) getFragmentManager()
+                    .findFragmentByTag(FRAGMENT_TAG_CHECK_LOCK_RESULT);
+            if (mCredentialCheckResultTracker == null) {
+                mCredentialCheckResultTracker = new CredentialCheckResultTracker();
+                getFragmentManager().beginTransaction().add(mCredentialCheckResultTracker,
+                        FRAGMENT_TAG_CHECK_LOCK_RESULT).commit();
+            }
+
             return view;
         }
 
         @Override
         public void onSaveInstanceState(Bundle outState) {
             // deliberately not calling super since we are managing this in full
-            outState.putInt(KEY_NUM_WRONG_ATTEMPTS, mNumWrongConfirmAttempts);
         }
 
         @Override
@@ -190,10 +196,7 @@
             if (mCountdownTimer != null) {
                 mCountdownTimer.cancel();
             }
-            if (mPendingLockCheck != null) {
-                mPendingLockCheck.cancel(false);
-                mPendingLockCheck = null;
-            }
+            mCredentialCheckResultTracker.setListener(null);
         }
 
         @Override
@@ -208,13 +211,14 @@
             // if the user is currently locked out, enforce it.
             long deadline = mLockPatternUtils.getLockoutAttemptDeadline(mEffectiveUserId);
             if (deadline != 0) {
+                mCredentialCheckResultTracker.clearResult();
                 handleAttemptLockout(deadline);
             } else if (!mLockPatternView.isEnabled()) {
                 // The deadline has passed, but the timer was cancelled. Or the pending lock
                 // check was cancelled. Need to clean up.
-                mNumWrongConfirmAttempts = 0;
                 updateStage(Stage.NeedToUnlock);
             }
+            mCredentialCheckResultTracker.setListener(this);
         }
 
         @Override
@@ -317,16 +321,26 @@
 
         @Override
         protected void authenticationSucceeded() {
-            startDisappearAnimation(new Intent());
+            mCredentialCheckResultTracker.setResult(true, new Intent(), 0, mEffectiveUserId);
         }
 
         private void startDisappearAnimation(final Intent intent) {
+            if (mDisappearing) {
+                return;
+            }
+            mDisappearing = true;
+
             if (getActivity().getThemeResId() == R.style.Theme_ConfirmDeviceCredentialsDark) {
                 mLockPatternView.clearPattern();
                 mDisappearAnimationUtils.startAnimation2d(getActiveViews(),
                         new Runnable() {
                             @Override
                             public void run() {
+                                // Bail if there is no active activity.
+                                if (getActivity() == null || getActivity().isFinishing()) {
+                                    return;
+                                }
+
                                 getActivity().setResult(RESULT_OK, intent);
                                 getActivity().finish();
                                 getActivity().overridePendingTransition(
@@ -370,11 +384,12 @@
             }
 
             public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-                mLockPatternView.setEnabled(false);
-                if (mPendingLockCheck != null) {
-                    mPendingLockCheck.cancel(false);
+                if (mPendingLockCheck != null || mDisappearing) {
+                    return;
                 }
 
+                mLockPatternView.setEnabled(false);
+
                 final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
                         ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
                 Intent intent = new Intent();
@@ -388,7 +403,7 @@
                     return;
                 }
 
-                onPatternChecked(pattern, false, intent, 0, mEffectiveUserId);
+                mCredentialCheckResultTracker.setResult(false, intent, 0, mEffectiveUserId);
             }
 
             private boolean isInternalActivity() {
@@ -416,8 +431,8 @@
                                             ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
                                             token);
                                 }
-                                onPatternChecked(pattern,
-                                        matched, intent, timeoutMs, localEffectiveUserId);
+                                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                        localEffectiveUserId);
                             }
                         });
             }
@@ -425,7 +440,7 @@
             private void startCheckPattern(final List<LockPatternView.Cell> pattern,
                     final Intent intent) {
                 if (pattern.size() < LockPatternUtils.MIN_PATTERN_REGISTER_FAIL) {
-                    onPatternChecked(pattern, false, intent, 0, mEffectiveUserId);
+                    mCredentialCheckResultTracker.setResult(false, intent, 0, mEffectiveUserId);
                     return;
                 }
 
@@ -444,29 +459,35 @@
                                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
                                                     LockPatternUtils.patternToString(pattern));
                                 }
-                                onPatternChecked(pattern, matched, intent, timeoutMs,
+                                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
                                         localEffectiveUserId);
                             }
                         });
             }
+        };
 
-            private void onPatternChecked(List<LockPatternView.Cell> pattern,
-                    boolean matched, Intent intent, int timeoutMs, int effectiveUserId) {
-                mLockPatternView.setEnabled(true);
-                if (matched) {
-                    startDisappearAnimation(intent);
+        private void onPatternChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId) {
+            mLockPatternView.setEnabled(true);
+            if (matched) {
+                startDisappearAnimation(intent);
+            } else {
+                if (timeoutMs > 0) {
+                    long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
+                            effectiveUserId, timeoutMs);
+                    handleAttemptLockout(deadline);
                 } else {
-                    if (timeoutMs > 0) {
-                        long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
-                                effectiveUserId, timeoutMs);
-                        handleAttemptLockout(deadline);
-                    } else {
-                        updateStage(Stage.NeedToUnlockWrong);
-                        postClearPatternRunnable();
-                    }
+                    updateStage(Stage.NeedToUnlockWrong);
+                    postClearPatternRunnable();
                 }
             }
-        };
+        }
+
+        @Override
+        public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId) {
+            onPatternChecked(matched, intent, timeoutMs, effectiveUserId);
+        }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
             updateStage(Stage.LockedOut);
@@ -485,7 +506,6 @@
 
                 @Override
                 public void onFinish() {
-                    mNumWrongConfirmAttempts = 0;
                     updateStage(Stage.NeedToUnlock);
                 }
             }.start();
diff --git a/src/com/android/settings/CredentialCheckResultTracker.java b/src/com/android/settings/CredentialCheckResultTracker.java
new file mode 100644
index 0000000..5c55073
--- /dev/null
+++ b/src/com/android/settings/CredentialCheckResultTracker.java
@@ -0,0 +1,79 @@
+/*
+ * 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.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * An invisible retained fragment to track lock check result.
+ */
+public class CredentialCheckResultTracker extends Fragment {
+
+    private Listener mListener;
+    private boolean mHasResult = false;
+
+    private boolean mResultMatched;
+    private Intent mResultData;
+    private int mResultTimeoutMs;
+    private int mResultEffectiveUserId;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    public void setListener(Listener listener) {
+        if (mListener == listener) {
+            return;
+        }
+
+        mListener = listener;
+        if (mListener != null && mHasResult) {
+            mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
+                    mResultEffectiveUserId);
+        }
+    }
+
+    public void setResult(boolean matched, Intent intent, int timeoutMs, int effectiveUserId) {
+        mResultMatched = matched;
+        mResultData = intent;
+        mResultTimeoutMs = timeoutMs;
+        mResultEffectiveUserId = effectiveUserId;
+
+        mHasResult = true;
+        if (mListener != null) {
+            mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
+                    mResultEffectiveUserId);
+        }
+    }
+
+    public void clearResult() {
+        mHasResult = false;
+        mResultMatched = false;
+        mResultData = null;
+        mResultTimeoutMs = 0;
+        mResultEffectiveUserId = 0;
+    }
+
+    interface Listener {
+        public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
+                int effectiveUserId);
+    }
+}
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index e014465..135328b 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1166,6 +1166,7 @@
         mCycleAdapter.clear();
 
         final Context context = mCycleSpinner.getContext();
+        NetworkStatsHistory.Entry entry = null;
 
         long historyStart = Long.MAX_VALUE;
         long historyEnd = Long.MIN_VALUE;
@@ -1188,9 +1189,20 @@
                 final long cycleStart = computeLastCycleBoundary(cycleEnd, policy);
                 Log.d(TAG, "generating cs=" + cycleStart + " to ce=" + cycleEnd + " waiting for hs="
                         + historyStart);
-                mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
+
+                final boolean includeCycle;
+                if (mChartData != null) {
+                    entry = mChartData.network.getValues(cycleStart, cycleEnd, entry);
+                    includeCycle = (entry.rxBytes + entry.txBytes) > 0;
+                } else {
+                    includeCycle = true;
+                }
+
+                if (includeCycle) {
+                    mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
+                    hasCycles = true;
+                }
                 cycleEnd = cycleStart;
-                hasCycles = true;
             }
 
             // one last cycle entry to modify policy cycle day
@@ -1202,7 +1214,18 @@
             long cycleEnd = historyEnd;
             while (cycleEnd > historyStart) {
                 final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4);
-                mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
+
+                final boolean includeCycle;
+                if (mChartData != null) {
+                    entry = mChartData.network.getValues(cycleStart, cycleEnd, entry);
+                    includeCycle = (entry.rxBytes + entry.txBytes) > 0;
+                } else {
+                    includeCycle = true;
+                }
+
+                if (includeCycle) {
+                    mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
+                }
                 cycleEnd = cycleStart;
             }
 
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f9950b7..8bb99c53 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -156,6 +156,7 @@
     private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
     private static final String WIFI_LEGACY_DHCP_CLIENT_KEY = "legacy_dhcp_client";
     private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
+    private static final String KEY_COLOR_MODE = "color_mode";
 
     private static final String INACTIVE_APPS_KEY = "inactive_apps";
 
@@ -253,6 +254,8 @@
 
     private SwitchPreference mShowAllANRs;
 
+    private ColorModePreference mColorModePreference;
+
     private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
 
     private final ArrayList<SwitchPreference> mResetSwitchPrefs
@@ -411,6 +414,13 @@
             mAllPrefs.add(hdcpChecking);
             removePreferenceForProduction(hdcpChecking);
         }
+
+        mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
+        mColorModePreference.updateCurrentAndSupported();
+        if (mColorModePreference.getTransformsCount() < 2) {
+            removePreference(KEY_COLOR_MODE);
+            mColorModePreference = null;
+        }
     }
 
     private ListPreference addListPreference(String prefKey) {
@@ -516,6 +526,19 @@
             setPrefsEnabledState(mLastEnabledState);
         }
         mSwitchBar.show();
+
+        if (mColorModePreference != null) {
+            mColorModePreference.startListening();
+            mColorModePreference.updateCurrentAndSupported();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mColorModePreference != null) {
+            mColorModePreference.stopListening();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index c2ab81e..8fc41ea 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -65,6 +65,7 @@
     private static final String FILENAME_PROC_VERSION = "/proc/version";
     private static final String FILENAME_MSV = "/sys/board_properties/soc/msv";
 
+    private static final String KEY_MANUAL = "manual";
     private static final String KEY_REGULATORY_INFO = "regulatory_info";
     private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
     private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
@@ -180,6 +181,9 @@
         removePreferenceIfBoolFalse(KEY_UPDATE_SETTING,
                 R.bool.config_additional_system_update_setting_enable);
 
+        // Remove manual entry if none present.
+        removePreferenceIfBoolFalse(KEY_MANUAL, R.bool.config_show_manual);
+
         // Remove regulatory information if none present.
         final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
         if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index eef3c6b..de15d4c 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -22,6 +22,8 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
 import static android.provider.Settings.Secure.DOUBLE_TAP_TO_WAKE;
 import static android.provider.Settings.Secure.DOZE_ENABLED;
 import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;
@@ -74,6 +76,9 @@
     private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
     private static final String KEY_AUTO_ROTATE = "auto_rotate";
     private static final String KEY_NIGHT_MODE = "night_mode";
+    private static final String KEY_CAMERA_GESTURE = "camera_gesture";
+    private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
+            = "camera_double_tap_power_gesture";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
 
@@ -88,6 +93,8 @@
     private SwitchPreference mDozePreference;
     private SwitchPreference mTapToWakePreference;
     private SwitchPreference mAutoBrightnessPreference;
+    private SwitchPreference mCameraGesturePreference;
+    private SwitchPreference mCameraDoubleTapPowerGesturePreference;
 
     @Override
     protected int getMetricsCategory() {
@@ -149,6 +156,21 @@
             removePreference(KEY_TAP_TO_WAKE);
         }
 
+        if (isCameraGestureAvailable(getResources())) {
+            mCameraGesturePreference = (SwitchPreference) findPreference(KEY_CAMERA_GESTURE);
+            mCameraGesturePreference.setOnPreferenceChangeListener(this);
+        } else {
+            removePreference(KEY_CAMERA_GESTURE);
+        }
+
+        if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
+            mCameraDoubleTapPowerGesturePreference
+                    = (SwitchPreference) findPreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+            mCameraDoubleTapPowerGesturePreference.setOnPreferenceChangeListener(this);
+        } else {
+            removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+        }
+
         if (RotationPolicy.isRotationLockToggleVisible(activity)) {
             DropDownPreference rotatePreference =
                     (DropDownPreference) findPreference(KEY_AUTO_ROTATE);
@@ -224,6 +246,18 @@
         return res.getBoolean(com.android.internal.R.bool.config_automatic_brightness_available);
     }
 
+    private static boolean isCameraGestureAvailable(Resources res) {
+        boolean configSet = res.getInteger(
+                com.android.internal.R.integer.config_cameraLaunchGestureSensorType) != -1;
+        return configSet &&
+                !SystemProperties.getBoolean("gesture.disable_camera_launch", false);
+    }
+
+    private static boolean isCameraDoubleTapPowerGestureAvailable(Resources res) {
+        return res.getBoolean(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+    }
+
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
         ListPreference preference = mScreenTimeoutPreference;
         String summary;
@@ -370,6 +404,19 @@
             int value = Settings.Secure.getInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, 0);
             mTapToWakePreference.setChecked(value != 0);
         }
+
+        // Update camera gesture #1 if it is available.
+        if (mCameraGesturePreference != null) {
+            int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
+            mCameraGesturePreference.setChecked(value == 0);
+        }
+
+        // Update camera gesture #2 if it is available.
+        if (mCameraDoubleTapPowerGesturePreference != null) {
+            int value = Settings.Secure.getInt(
+                    getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
+            mCameraDoubleTapPowerGesturePreference.setChecked(value == 0);
+        }
     }
 
     private void updateScreenSaverSummary() {
@@ -425,6 +472,16 @@
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);
         }
+        if (preference == mCameraGesturePreference) {
+            boolean value = (Boolean) objValue;
+            Settings.Secure.putInt(getContentResolver(), CAMERA_GESTURE_DISABLED,
+                    value ? 0 : 1 /* Backwards because setting is for disabling */);
+        }
+        if (preference == mCameraDoubleTapPowerGesturePreference) {
+            boolean value = (Boolean) objValue;
+            Settings.Secure.putInt(getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                    value ? 0 : 1 /* Backwards because setting is for disabling */);
+        }
         if (preference == mNightModePreference) {
             try {
                 final int value = Integer.parseInt((String) objValue);
@@ -493,6 +550,12 @@
                     if (!isTapToWakeAvailable(context.getResources())) {
                         result.add(KEY_TAP_TO_WAKE);
                     }
+                    if (!isCameraGestureAvailable(context.getResources())) {
+                        result.add(KEY_CAMERA_GESTURE);
+                    }
+                    if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
+                        result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+                    }
                     return result;
                 }
             };
diff --git a/src/com/android/settings/HotspotOffReceiver.java b/src/com/android/settings/HotspotOffReceiver.java
index 06ced1f..f3c3fee 100644
--- a/src/com/android/settings/HotspotOffReceiver.java
+++ b/src/com/android/settings/HotspotOffReceiver.java
@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
+import android.util.Log;
 
 import com.android.settingslib.TetherUtil;
 
@@ -14,11 +15,15 @@
  */
 public class HotspotOffReceiver extends BroadcastReceiver {
 
+    private static final String TAG = "HotspotOffReceiver";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
     @Override
     public void onReceive(Context context, Intent intent) {
         if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(intent.getAction())) {
             WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
             if (wifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED) {
+                if (DEBUG) Log.d(TAG, "TetherService.cancelRecheckAlarmIfNecessary called");
                 // The hotspot has been turned off, we don't need to recheck tethering.
                 TetherService.cancelRecheckAlarmIfNecessary(context, TetherUtil.TETHERING_WIFI);
             }
diff --git a/src/com/android/settings/InstrumentedActivity.java b/src/com/android/settings/InstrumentedActivity.java
new file mode 100644
index 0000000..4a0e03a
--- /dev/null
+++ b/src/com/android/settings/InstrumentedActivity.java
@@ -0,0 +1,47 @@
+/*
+ * 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 com.android.internal.logging.MetricsLogger;
+
+import android.app.Activity;
+
+/**
+ * Instrumented activity that logs visibility state.
+ */
+public abstract class InstrumentedActivity extends Activity {
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
+    protected abstract int getMetricsCategory();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MetricsLogger.visible(this, getMetricsCategory());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(this, getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/ManualDisplayActivity.java b/src/com/android/settings/ManualDisplayActivity.java
new file mode 100644
index 0000000..8be4fee
--- /dev/null
+++ b/src/com/android/settings/ManualDisplayActivity.java
@@ -0,0 +1,85 @@
+/*
+ * 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.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import java.io.File;
+
+/**
+ * The "dialog" that shows from "Manual" in the Settings app.
+ */
+public class ManualDisplayActivity extends Activity {
+    private static final String TAG = "SettingsManualActivity";
+
+    private static final String DEFAULT_MANUAL_PATH = "/system/etc/MANUAL.html.gz";
+    private static final String PROPERTY_MANUAL_PATH = "ro.config.manual_path";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Resources resources = getResources();
+
+        if (!resources.getBoolean(R.bool.config_show_manual)) {
+            finish();   // No manual to display for this device
+        }
+
+        final String path = SystemProperties.get(PROPERTY_MANUAL_PATH, DEFAULT_MANUAL_PATH);
+        if (TextUtils.isEmpty(path)) {
+            Log.e(TAG, "The system property for the manual is empty");
+            showErrorAndFinish();
+            return;
+        }
+
+        final File file = new File(path);
+        if (!file.exists() || file.length() == 0) {
+            Log.e(TAG, "Manual file " + path + " does not exist");
+            showErrorAndFinish();
+            return;
+        }
+
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(Uri.fromFile(file), "text/html");
+
+        intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_manual_activity_title));
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setPackage("com.android.htmlviewer");
+
+        try {
+            startActivity(intent);
+            finish();
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG, "Failed to find viewer", e);
+            showErrorAndFinish();
+        }
+    }
+
+    private void showErrorAndFinish() {
+        Toast.makeText(this, R.string.settings_manual_activity_unavailable, Toast.LENGTH_LONG)
+                .show();
+        finish();
+    }
+}
diff --git a/src/com/android/settings/SaveChosenLockWorkerBase.java b/src/com/android/settings/SaveChosenLockWorkerBase.java
new file mode 100644
index 0000000..a40871a
--- /dev/null
+++ b/src/com/android/settings/SaveChosenLockWorkerBase.java
@@ -0,0 +1,106 @@
+/*
+ * 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.Fragment;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserHandle;
+
+import com.android.internal.widget.LockPatternUtils;
+
+/**
+ * An invisible retained worker fragment to track the AsyncWork that saves (and optionally
+ * verifies if a challenge is given) the chosen lock credential (pattern/pin/password).
+ */
+abstract class SaveChosenLockWorkerBase extends Fragment {
+
+    private Listener mListener;
+    private boolean mFinished;
+    private Intent mResultData;
+
+    protected LockPatternUtils mUtils;
+    protected boolean mHasChallenge;
+    protected long mChallenge;
+    protected boolean mWasSecureBefore;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    public void setListener(Listener listener) {
+        if (mListener == listener) {
+            return;
+        }
+
+        mListener = listener;
+        if (mFinished && mListener != null) {
+            mListener.onChosenLockSaveFinished(mWasSecureBefore, mResultData);
+        }
+    }
+
+    protected void prepare(LockPatternUtils utils, boolean credentialRequired,
+            boolean hasChallenge, long challenge) {
+        mUtils = utils;
+
+        mHasChallenge = hasChallenge;
+        mChallenge = challenge;
+        mWasSecureBefore = mUtils.isSecure(UserHandle.myUserId());
+
+        mUtils.setCredentialRequiredToDecrypt(credentialRequired);
+
+        mFinished = false;
+        mResultData = null;
+    }
+
+    protected void start() {
+        new Task().execute();
+    }
+
+    /**
+     * Executes the save and verify work in background.
+     * @return Intent with challenge token or null.
+     */
+    protected abstract Intent saveAndVerifyInBackground();
+
+    protected void finish(Intent resultData) {
+        mFinished = true;
+        mResultData = resultData;
+        if (mListener != null) {
+            mListener.onChosenLockSaveFinished(mWasSecureBefore, mResultData);
+        }
+    }
+
+    private class Task extends AsyncTask<Void, Void, Intent> {
+        @Override
+        protected Intent doInBackground(Void... params){
+            return saveAndVerifyInBackground();
+        }
+
+        @Override
+        protected void onPostExecute(Intent resultData) {
+            finish(resultData);
+        }
+    }
+
+    interface Listener {
+        public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData);
+    }
+}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 6e679b6..892d61f 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -361,6 +361,8 @@
                     fingerprintCount, fingerprintCount));
             clazz = FingerprintSettings.class.getName();
         } else {
+            fingerprintPreference.setSummary(
+                    R.string.security_settings_fingerprint_preference_summary_none);
             clazz = FingerprintEnrollIntroduction.class.getName();
         }
         intent.setClassName("com.android.settings", clazz);
@@ -795,10 +797,16 @@
             FingerprintManager fpm =
                     (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
             if (fpm.isHardwareDetected()) {
+                // This catches the title which can be overloaded in an overlay
                 data = new SearchIndexableRaw(context);
                 data.title = res.getString(R.string.security_settings_fingerprint_preference_title);
                 data.screenTitle = screenTitle;
                 result.add(data);
+                // Fallback for when the above doesn't contain "fingerprint"
+                data = new SearchIndexableRaw(context);
+                data.title = res.getString(R.string.fingerprint_manage_category_title);
+                data.screenTitle = screenTitle;
+                result.add(data);
             }
 
             // Credential storage
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index baf04d4..b957c38 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -505,7 +505,10 @@
     }
 
     public void finish() {
-        getActivity().onBackPressed();
+        Activity activity = getActivity();
+        if (activity != null) {
+            activity.onBackPressed();
+        }
     }
 
     public boolean startFragment(Fragment caller, String fragmentClass, int titleRes,
diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/TetherService.java
index 459dc27..346a175 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/TetherService.java
@@ -69,7 +69,7 @@
     @Override
     public void onCreate() {
         super.onCreate();
-        if (DEBUG) Log.d(TAG, "Creating WifiProvisionService");
+        if (DEBUG) Log.d(TAG, "Creating TetherService");
         String provisionResponse = getResources().getString(
                 com.android.internal.R.string.config_mobile_hotspot_provision_response);
         registerReceiver(mReceiver, new IntentFilter(provisionResponse),
@@ -89,21 +89,28 @@
                 mCurrentTethers.add(type);
             }
         }
+
         if (intent.hasExtra(TetherUtil.EXTRA_REM_TETHER_TYPE)) {
-            int type = intent.getIntExtra(TetherUtil.EXTRA_REM_TETHER_TYPE,
-                    TetherUtil.TETHERING_INVALID);
-            if (DEBUG) Log.d(TAG, "Removing tether " + type);
-            int index = mCurrentTethers.indexOf(type);
-            if (index >= 0) {
-                mCurrentTethers.remove(index);
-                // If we are currently in the middle of a check, we may need to adjust the
-                // index accordingly.
-                if (index <= mCurrentTypeIndex && mCurrentTypeIndex > 0) {
-                    mCurrentTypeIndex--;
+            if (!mInProvisionCheck) {
+                int type = intent.getIntExtra(TetherUtil.EXTRA_REM_TETHER_TYPE,
+                        TetherUtil.TETHERING_INVALID);
+                int index = mCurrentTethers.indexOf(type);
+                if (DEBUG) Log.d(TAG, "Removing tether " + type + ", index " + index);
+                if (index >= 0) {
+                    mCurrentTethers.remove(index);
+                    // If we are currently in the middle of a check, we may need to adjust the
+                    // index accordingly.
+                    if (DEBUG) Log.d(TAG, "mCurrentTypeIndex: " + mCurrentTypeIndex);
+                    if (index <= mCurrentTypeIndex && mCurrentTypeIndex > 0) {
+                        mCurrentTypeIndex--;
+                    }
                 }
+                cancelAlarmIfNecessary();
+            } else {
+                if (DEBUG) Log.d(TAG, "Don't cancel alarm during provisioning");
             }
-            cancelAlarmIfNecessary();
         }
+
         // Only set the alarm if we have one tether, meaning the one just added,
         // to avoid setting it when it was already set previously for another
         // type.
@@ -125,7 +132,7 @@
         }
         // We want to be started if we are killed accidently, so that we can be sure we finish
         // the check.
-        return START_STICKY;
+        return START_REDELIVER_INTENT;
     }
 
     @Override
@@ -137,7 +144,7 @@
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         prefs.edit().putString(KEY_TETHERS, tethersToString(mCurrentTethers)).commit();
 
-        if (DEBUG) Log.d(TAG, "Destroying WifiProvisionService");
+        if (DEBUG) Log.d(TAG, "Destroying TetherService");
         unregisterReceiver(mReceiver);
         super.onDestroy();
     }
@@ -199,15 +206,17 @@
     }
 
     private void startProvisioning(int index) {
-        String provisionAction = getResources().getString(
-                com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui);
-        if (DEBUG) Log.d(TAG, "Sending provisioning broadcast: " + provisionAction + " type: "
-                + mCurrentTethers.get(index));
-        Intent intent = new Intent(provisionAction);
-        intent.putExtra(TETHER_CHOICE, mCurrentTethers.get(index));
-        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        sendBroadcast(intent);
-        mInProvisionCheck = true;
+        if (index < mCurrentTethers.size()) {
+            String provisionAction = getResources().getString(
+                    com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui);
+            if (DEBUG) Log.d(TAG, "Sending provisioning broadcast: " + provisionAction + " type: "
+                    + mCurrentTethers.get(index));
+            Intent intent = new Intent(provisionAction);
+            intent.putExtra(TETHER_CHOICE, mCurrentTethers.get(index));
+            intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+            sendBroadcast(intent);
+            mInProvisionCheck = true;
+        }
     }
 
     public static void scheduleRecheckAlarm(Context context, int type) {
@@ -261,9 +270,14 @@
             if (DEBUG) Log.d(TAG, "Got provision result " + intent);
             String provisionResponse = context.getResources().getString(
                     com.android.internal.R.string.config_mobile_hotspot_provision_response);
+
             if (provisionResponse.equals(intent.getAction())) {
-                mInProvisionCheck = false;
+                if (!mInProvisionCheck) {
+                    Log.e(TAG, "Unexpected provision response " + intent);
+                    return;
+                }
                 int checkType = mCurrentTethers.get(mCurrentTypeIndex);
+                mInProvisionCheck = false;
                 if (intent.getIntExtra(EXTRA_RESULT, RESULT_DEFAULT) == RESULT_OK) {
                     if (checkType == TetherUtil.TETHERING_WIFI && mEnableWifiAfterCheck) {
                         enableWifiTetheringIfNeeded();
@@ -282,7 +296,8 @@
                             break;
                     }
                 }
-                if (++mCurrentTypeIndex == mCurrentTethers.size()) {
+
+                if (++mCurrentTypeIndex >= mCurrentTethers.size()) {
                     // We are done with all checks, time to die.
                     stopSelf();
                 } else {
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index d25d8c3..d2d04ec 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1146,9 +1146,9 @@
         boolean hasPreferred = hasPreferredActivities(pm, packageName)
                 || hasUsbDefaults(usbManager, packageName);
         int status = pm.getIntentVerificationStatus(packageName, UserHandle.myUserId());
+        // consider a visible current link-handling state to be any explicitly designated behavior
         boolean hasDomainURLsPreference =
-                (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) ||
-                (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER);
+                status != PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;
         return context.getString(hasPreferred || hasDomainURLsPreference
                 ? R.string.launch_defaults_some
                 : R.string.launch_defaults_none);
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
index c885b02..6c2f241 100644
--- a/src/com/android/settings/applications/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -17,14 +17,16 @@
 package com.android.settings.applications;
 
 import android.app.AlertDialog;
+import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IntentFilterVerificationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.preference.Preference;
-import android.preference.SwitchPreference;
 import android.util.ArraySet;
 import android.util.Log;
 import android.view.View;
@@ -52,8 +54,17 @@
     private static final String KEY_SUPPORTED_DOMAIN_URLS = "app_launch_supported_domain_urls";
     private static final String KEY_CLEAR_DEFAULTS = "app_launch_clear_defaults";
 
+    private static final Intent sBrowserIntent;
+    static {
+        sBrowserIntent = new Intent()
+                .setAction(Intent.ACTION_VIEW)
+                .addCategory(Intent.CATEGORY_BROWSABLE)
+                .setData(Uri.parse("http:"));
+    }
+
     private PackageManager mPm;
 
+    private boolean mIsBrowser;
     private boolean mHasDomainUrls;
     private DropDownPreference mAppLinkState;
     private AppDomainsPreference mAppDomainUrls;
@@ -64,62 +75,91 @@
         super.onCreate(savedInstanceState);
 
         addPreferencesFromResource(R.xml.installed_app_launch_settings);
+        mAppDomainUrls = (AppDomainsPreference) findPreference(KEY_SUPPORTED_DOMAIN_URLS);
+        mClearDefaultsPreference = (ClearDefaultsPreference) findPreference(KEY_CLEAR_DEFAULTS);
+        mAppLinkState = (DropDownPreference) findPreference(KEY_APP_LINK_STATE);
 
         mPm = getActivity().getPackageManager();
 
+        mIsBrowser = isBrowserApp(mPackageName);
         mHasDomainUrls =
                 (mAppEntry.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS) != 0;
-        List<IntentFilterVerificationInfo> iviList = mPm.getIntentFilterVerifications(mPackageName);
 
-        List<IntentFilter> filters = mPm.getAllIntentFilters(mPackageName);
-
-        mAppDomainUrls = (AppDomainsPreference) findPreference(KEY_SUPPORTED_DOMAIN_URLS);
-        CharSequence[] entries = getEntries(mPackageName, iviList, filters);
-        mAppDomainUrls.setTitles(entries);
-        mAppDomainUrls.setValues(new int[entries.length]);
-
-        mClearDefaultsPreference = (ClearDefaultsPreference) findPreference(KEY_CLEAR_DEFAULTS);
-
+        if (!mIsBrowser) {
+            List<IntentFilterVerificationInfo> iviList = mPm.getIntentFilterVerifications(mPackageName);
+            List<IntentFilter> filters = mPm.getAllIntentFilters(mPackageName);
+            CharSequence[] entries = getEntries(mPackageName, iviList, filters);
+            mAppDomainUrls.setTitles(entries);
+            mAppDomainUrls.setValues(new int[entries.length]);
+        }
         buildStateDropDown();
     }
 
+    // An app is a "browser" if it has an activity resolution that wound up
+    // marked with the 'handleAllWebDataURI' flag.
+    private boolean isBrowserApp(String packageName) {
+        sBrowserIntent.setPackage(packageName);
+        List<ResolveInfo> list = mPm.queryIntentActivitiesAsUser(sBrowserIntent,
+                PackageManager.MATCH_ALL, UserHandle.myUserId());
+        final int count = list.size();
+        for (int i = 0; i < count; i++) {
+            ResolveInfo info = list.get(i);
+            if (info.activityInfo != null && info.handleAllWebDataURI) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void buildStateDropDown() {
-        mAppLinkState = (DropDownPreference) findPreference(KEY_APP_LINK_STATE);
+        if (mIsBrowser) {
+            // Browsers don't show the app-link prefs
+            mAppLinkState.setShouldDisableView(true);
+            mAppLinkState.setEnabled(false);
+            mAppDomainUrls.setShouldDisableView(true);
+            mAppDomainUrls.setEnabled(false);
+        } else {
+            // Designed order of states in the dropdown:
+            //
+            // * always
+            // * ask
+            // * never
+            mAppLinkState.addItem(R.string.app_link_open_always,
+                    INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS);
+            mAppLinkState.addItem(R.string.app_link_open_ask,
+                    INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK);
+            mAppLinkState.addItem(R.string.app_link_open_never,
+                    INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER);
 
-        // Designed order of states in the dropdown:
-        //
-        // * always
-        // * ask
-        // * never
-        mAppLinkState.addItem(R.string.app_link_open_always,
-                INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS);
-        mAppLinkState.addItem(R.string.app_link_open_ask,
-                INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK);
-        mAppLinkState.addItem(R.string.app_link_open_never,
-                INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER);
+            mAppLinkState.setEnabled(mHasDomainUrls);
+            if (mHasDomainUrls) {
+                // Present 'undefined' as 'ask' because the OS treats them identically for
+                // purposes of the UI (and does the right thing around pending domain
+                // verifications that might arrive after the user chooses 'ask' in this UI).
+                final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId());
+                mAppLinkState.setSelectedValue(
+                        (state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED)
+                            ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK
+                            : state);
 
-        mAppLinkState.setEnabled(mHasDomainUrls);
-        if (mHasDomainUrls) {
-            // Present 'undefined' as 'ask' because the OS treats them identically for
-            // purposes of the UI (and does the right thing around pending domain
-            // verifications that might arrive after the user chooses 'ask' in this UI).
-            final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId());
-            mAppLinkState.setSelectedValue(
-                    (state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED)
-                        ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK
-                        : state);
-
-            // Set the callback only after setting the initial selected item
-            mAppLinkState.setCallback(new Callback() {
-                @Override
-                public boolean onItemSelected(int pos, Object value) {
-                    return updateAppLinkState((Integer) value);
-                }
-            });
+                // Set the callback only after setting the initial selected item
+                mAppLinkState.setCallback(new Callback() {
+                    @Override
+                    public boolean onItemSelected(int pos, Object value) {
+                        return updateAppLinkState((Integer) value);
+                    }
+                });
+            }
         }
     }
 
     private boolean updateAppLinkState(final int newState) {
+        if (mIsBrowser) {
+            // We shouldn't get into this state, but if we do make sure
+            // not to cause any permanent mayhem.
+            return false;
+        }
+
         final int userId = UserHandle.myUserId();
         final int priorState = mPm.getIntentVerificationStatus(mPackageName, userId);
 
diff --git a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
index 7cdf7ea..ef743fa 100644
--- a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
+++ b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
@@ -34,11 +34,9 @@
     private static final String TAG = "AppStateWriteSettingsBridge";
     private static final int APP_OPS_OP_CODE = AppOpsManager.OP_WRITE_SETTINGS;
     private static final String PM_WRITE_SETTINGS = Manifest.permission.WRITE_SETTINGS;
-    private static final String PM_CHANGE_NETWORK_STATE = Manifest.permission.CHANGE_NETWORK_STATE;
-    // CHANGE_NETWORK_STATE is now merged with WRITE_SETTINGS
+
     private static final String[] PM_PERMISSIONS = {
-            PM_WRITE_SETTINGS,
-            PM_CHANGE_NETWORK_STATE
+            PM_WRITE_SETTINGS
     };
 
     public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback
diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java
index 8be4be0..bcb6a8a 100644
--- a/src/com/android/settings/applications/ClearDefaultsPreference.java
+++ b/src/com/android/settings/applications/ClearDefaultsPreference.java
@@ -93,9 +93,13 @@
             @Override
             public void onClick(View v) {
                 if (mUsbManager != null) {
+                    final int userId = UserHandle.myUserId();
                     mPm.clearPackagePreferredActivities(mPackageName);
+                    if (isDefaultBrowser(mPackageName)) {
+                        mPm.setDefaultBrowserPackageName(null, userId);
+                    }
                     try {
-                        mUsbManager.clearDefaults(mPackageName, UserHandle.myUserId());
+                        mUsbManager.clearDefaults(mPackageName, userId);
                     } catch (RemoteException e) {
                         Log.e(TAG, "mUsbManager.clearDefaults", e);
                     }
@@ -122,6 +126,7 @@
 
         TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
         boolean autoLaunchEnabled = Utils.hasPreferredActivities(mPm, mPackageName)
+                || isDefaultBrowser(mPackageName)
                 || Utils.hasUsbDefaults(mUsbManager, mPackageName);
         if (!autoLaunchEnabled && !hasBindAppWidgetPermission) {
             resetLaunchDefaultsUi(autoLaunchView);
@@ -165,6 +170,11 @@
         return true;
     }
 
+    private boolean isDefaultBrowser(String packageName) {
+        final String defaultBrowser = mPm.getDefaultBrowserPackageName(UserHandle.myUserId());
+        return packageName.equals(defaultBrowser);
+    }
+
     private void resetLaunchDefaultsUi(TextView autoLaunchView) {
         autoLaunchView.setText(R.string.auto_launch_disable_text);
         // Disable clear activities button
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3a0eee6..74ae90d 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -704,6 +704,10 @@
      * @see android.view.View.OnClickListener#onClick(android.view.View)
      */
     public void onClick(View v) {
+        if (mAppEntry == null) {
+            setIntentAndFinish(true, true);
+            return;
+        }
         String packageName = mAppEntry.info.packageName;
         if(v == mUninstallButton) {
             if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
@@ -961,7 +965,6 @@
             mPermissionReceiver = null;
             final Resources res = getResources();
             CharSequence summary = null;
-            boolean enabled = false;
             if (counts != null) {
                 int totalCount = counts[1];
                 int additionalCounts = counts[2];
@@ -970,8 +973,6 @@
                     summary = res.getString(
                             R.string.runtime_permissions_summary_no_permissions_requested);
                 } else {
-                    enabled = true;
-
                     final ArrayList<CharSequence> list = new ArrayList(Arrays.asList(groupLabels));
                     if (additionalCounts > 0) {
                         // N additional permissions.
@@ -988,7 +989,6 @@
                 }
             }
             mPermissionsPreference.setSummary(summary);
-            mPermissionsPreference.setEnabled(enabled);
         }
     };
 }
diff --git a/src/com/android/settings/applications/ProcStatsData.java b/src/com/android/settings/applications/ProcStatsData.java
index 5dba409..0cd80e7 100644
--- a/src/com/android/settings/applications/ProcStatsData.java
+++ b/src/com/android/settings/applications/ProcStatsData.java
@@ -157,6 +157,9 @@
                 ProcessStats.ALL_SCREEN_ADJ, mMemStates, ProcessStats.NON_CACHED_PROC_STATES);
 
         createPkgMap(getProcs(bgTotals, runTotals), bgTotals, runTotals);
+        if (totalMem.sysMemZRamWeight > 0) {
+            distributeZRam(totalMem.sysMemZRamWeight);
+        }
 
         ProcStatsPackageEntry osPkg = createOsEntry(bgTotals, runTotals, totalMem,
                 mMemInfo.baseCacheRam);
@@ -180,6 +183,45 @@
         }
     }
 
+    private void distributeZRam(double zramWeight) {
+        // Distribute kernel's Z-Ram across processes, based on how much they have been running.
+        // The idea is that the memory used by the kernel for this is not really the kernel's
+        // responsibility, but that of whoever got swapped in to it...  and we will take how
+        // much a process runs for as a sign of the proportion of Z-Ram it is responsible for.
+
+        long zramMem = (long) (zramWeight / memTotalTime);
+        long totalTime = 0;
+        for (int i = pkgEntries.size() - 1; i >= 0; i--) {
+            ProcStatsPackageEntry entry = pkgEntries.get(i);
+            for (int j = entry.mEntries.size() - 1; j >= 0; j--) {
+                ProcStatsEntry proc = entry.mEntries.get(j);
+                totalTime += proc.mRunDuration;
+            }
+        }
+        for (int i = pkgEntries.size() - 1; i >= 0 && totalTime > 0; i--) {
+            ProcStatsPackageEntry entry = pkgEntries.get(i);
+            long pkgRunTime = 0;
+            long maxRunTime = 0;
+            for (int j = entry.mEntries.size() - 1; j >= 0; j--) {
+                ProcStatsEntry proc = entry.mEntries.get(j);
+                pkgRunTime += proc.mRunDuration;
+                if (proc.mRunDuration > maxRunTime) {
+                    maxRunTime = proc.mRunDuration;
+                }
+            }
+            long pkgZRam = (zramMem*pkgRunTime)/totalTime;
+            if (pkgZRam > 0) {
+                zramMem -= pkgZRam;
+                totalTime -= pkgRunTime;
+                ProcStatsEntry procEntry = new ProcStatsEntry(entry.mPackage, 0,
+                        mContext.getString(R.string.process_stats_os_zram), maxRunTime,
+                        pkgZRam, memTotalTime);
+                procEntry.evaluateTargetPackage(mPm, mStats, null, null, sEntryCompare, mUseUss);
+                entry.addEntry(procEntry);
+            }
+        }
+    }
+
     private ProcStatsPackageEntry createOsEntry(ProcessDataCollection bgTotals,
             ProcessDataCollection runTotals, TotalMemoryUseCollection totalMem, long baseCacheRam) {
         // Add in fake entry representing the OS itself.
@@ -188,17 +230,18 @@
         if (totalMem.sysMemNativeWeight > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_native), memTotalTime,
-                    (long) (totalMem.sysMemNativeWeight / memTotalTime));
+                    (long) (totalMem.sysMemNativeWeight / memTotalTime), memTotalTime);
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
         if (totalMem.sysMemKernelWeight > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_kernel), memTotalTime,
-                    (long) (totalMem.sysMemKernelWeight / memTotalTime));
+                    (long) (totalMem.sysMemKernelWeight / memTotalTime), memTotalTime);
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
+        /*  Turned off now -- zram is being distributed across running apps.
         if (totalMem.sysMemZRamWeight > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_zram), memTotalTime,
@@ -206,10 +249,11 @@
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
+        */
         if (baseCacheRam > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_cache), memTotalTime,
-                    baseCacheRam / 1024);
+                    baseCacheRam / 1024, memTotalTime);
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
index 637003c..97a73c4 100644
--- a/src/com/android/settings/applications/ProcStatsEntry.java
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -72,13 +72,14 @@
                 + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);
     }
 
-    public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem) {
+    public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem,
+            long memDuration) {
         mPackage = pkgName;
         mUid = uid;
         mName = procName;
         mBgDuration = mRunDuration = duration;
         mAvgBgMem = mMaxBgMem = mAvgRunMem = mMaxRunMem = mem;
-        mBgWeight = mRunWeight = ((double)duration) * mem;
+        mBgWeight = mRunWeight = ((double)memDuration) * mem;
         if (DEBUG) Log.d(TAG, "New proc entry " + procName + ": dur=" + mBgDuration
                 + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 5b06661..ba1d918 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -65,8 +65,10 @@
             PowerManager powerManager =
                     (PowerManager)context.getSystemService(Context.POWER_SERVICE);
             String deviceAddress = device != null ? device.getAddress() : null;
-            if (powerManager.isScreenOn() &&
-                    LocalBluetoothPreferences.shouldShowDialogInForeground(context, deviceAddress)) {
+            String deviceName = device != null ? device.getName() : null;
+            boolean shouldShowDialog= LocalBluetoothPreferences.shouldShowDialogInForeground(
+                        context, deviceAddress, deviceName);
+            if (powerManager.isInteractive() && shouldShowDialog) {
                 // Since the screen is on and the BT-related activity is in the foreground,
                 // just open the dialog
                 context.startActivity(pairingIntent);
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 074e0bd..fc6b876 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -107,6 +107,7 @@
             connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
 
             String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
+            String deviceName = mDevice != null ? mDevice.getName() : null;
             String title = null;
             String message = null;
             PowerManager powerManager =
@@ -114,7 +115,7 @@
 
             if (powerManager.isScreenOn()
                     && LocalBluetoothPreferences.shouldShowDialogInForeground(
-                            context, deviceAddress)) {
+                            context, deviceAddress, deviceName)) {
                 context.startActivity(connectionAccessIntent);
             } else {
                 // Acquire wakelock so that LCD comes up since screen is off
@@ -134,27 +135,27 @@
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
                         BluetoothDevice.CONNECTION_ACCESS_NO);
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
-                String deviceName = mDevice != null ? mDevice.getAliasName() : null;
+                String deviceAlias = mDevice != null ? mDevice.getAliasName() : null;
                 switch (mRequestType) {
                     case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
                         title = context.getString(R.string.bluetooth_phonebook_request);
                         message = context.getString(R.string.bluetooth_pb_acceptance_dialog_text,
-                                deviceName, deviceName);
+                                deviceAlias, deviceAlias);
                         break;
                     case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
                         title = context.getString(R.string.bluetooth_map_request);
                         message = context.getString(R.string.bluetooth_map_acceptance_dialog_text,
-                                deviceName, deviceName);
+                                deviceAlias, deviceAlias);
                         break;
                     case BluetoothDevice.REQUEST_TYPE_SIM_ACCESS:
                         title = context.getString(R.string.bluetooth_sap_request);
                         message = context.getString(R.string.bluetooth_sap_acceptance_dialog_text,
-                                deviceName, deviceName);
+                                deviceAlias, deviceAlias);
                         break;
                     default:
                         title = context.getString(R.string.bluetooth_connection_permission_request);
                         message = context.getString(R.string.bluetooth_connection_dialog_text,
-                                deviceName, deviceName);
+                                deviceAlias, deviceAlias);
                         break;
                 }
                 Notification notification = new Notification.Builder(context)
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 9f2553f..401b13c 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
@@ -62,10 +63,10 @@
     }
 
     static boolean shouldShowDialogInForeground(Context context,
-            String deviceAddress) {
+            String deviceAddress, String deviceName) {
         LocalBluetoothManager manager = Utils.getLocalBtManager(context);
         if (manager == null) {
-            if(DEBUG) Log.v(TAG, "manager == null - do not show dialog.");
+            if (DEBUG) Log.v(TAG, "manager == null - do not show dialog.");
             return false;
         }
 
@@ -115,6 +116,18 @@
                 }
             }
         }
+
+
+        if (!TextUtils.isEmpty(deviceName)) {
+            // If the device is a custom BT keyboard specifically for this device
+            String packagedKeyboardName = context.getString(
+                    com.android.internal.R.string.config_packagedKeyboardName);
+            if (deviceName.equals(packagedKeyboardName)) {
+                if (DEBUG) Log.v(TAG, "showing dialog for packaged keyboard");
+                return true;
+            }
+        }
+
         if (DEBUG) Log.v(TAG, "Found no reason to show the dialog - do not show dialog.");
         return false;
     }
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index b86f9c6..b52a0ad 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -205,8 +205,10 @@
             removePreferenceFromScreen(KEY_SERIAL_NUMBER);
         }
 
-        //Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
-        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
+        // Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
+        // Also remove on Wi-Fi only devices.
+        if (UserHandle.myUserId() != UserHandle.USER_OWNER
+                || Utils.isWifiOnly(this)) {
             removePreferenceFromScreen(KEY_SIM_STATUS);
             removePreferenceFromScreen(KEY_IMEI_INFO);
         }
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
index 6f89ff5..6f73ecd 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
@@ -137,6 +137,10 @@
         @Override
         protected void onPostExecute(Exception e) {
             final StorageWizardFormatProgress activity = mActivity;
+            if (activity.isDestroyed()) {
+                return;
+            }
+
             if (e != null) {
                 Log.e(TAG, "Failed to partition", e);
                 Toast.makeText(activity, e.getMessage(), Toast.LENGTH_LONG).show();
diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
new file mode 100644
index 0000000..210e0a0
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -0,0 +1,153 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbManager;
+import android.hardware.usb.UsbPort;
+import android.hardware.usb.UsbPortStatus;
+import android.os.UserManager;
+
+public class UsbBackend {
+
+    private static final int MODE_POWER_MASK  = 0x01;
+    public static final int MODE_POWER_SINK   = 0x00;
+    public static final int MODE_POWER_SOURCE = 0x01;
+
+    private static final int MODE_DATA_MASK  = 0x03 << 1;
+    public static final int MODE_DATA_NONE   = 0x00 << 1;
+    public static final int MODE_DATA_MTP    = 0x01 << 1;
+    public static final int MODE_DATA_PTP    = 0x02 << 1;
+    public static final int MODE_DATA_MIDI   = 0x03 << 1;
+
+    private final boolean mRestricted;
+
+    private UserManager mUserManager;
+    private UsbManager mUsbManager;
+    private UsbPort mPort;
+    private UsbPortStatus mPortStatus;
+
+    private boolean mIsUnlocked;
+
+    public UsbBackend(Context context) {
+        Intent intent = context.registerReceiver(null,
+                new IntentFilter(UsbManager.ACTION_USB_STATE));
+        mIsUnlocked = intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
+
+        mUserManager = UserManager.get(context);
+        mUsbManager = context.getSystemService(UsbManager.class);
+
+        mRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
+        UsbPort[] ports = mUsbManager.getPorts();
+        // For now look for a connected port, in the future we should identify port in the
+        // notification and pick based on that.
+        final int N = ports.length;
+        for (int i = 0; i < N; i++) {
+            UsbPortStatus status = mUsbManager.getPortStatus(ports[i]);
+            if (status.isConnected()) {
+                mPort = ports[i];
+                mPortStatus = status;
+                break;
+            }
+        }
+    }
+
+    public int getCurrentMode() {
+        if (mPort != null) {
+            int power = mPortStatus.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE
+                    ? MODE_POWER_SOURCE : MODE_POWER_SINK;
+            return power | getUsbDataMode();
+        }
+        return MODE_POWER_SINK | getUsbDataMode();
+    }
+
+    public int getUsbDataMode() {
+        if (!mIsUnlocked) {
+            return MODE_DATA_NONE;
+        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
+            return MODE_DATA_MTP;
+        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) {
+            return MODE_DATA_PTP;
+        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MIDI)) {
+            return MODE_DATA_MIDI;
+        }
+        return MODE_DATA_NONE; // ...
+    }
+
+    private void setUsbFunction(int mode) {
+        switch (mode) {
+            case MODE_DATA_MTP:
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
+                mUsbManager.setUsbDataUnlocked(true);
+                break;
+            case MODE_DATA_PTP:
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP);
+                mUsbManager.setUsbDataUnlocked(true);
+                break;
+            case MODE_DATA_MIDI:
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI);
+                mUsbManager.setUsbDataUnlocked(true);
+                break;
+            default:
+                mUsbManager.setCurrentFunction(null);
+                mUsbManager.setUsbDataUnlocked(false);
+                break;
+        }
+    }
+
+    public void setMode(int mode) {
+        if (mPort != null) {
+            int powerRole = modeToPower(mode);
+            // If we aren't using any data modes and we support host mode, then go to host mode
+            // so maybe? the other device can provide data if it wants, otherwise go into device
+            // mode because we have no choice.
+            int dataRole = (mode & MODE_DATA_MASK) == MODE_DATA_NONE
+                    && mPortStatus.isRoleCombinationSupported(powerRole, UsbPort.DATA_ROLE_HOST)
+                    ? UsbPort.DATA_ROLE_HOST : UsbPort.DATA_ROLE_DEVICE;
+            mUsbManager.setPortRoles(mPort, powerRole, dataRole);
+        }
+        setUsbFunction(mode & MODE_DATA_MASK);
+    }
+
+    private int modeToPower(int mode) {
+        return (mode & MODE_POWER_MASK) == MODE_POWER_SOURCE
+                    ? UsbPort.POWER_ROLE_SOURCE : UsbPort.POWER_ROLE_SINK;
+    }
+
+    public boolean isModeSupported(int mode) {
+        if (mRestricted && (mode & MODE_DATA_MASK) != MODE_DATA_NONE
+                && (mode & MODE_DATA_MASK) != MODE_DATA_MIDI) {
+            // No USB data modes are supported.
+            return false;
+        }
+        if (mPort != null) {
+            int power = modeToPower(mode);
+            if ((mode & MODE_DATA_MASK) != 0) {
+                // We have a port and data, need to be in device mode.
+                return mPortStatus.isRoleCombinationSupported(power,
+                        UsbPort.DATA_ROLE_DEVICE);
+            } else {
+                // No data needed, we can do this power mode in either device or host.
+                return mPortStatus.isRoleCombinationSupported(power, UsbPort.DATA_ROLE_DEVICE)
+                        || mPortStatus.isRoleCombinationSupported(power, UsbPort.DATA_ROLE_HOST);
+            }
+        }
+        // No port, support sink modes only.
+        return (mode & MODE_POWER_MASK) != MODE_POWER_SOURCE;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index 4bdabd5..77fc388 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -20,13 +20,14 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.hardware.usb.UsbManager;
 import android.os.Bundle;
-import android.os.UserManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Checkable;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.android.settings.R;
 
@@ -36,83 +37,102 @@
  */
 public class UsbModeChooserActivity extends Activity {
 
-    private UsbManager mUsbManager;
-    private String[] mFunctions;
-    private boolean mIsUnlocked;
+    public static final int[] DEFAULT_MODES = {
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE,
+        UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE,
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP,
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP,
+        UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI
+    };
+
+    private UsbBackend mBackend;
+    private AlertDialog mDialog;
+    private LayoutInflater mLayoutInflater;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        Intent i = getBaseContext().registerReceiver(null, new IntentFilter(UsbManager.ACTION_USB_STATE));
-        mIsUnlocked = i.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
 
         super.onCreate(savedInstanceState);
-        mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
-        boolean isFileTransferRestricted = ((UserManager) getSystemService(Context.USER_SERVICE))
-                .hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
-        CharSequence[] items;
-        if (isFileTransferRestricted) {
-            items = new CharSequence[] { getText(R.string.usb_use_charging_only), getText(R.string.usb_use_MIDI)};
-            mFunctions = new String[] { null, UsbManager.USB_FUNCTION_MIDI };
-        } else {
-            items = new CharSequence[] {
-                    getText(R.string.usb_use_charging_only), getText(R.string.usb_use_file_transfers),
-                    getText(R.string.usb_use_photo_transfers), getText(R.string.usb_use_MIDI)};
-            mFunctions = new String[] { null, UsbManager.USB_FUNCTION_MTP,
-                    UsbManager.USB_FUNCTION_PTP, UsbManager.USB_FUNCTION_MIDI };
-        }
 
-        final AlertDialog levelDialog;
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.usb_use);
+        mLayoutInflater = LayoutInflater.from(this);
 
-        builder.setSingleChoiceItems(items, getCurrentFunction(),
-                new DialogInterface.OnClickListener() {
+        mDialog = new AlertDialog.Builder(this)
+                .setTitle(R.string.usb_use)
+                .setView(R.layout.usb_dialog_container)
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        finish();
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        if (!ActivityManager.isUserAMonkey()) {
-                            setCurrentFunction(which);
-                        }
-                        dialog.dismiss();
-                        UsbModeChooserActivity.this.finish();
+                        finish();
                     }
-                });
-        builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                UsbModeChooserActivity.this.finish();
+                }).create();
+        mDialog.show();
+
+        LinearLayout container = (LinearLayout) mDialog.findViewById(R.id.container);
+
+        mBackend = new UsbBackend(this);
+        int current = mBackend.getCurrentMode();
+        for (int i = 0; i < DEFAULT_MODES.length; i++) {
+            if (mBackend.isModeSupported(DEFAULT_MODES[i])) {
+                inflateOption(DEFAULT_MODES[i], current == DEFAULT_MODES[i], container);
             }
-        });
-        builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                UsbModeChooserActivity.this.finish();
-            }
-        });
-        levelDialog = builder.create();
-        levelDialog.show();
+        }
     }
 
-    private int getCurrentFunction() {
-        if (!mIsUnlocked) {
-            return 0;
-        }
+    private void inflateOption(final int mode, boolean selected, LinearLayout container) {
+        View v = mLayoutInflater.inflate(R.layout.radio_with_summary, container, false);
 
-        for (int i = 1; i < mFunctions.length; i++) {
-            if (mUsbManager.isFunctionEnabled(mFunctions[i])) {
-                return i;
+        ((TextView) v.findViewById(android.R.id.title)).setText(getTitle(mode));
+        ((TextView) v.findViewById(android.R.id.summary)).setText(getSummary(mode));
+
+        v.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!ActivityManager.isUserAMonkey()) {
+                    mBackend.setMode(mode);
+                }
+                mDialog.dismiss();
+                finish();
             }
+        });
+        ((Checkable) v).setChecked(selected);
+        container.addView(v);
+    }
+
+    private static int getSummary(int mode) {
+        switch (mode) {
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_charging_only_desc;
+            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_power_only_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
+                return R.string.usb_use_file_transfers_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
+                return R.string.usb_use_photo_transfers_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
+                return R.string.usb_use_MIDI_desc;
         }
         return 0;
     }
 
-    private void setCurrentFunction(int which) {
-        if (which == 0) {
-            mUsbManager.setCurrentFunction(null);
-            mUsbManager.setUsbDataUnlocked(false);
-            return;
+    private static int getTitle(int mode) {
+        switch (mode) {
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_charging_only;
+            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_power_only;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
+                return R.string.usb_use_file_transfers;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
+                return R.string.usb_use_photo_transfers;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
+                return R.string.usb_use_MIDI;
         }
-
-        mUsbManager.setCurrentFunction(mFunctions[which]);
-        mUsbManager.setUsbDataUnlocked(true);
+        return 0;
     }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
index 430f220..d164800 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -28,6 +28,7 @@
 import android.widget.TextView;
 
 import com.android.settings.ChooseLockSettingsHelper;
+import com.android.settings.InstrumentedActivity;
 import com.android.settings.R;
 import com.android.setupwizardlib.SetupWizardLayout;
 import com.android.setupwizardlib.view.NavigationBar;
@@ -35,24 +36,11 @@
 /**
  * Base activity for all fingerprint enrollment steps.
  */
-public class FingerprintEnrollBase extends Activity implements View.OnClickListener {
-
-    /**
-     * Used by the choose fingerprint wizard to indicate the wizard is
-     * finished, and each activity in the wizard should finish.
-     * <p>
-     * Previously, each activity in the wizard would finish itself after
-     * starting the next activity. However, this leads to broken 'Back'
-     * behavior. So, now an activity does not finish itself until it gets this
-     * result.
-     */
-    protected static final int RESULT_FINISHED = RESULT_FIRST_USER;
-
-    /**
-     * Used by the enrolling screen during setup wizard to skip over setting up fingerprint, which
-     * will be useful if the user accidentally entered this flow.
-     */
-    protected static final int RESULT_SKIP = RESULT_FIRST_USER + 1;
+public abstract class FingerprintEnrollBase extends InstrumentedActivity
+        implements View.OnClickListener {
+    static final int RESULT_FINISHED = FingerprintSettings.RESULT_FINISHED;
+    static final int RESULT_SKIP = FingerprintSettings.RESULT_SKIP;
+    static final int RESULT_TIMEOUT = FingerprintSettings.RESULT_TIMEOUT;
 
     protected byte[] mToken;
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 5d4edbd..fe0bb63 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -20,6 +20,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -29,6 +30,7 @@
 import android.graphics.drawable.Animatable2;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
+import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
@@ -38,6 +40,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 
@@ -244,9 +247,22 @@
     }
 
     @Override
-    public void onEnrollmentError(CharSequence errString) {
-        showError(errString);
+    public void onEnrollmentError(int errMsgId, CharSequence errString) {
+        int msgId;
+        switch (errMsgId) {
+            case FingerprintManager.FINGERPRINT_ERROR_TIMEOUT:
+                // This message happens when the underlying crypto layer decides to revoke the
+                // enrollment auth token.
+                msgId = R.string.security_settings_fingerprint_enroll_error_timeout_dialog_message;
+                break;
+            default:
+                // There's nothing specific to tell the user about. Ask them to try again.
+                msgId = R.string.security_settings_fingerprint_enroll_error_generic_dialog_message;
+                break;
+        }
+        showErrorDialog(getText(msgId), errMsgId);
         stopIconAnimation();
+        mErrorText.removeCallbacks(mTouchAgainRunnable);
     }
 
     @Override
@@ -277,6 +293,11 @@
         return PROGRESS_BAR_MAX * progress / (steps + 1);
     }
 
+    private void showErrorDialog(CharSequence msg, int msgId) {
+        ErrorDialog dlg = ErrorDialog.newInstance(msg, msgId);
+        dlg.show(getFragmentManager(), ErrorDialog.class.getName());
+    }
+
     private void showIconTouchDialog() {
         mIconTouchCount = 0;
         new IconTouchDialog().show(getFragmentManager(), null /* tag */);
@@ -380,6 +401,11 @@
         }
     };
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLLING;
+    }
+
     public static class IconTouchDialog extends DialogFragment {
 
         @Override
@@ -397,4 +423,49 @@
             return builder.create();
         }
     }
+
+    public static class ErrorDialog extends DialogFragment {
+
+        /**
+         * Create a new instance of ErrorDialog.
+         *
+         * @param msg the string to show for message text
+         * @param msgId the FingerprintManager error id so we know the cause
+         * @return a new ErrorDialog
+         */
+        static ErrorDialog newInstance(CharSequence msg, int msgId) {
+            ErrorDialog dlg = new ErrorDialog();
+            Bundle args = new Bundle();
+            args.putCharSequence("error_msg", msg);
+            args.putInt("error_id", msgId);
+            dlg.setArguments(args);
+            return dlg;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            CharSequence errorString = getArguments().getCharSequence("error_msg");
+            final int errMsgId = getArguments().getInt("error_id");
+            builder.setTitle(R.string.security_settings_fingerprint_enroll_error_dialog_title)
+                    .setMessage(errorString)
+                    .setCancelable(false)
+                    .setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    dialog.dismiss();
+                                    boolean wasTimeout =
+                                        errMsgId == FingerprintManager.FINGERPRINT_ERROR_TIMEOUT;
+                                    Activity activity = getActivity();
+                                    activity.setResult(wasTimeout ?
+                                            RESULT_TIMEOUT : RESULT_FINISHED);
+                                    activity.finish();
+                                }
+                            });
+            AlertDialog dialog = builder.create();
+            dialog.setCanceledOnTouchOutside(false);
+            return dialog;
+        }
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index bbed42c..63d9335 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -16,11 +16,11 @@
 
 package com.android.settings.fingerprint;
 
-import android.content.Context;
 import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 
@@ -31,15 +31,19 @@
 
     private static final int CONFIRM_REQUEST = 1;
     private static final int ENROLLING = 2;
+    public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
 
     private FingerprintLocationAnimationView mAnimation;
+    private boolean mLaunchedConfirmLock;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fingerprint_enroll_find_sensor);
         setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
-        if (mToken == null) {
+        mLaunchedConfirmLock = savedInstanceState != null && savedInstanceState.getBoolean(
+                EXTRA_KEY_LAUNCHED_CONFIRM);
+        if (mToken == null && !mLaunchedConfirmLock) {
             launchConfirmLock();
         }
         mAnimation = (FingerprintLocationAnimationView) findViewById(
@@ -59,6 +63,12 @@
     }
 
     @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(EXTRA_KEY_LAUNCHED_CONFIRM, mLaunchedConfirmLock);
+    }
+
+    @Override
     protected void onNextButtonClick() {
         startActivityForResult(getEnrollingIntent(), ENROLLING);
     }
@@ -79,6 +89,9 @@
             } else if (resultCode == RESULT_SKIP) {
                 setResult(RESULT_SKIP);
                 finish();
+            } else if (resultCode == RESULT_TIMEOUT) {
+                setResult(RESULT_TIMEOUT);
+                finish();
             } else {
                 FingerprintManager fpm = getSystemService(FingerprintManager.class);
                 int enrolled = fpm.getEnrolledFingerprints().size();
@@ -103,6 +116,13 @@
             // This shouldn't happen, as we should only end up at this step if a lock thingy is
             // already set.
             finish();
+        } else {
+            mLaunchedConfirmLock = true;
         }
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_FIND_SENSOR;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
index 29f14d7..6691e20 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
@@ -25,6 +25,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
 
@@ -70,4 +71,9 @@
         }
         super.onClick(v);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_FINISH;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index cb1300f..bc2757a 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -23,6 +23,7 @@
 import android.provider.Settings.Global;
 import android.view.View;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.HelpUtils;
 import com.android.settings.R;
@@ -99,4 +100,9 @@
             startActivity(helpIntent);
         }
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_INTRO;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
index e81b0ff..0990459 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
@@ -21,6 +21,7 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
@@ -82,4 +83,9 @@
     protected Intent getFindSensorIntent() {
         return new Intent(this, FingerprintEnrollFindSensor.class);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index 6a47dc4..5feb08c 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -24,12 +24,14 @@
 import android.os.CancellationSignal;
 import android.os.Handler;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
+import com.android.settings.InstrumentedFragment;
 
 /**
  * Sidecar fragment to handle the state around fingerprint enrollment.
  */
-public class FingerprintEnrollSidecar extends Fragment {
+public class FingerprintEnrollSidecar extends InstrumentedFragment {
 
     private int mEnrollmentSteps = -1;
     private int mEnrollmentRemaining = 0;
@@ -128,7 +130,7 @@
         @Override
         public void onEnrollmentError(int errMsgId, CharSequence errString) {
             if (mListener != null) {
-                mListener.onEnrollmentError(errString);
+                mListener.onEnrollmentError(errMsgId, errString);
             }
         }
     };
@@ -140,9 +142,14 @@
         }
     };
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_SIDECAR;
+    }
+
     public interface Listener {
         void onEnrollmentHelp(CharSequence helpString);
-        void onEnrollmentError(CharSequence errString);
+        void onEnrollmentError(int errMsgId, CharSequence errString);
         void onEnrollmentProgressChange(int steps, int remaining);
     }
 }
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index a5c9963..cacd5dd 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -70,8 +70,9 @@
  * Settings screen for fingerprints
  */
 public class FingerprintSettings extends SubSettings {
+
     /**
-     * Used by the FP settings wizard to indicate the wizard is
+     * Used by the choose fingerprint wizard to indicate the wizard is
      * finished, and each activity in the wizard should finish.
      * <p>
      * Previously, each activity in the wizard would finish itself after
@@ -79,7 +80,21 @@
      * behavior. So, now an activity does not finish itself until it gets this
      * result.
      */
-    static final int RESULT_FINISHED = RESULT_FIRST_USER;
+    protected static final int RESULT_FINISHED = RESULT_FIRST_USER;
+
+    /**
+     * Used by the enrolling screen during setup wizard to skip over setting up fingerprint, which
+     * will be useful if the user accidentally entered this flow.
+     */
+    protected static final int RESULT_SKIP = RESULT_FIRST_USER + 1;
+
+    /**
+     * Like {@link #RESULT_FINISHED} except this one indicates enrollment failed because the
+     * device was left idle. This is used to clear the credential token to require the user to
+     * re-enter their pin/pattern/password before continuing.
+     */
+    protected static final int RESULT_TIMEOUT = RESULT_FIRST_USER + 2;
+
     private static final long LOCKOUT_DURATION = 30000; // time we have to wait for fp to reset, ms
 
     @Override
@@ -181,6 +196,7 @@
                     case MSG_REFRESH_FINGERPRINT_TEMPLATES:
                         removeFingerprintPreference(msg.arg1);
                         updateAddPreference();
+                        retryFingerprint();
                     break;
                     case MSG_FINGER_AUTH_SUCCESS:
                         mFingerprintCancel = null;
@@ -440,6 +456,12 @@
                                 ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                     }
                 }
+            } else if (requestCode == ADD_FINGERPRINT_REQUEST) {
+                if (resultCode == RESULT_TIMEOUT) {
+                    Activity activity = getActivity();
+                    activity.setResult(RESULT_TIMEOUT);
+                    activity.finish();
+                }
             }
 
             if (mToken == null) {
@@ -480,10 +502,10 @@
                 highlight.setHotspot(centerX, centerY);
                 view.setBackground(highlight);
                 view.setPressed(true);
+                view.setPressed(false);
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        view.setPressed(false);
                         view.setBackground(null);
                     }
                 }, RESET_HIGHLIGHT_DELAY_MS);
@@ -556,6 +578,9 @@
                                             if (DEBUG) {
                                                 Log.v(TAG, "rename " + name + " to " + newName);
                                             }
+                                            MetricsLogger.action(getContext(),
+                                                    MetricsLogger.ACTION_FINGERPRINT_RENAME,
+                                                    mFp.getFingerId());
                                             FingerprintSettingsFragment parent
                                                     = (FingerprintSettingsFragment)
                                                     getTargetFragment();
@@ -598,6 +623,8 @@
 
             private void onDeleteClick(DialogInterface dialog) {
                 if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId());
+                MetricsLogger.action(getContext(), MetricsLogger.ACTION_FINGERPRINT_DELETE,
+                        mFp.getFingerId());
                 FingerprintSettingsFragment parent
                         = (FingerprintSettingsFragment) getTargetFragment();
                 if (parent.mFingerprintManager.getEnrolledFingerprints().size() > 1) {
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index fc7b803..b57bb8d 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -16,18 +16,29 @@
 
 package com.android.settings.fingerprint;
 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.setupwizardlib.util.SystemBarHelper;
 import com.android.setupwizardlib.view.NavigationBar;
 
 public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
         implements NavigationBar.NavigationBarListener {
 
+    private static final String TAG_DIALOG = "dialog";
+
     @Override
     protected Intent getFinishIntent() {
         final Intent intent = new Intent(this, SetupFingerprintEnrollFinish.class);
@@ -68,7 +79,53 @@
 
     @Override
     public void onNavigateNext() {
-        setResult(RESULT_SKIP);
-        finish();
+        new SkipDialog().show(getFragmentManager(), TAG_DIALOG);
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLLING_SETUP;
+    }
+
+    public static class SkipDialog extends DialogFragment {
+
+        @Override
+        public void show(FragmentManager manager, String tag) {
+            if (manager.findFragmentByTag(tag) == null) {
+                super.show(manager, tag);
+            }
+        }
+
+        public SkipDialog() {
+            // no-arg constructor for fragment
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.setup_fingerprint_enroll_enrolling_skip_title)
+                    .setMessage(R.string.setup_fingerprint_enroll_enrolling_skip_message)
+                    .setCancelable(false)
+                    .setPositiveButton(R.string.wifi_skip_anyway,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    Activity activity = getActivity();
+                                    if (activity != null) {
+                                        activity.setResult(RESULT_SKIP);
+                                        activity.finish();
+                                    }
+                                }
+                            })
+                    .setNegativeButton(R.string.wifi_dont_skip,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                }
+                            })
+                    .create();
+            SystemBarHelper.hideSystemBars(dialog);
+            return dialog;
+        }
     }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index 17c0671..1483c83 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -21,6 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
@@ -70,4 +71,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_FIND_SENSOR_SETUP;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
index 351cd57..8f37a11 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
@@ -22,6 +22,7 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
@@ -78,4 +79,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_FINISH_SETUP;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index 416d53f..c7e39e5 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -21,6 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.setupwizardlib.view.NavigationBar;
@@ -74,4 +75,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_INTRO_SETUP;
+    }
 }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
index bee0cde..7fca35a 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
@@ -21,6 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SetupChooseLockGeneric;
 import com.android.settings.SetupWizardUtils;
@@ -75,4 +76,9 @@
     public void onNavigateNext() {
         onNextButtonClick();
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD_SETUP;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index aaa30a2..7fd66c5 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -246,7 +246,7 @@
     }
 
     @Override
-    public long getTimeAtCpuSpeed(int step, int which) {
+    public long getTimeAtCpuSpeed(int cluster, int step, int which) {
         return 0;
     }
 
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 2901673..587f41c 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -56,7 +56,10 @@
         // The following will get the EXTRA_WORD and EXTRA_LOCALE fields that are in the intent.
         // We do need to add the action by hand, because UserDictionaryAddWordContents expects
         // it to be in the bundle, in the EXTRA_MODE key.
-        final Bundle args = intent.getExtras();
+        Bundle args = intent.getExtras();
+        if (args == null) {
+            args = new Bundle();
+        }
         args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, mode);
 
         if (null != savedInstanceState) {
@@ -74,6 +77,7 @@
 
     private void reportBackToCaller(final int resultCode, final Bundle result) {
         final Intent senderIntent = getIntent();
+        if (senderIntent.getExtras() == null) return;
         final Object listener = senderIntent.getExtras().get("listener");
         if (!(listener instanceof Messenger)) return; // This will work if listener is null too.
         final Messenger messenger = (Messenger)listener;
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index 12bb6ef..e11f564 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -233,7 +233,8 @@
     private void handlePackageAvailable(String packageName) {
         if (!mAccessibilityServices.contains(packageName)) {
             final Intent intent = getAccessibilityServiceIntent(packageName);
-            if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+            List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+            if (services != null && !services.isEmpty()) {
                 mAccessibilityServices.add(packageName);
                 Index.getInstance(mContext).updateFromClassNameResource(
                         AccessibilitySettings.class.getName(), false, true);
@@ -243,7 +244,8 @@
         if (mHasFeaturePrinting) {
             if (!mPrintServices.contains(packageName)) {
                 final Intent intent = getPrintServiceIntent(packageName);
-                if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+                List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+                if (services != null && !services.isEmpty()) {
                     mPrintServices.add(packageName);
                     Index.getInstance(mContext).updateFromClassNameResource(
                             PrintSettingsFragment.class.getName(), false, true);
@@ -254,7 +256,8 @@
         if (mHasFeatureIme) {
             if (!mImeServices.contains(packageName)) {
                 Intent intent = getIMEServiceIntent(packageName);
-                if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+                List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+                if (services != null && !services.isEmpty()) {
                     mImeServices.add(packageName);
                     Index.getInstance(mContext).updateFromClassNameResource(
                             InputMethodAndLanguageSettings.class.getName(), false, true);
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 80f9fcd..a6189a9 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.vpn2;
 
+import java.util.Arrays;
+
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.Context;
@@ -123,7 +125,18 @@
             disconnect(profile);
 
             // Delete from KeyStore
-            KeyStore.getInstance().delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);
+            KeyStore keyStore = KeyStore.getInstance();
+            keyStore.delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);
+
+            // If this was the current lockdown VPN, clear it.
+            if (Arrays.equals(profile.key.getBytes(), keyStore.get(Credentials.LOCKDOWN_VPN))) {
+                keyStore.delete(Credentials.LOCKDOWN_VPN);
+                try {
+                    mService.updateLockdownVpn();
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Failed to clear lockdown VPN configuration");
+                }
+            }
         }
         dismiss();
     }
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index cc9acd6..6fb805b 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -22,6 +22,7 @@
 import android.content.res.Resources;
 import android.net.NetworkPolicy;
 import android.net.NetworkStatsHistory;
+import android.net.TrafficStats;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Spannable;
@@ -33,6 +34,7 @@
 import android.text.format.Time;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.MathUtils;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -535,6 +537,7 @@
 
         @Override
         public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+            value = MathUtils.constrain(value, 0, TrafficStats.TB_IN_BYTES);
             final BytesResult result = Formatter.formatBytes(res, value,
                     Formatter.FLAG_SHORTER | Formatter.FLAG_CALCULATE_ROUNDED);
             setText(builder, sSpanSize, result.value, "^1");
diff --git a/src/com/android/settings/widget/ExploreByTouchHelper.java b/src/com/android/settings/widget/ExploreByTouchHelper.java
new file mode 100644
index 0000000..b64a74c
--- /dev/null
+++ b/src/com/android/settings/widget/ExploreByTouchHelper.java
@@ -0,0 +1,724 @@
+/*
+ * Copyright (C) 2013 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.widget;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewParent;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeProvider;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Copied from setup wizard, which is in turn a modified copy of
+ * com.android.internal.ExploreByTouchHelper with the following modifications:
+ *
+ * - Make accessibility calls to the views, instead of to the accessibility delegate directly to
+ *   make sure those methods for View subclasses are called.
+ *
+ * ExploreByTouchHelper is a utility class for implementing accessibility
+ * support in custom {@link android.view.View}s that represent a collection of View-like
+ * logical items. It extends {@link android.view.accessibility.AccessibilityNodeProvider} and
+ * simplifies many aspects of providing information to accessibility services
+ * and managing accessibility focus. This class does not currently support
+ * hierarchies of logical items.
+ * <p>
+ * This should be applied to the parent view using
+ * {@link android.view.View#setAccessibilityDelegate}:
+ *
+ * <pre>
+ * mAccessHelper = ExploreByTouchHelper.create(someView, mAccessHelperCallback);
+ * ViewCompat.setAccessibilityDelegate(someView, mAccessHelper);
+ * </pre>
+ */
+public abstract class ExploreByTouchHelper extends View.AccessibilityDelegate {
+    /** Virtual node identifier value for invalid nodes. */
+    public static final int INVALID_ID = Integer.MIN_VALUE;
+
+    /** Default class name used for virtual views. */
+    private static final String DEFAULT_CLASS_NAME = View.class.getName();
+
+    // Temporary, reusable data structures.
+    private final Rect mTempScreenRect = new Rect();
+    private final Rect mTempParentRect = new Rect();
+    private final Rect mTempVisibleRect = new Rect();
+    private final int[] mTempGlobalRect = new int[2];
+
+    /** View's context **/
+    private Context mContext;
+
+    /** System accessibility manager, used to check state and send events. */
+    private final AccessibilityManager mManager;
+
+    /** View whose internal structure is exposed through this helper. */
+    private final View mView;
+
+    /** Node provider that handles creating nodes and performing actions. */
+    private ExploreByTouchNodeProvider mNodeProvider;
+
+    /** Virtual view id for the currently focused logical item. */
+    private int mFocusedVirtualViewId = INVALID_ID;
+
+    /** Virtual view id for the currently hovered logical item. */
+    private int mHoveredVirtualViewId = INVALID_ID;
+
+    /**
+     * Factory method to create a new {@link com.google.android.setupwizard.util.ExploreByTouchHelper}.
+     *
+     * @param forView View whose logical children are exposed by this helper.
+     */
+    public ExploreByTouchHelper(View forView) {
+        if (forView == null) {
+            throw new IllegalArgumentException("View may not be null");
+        }
+
+        mView = forView;
+        mContext = forView.getContext();
+        mManager = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
+    }
+
+    /**
+     * Returns the {@link android.view.accessibility.AccessibilityNodeProvider} for this helper.
+     *
+     * @param host View whose logical children are exposed by this helper.
+     * @return The accessibility node provider for this helper.
+     */
+    @Override
+    public AccessibilityNodeProvider getAccessibilityNodeProvider(View host) {
+        if (mNodeProvider == null) {
+            mNodeProvider = new ExploreByTouchNodeProvider();
+        }
+        return mNodeProvider;
+    }
+
+    /**
+     * Dispatches hover {@link android.view.MotionEvent}s to the virtual view hierarchy when
+     * the Explore by Touch feature is enabled.
+     * <p>
+     * This method should be called by overriding
+     * {@link android.view.View#dispatchHoverEvent}:
+     *
+     * <pre>&#64;Override
+     * public boolean dispatchHoverEvent(MotionEvent event) {
+     *   if (mHelper.dispatchHoverEvent(this, event) {
+     *     return true;
+     *   }
+     *   return super.dispatchHoverEvent(event);
+     * }
+     * </pre>
+     *
+     * @param event The hover event to dispatch to the virtual view hierarchy.
+     * @return Whether the hover event was handled.
+     */
+    public boolean dispatchHoverEvent(MotionEvent event) {
+        if (!mManager.isEnabled() || !mManager.isTouchExplorationEnabled()) {
+            return false;
+        }
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_HOVER_MOVE:
+            case MotionEvent.ACTION_HOVER_ENTER:
+                final int virtualViewId = getVirtualViewAt(event.getX(), event.getY());
+                updateHoveredVirtualView(virtualViewId);
+                return (virtualViewId != INVALID_ID);
+            case MotionEvent.ACTION_HOVER_EXIT:
+                if (mFocusedVirtualViewId != INVALID_ID) {
+                    updateHoveredVirtualView(INVALID_ID);
+                    return true;
+                }
+                return false;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Populates an event of the specified type with information about an item
+     * and attempts to send it up through the view hierarchy.
+     * <p>
+     * You should call this method after performing a user action that normally
+     * fires an accessibility event, such as clicking on an item.
+     *
+     * <pre>public void performItemClick(T item) {
+     *   ...
+     *   sendEventForVirtualViewId(item.id, AccessibilityEvent.TYPE_VIEW_CLICKED);
+     * }
+     * </pre>
+     *
+     * @param virtualViewId The virtual view id for which to send an event.
+     * @param eventType The type of event to send.
+     * @return true if the event was sent successfully.
+     */
+    public boolean sendEventForVirtualView(int virtualViewId, int eventType) {
+        if ((virtualViewId == INVALID_ID) || !mManager.isEnabled()) {
+            return false;
+        }
+
+        final ViewParent parent = mView.getParent();
+        if (parent == null) {
+            return false;
+        }
+
+        final AccessibilityEvent event = createEvent(virtualViewId, eventType);
+        return parent.requestSendAccessibilityEvent(mView, event);
+    }
+
+    /**
+     * Notifies the accessibility framework that the properties of the parent
+     * view have changed.
+     * <p>
+     * You <b>must</b> call this method after adding or removing items from the
+     * parent view.
+     */
+    public void invalidateRoot() {
+        invalidateVirtualView(View.NO_ID);
+    }
+
+    /**
+     * Notifies the accessibility framework that the properties of a particular
+     * item have changed.
+     * <p>
+     * You <b>must</b> call this method after changing any of the properties set
+     * in {@link #onPopulateNodeForVirtualView}.
+     *
+     * @param virtualViewId The virtual view id to invalidate.
+     */
+    public void invalidateVirtualView(int virtualViewId) {
+        sendEventForVirtualView(virtualViewId, AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
+    }
+
+    /**
+     * Returns the virtual view id for the currently focused item,
+     *
+     * @return A virtual view id, or {@link #INVALID_ID} if no item is
+     *         currently focused.
+     */
+    public int getFocusedVirtualView() {
+        return mFocusedVirtualViewId;
+    }
+
+    /**
+     * Sets the currently hovered item, sending hover accessibility events as
+     * necessary to maintain the correct state.
+     *
+     * @param virtualViewId The virtual view id for the item currently being
+     *            hovered, or {@link #INVALID_ID} if no item is hovered within
+     *            the parent view.
+     */
+    private void updateHoveredVirtualView(int virtualViewId) {
+        if (mHoveredVirtualViewId == virtualViewId) {
+            return;
+        }
+
+        final int previousVirtualViewId = mHoveredVirtualViewId;
+        mHoveredVirtualViewId = virtualViewId;
+
+        // Stay consistent with framework behavior by sending ENTER/EXIT pairs
+        // in reverse order. This is accurate as of API 18.
+        sendEventForVirtualView(virtualViewId, AccessibilityEvent.TYPE_VIEW_HOVER_ENTER);
+        sendEventForVirtualView(previousVirtualViewId, AccessibilityEvent.TYPE_VIEW_HOVER_EXIT);
+    }
+
+    /**
+     * Constructs and returns an {@link android.view.accessibility.AccessibilityEvent} for the specified
+     * virtual view id, which includes the host view ({@link android.view.View#NO_ID}).
+     *
+     * @param virtualViewId The virtual view id for the item for which to
+     *            construct an event.
+     * @param eventType The type of event to construct.
+     * @return An {@link android.view.accessibility.AccessibilityEvent} populated with information about
+     *         the specified item.
+     */
+    private AccessibilityEvent createEvent(int virtualViewId, int eventType) {
+        switch (virtualViewId) {
+            case View.NO_ID:
+                return createEventForHost(eventType);
+            default:
+                return createEventForChild(virtualViewId, eventType);
+        }
+    }
+
+    /**
+     * Constructs and returns an {@link android.view.accessibility.AccessibilityEvent} for the host node.
+     *
+     * @param eventType The type of event to construct.
+     * @return An {@link android.view.accessibility.AccessibilityEvent} populated with information about
+     *         the specified item.
+     */
+    private AccessibilityEvent createEventForHost(int eventType) {
+        final AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
+        mView.onInitializeAccessibilityEvent(event);
+        return event;
+    }
+
+    /**
+     * Constructs and returns an {@link android.view.accessibility.AccessibilityEvent} populated with
+     * information about the specified item.
+     *
+     * @param virtualViewId The virtual view id for the item for which to
+     *            construct an event.
+     * @param eventType The type of event to construct.
+     * @return An {@link android.view.accessibility.AccessibilityEvent} populated with information about
+     *         the specified item.
+     */
+    private AccessibilityEvent createEventForChild(int virtualViewId, int eventType) {
+        final AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
+        event.setEnabled(true);
+        event.setClassName(DEFAULT_CLASS_NAME);
+
+        // Allow the client to populate the event.
+        onPopulateEventForVirtualView(virtualViewId, event);
+
+        // Make sure the developer is following the rules.
+        if (event.getText().isEmpty() && (event.getContentDescription() == null)) {
+            throw new RuntimeException("Callbacks must add text or a content description in "
+                    + "populateEventForVirtualViewId()");
+        }
+
+        // Don't allow the client to override these properties.
+        event.setPackageName(mView.getContext().getPackageName());
+        event.setSource(mView, virtualViewId);
+
+        return event;
+    }
+
+    /**
+     * Constructs and returns an {@link android.view.accessibility.AccessibilityNodeInfo} for the
+     * specified virtual view id, which includes the host view
+     * ({@link android.view.View#NO_ID}).
+     *
+     * @param virtualViewId The virtual view id for the item for which to
+     *            construct a node.
+     * @return An {@link android.view.accessibility.AccessibilityNodeInfo} populated with information
+     *         about the specified item.
+     */
+    private AccessibilityNodeInfo createNode(int virtualViewId) {
+        switch (virtualViewId) {
+            case View.NO_ID:
+                return createNodeForHost();
+            default:
+                return createNodeForChild(virtualViewId);
+        }
+    }
+
+    /**
+     * Constructs and returns an {@link android.view.accessibility.AccessibilityNodeInfo} for the
+     * host view populated with its virtual descendants.
+     *
+     * @return An {@link android.view.accessibility.AccessibilityNodeInfo} for the parent node.
+     */
+    private AccessibilityNodeInfo createNodeForHost() {
+        final AccessibilityNodeInfo node = AccessibilityNodeInfo.obtain(mView);
+        mView.onInitializeAccessibilityNodeInfo(node);
+
+        // Add the virtual descendants.
+        final LinkedList<Integer> virtualViewIds = new LinkedList<Integer>();
+        getVisibleVirtualViews(virtualViewIds);
+
+        for (Integer childVirtualViewId : virtualViewIds) {
+            node.addChild(mView, childVirtualViewId);
+        }
+
+        return node;
+    }
+
+    /**
+     * Constructs and returns an {@link android.view.accessibility.AccessibilityNodeInfo} for the
+     * specified item. Automatically manages accessibility focus actions.
+     * <p>
+     * Allows the implementing class to specify most node properties, but
+     * overrides the following:
+     * <ul>
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setPackageName}
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setClassName}
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setParent(android.view.View)}
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setSource(android.view.View, int)}
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setVisibleToUser}
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setBoundsInScreen(android.graphics.Rect)}
+     * </ul>
+     * <p>
+     * Uses the bounds of the parent view and the parent-relative bounding
+     * rectangle specified by
+     * {@link android.view.accessibility.AccessibilityNodeInfo#getBoundsInParent} to automatically
+     * update the following properties:
+     * <ul>
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setVisibleToUser}
+     * <li>{@link android.view.accessibility.AccessibilityNodeInfo#setBoundsInParent}
+     * </ul>
+     *
+     * @param virtualViewId The virtual view id for item for which to construct
+     *            a node.
+     * @return An {@link android.view.accessibility.AccessibilityNodeInfo} for the specified item.
+     */
+    private AccessibilityNodeInfo createNodeForChild(int virtualViewId) {
+        final AccessibilityNodeInfo node = AccessibilityNodeInfo.obtain();
+
+        // Ensure the client has good defaults.
+        node.setEnabled(true);
+        node.setClassName(DEFAULT_CLASS_NAME);
+
+        // Allow the client to populate the node.
+        onPopulateNodeForVirtualView(virtualViewId, node);
+
+        // Make sure the developer is following the rules.
+        if ((node.getText() == null) && (node.getContentDescription() == null)) {
+            throw new RuntimeException("Callbacks must add text or a content description in "
+                    + "populateNodeForVirtualViewId()");
+        }
+
+        node.getBoundsInParent(mTempParentRect);
+        if (mTempParentRect.isEmpty()) {
+            throw new RuntimeException("Callbacks must set parent bounds in "
+                    + "populateNodeForVirtualViewId()");
+        }
+
+        final int actions = node.getActions();
+        if ((actions & AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS) != 0) {
+            throw new RuntimeException("Callbacks must not add ACTION_ACCESSIBILITY_FOCUS in "
+                    + "populateNodeForVirtualViewId()");
+        }
+        if ((actions & AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS) != 0) {
+            throw new RuntimeException("Callbacks must not add ACTION_CLEAR_ACCESSIBILITY_FOCUS in "
+                    + "populateNodeForVirtualViewId()");
+        }
+
+        // Don't allow the client to override these properties.
+        node.setPackageName(mView.getContext().getPackageName());
+        node.setSource(mView, virtualViewId);
+        node.setParent(mView);
+
+        // Manage internal accessibility focus state.
+        if (mFocusedVirtualViewId == virtualViewId) {
+            node.setAccessibilityFocused(true);
+            node.addAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
+        } else {
+            node.setAccessibilityFocused(false);
+            node.addAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
+        }
+
+        // Set the visibility based on the parent bound.
+        if (intersectVisibleToUser(mTempParentRect)) {
+            node.setVisibleToUser(true);
+            node.setBoundsInParent(mTempParentRect);
+        }
+
+        // Calculate screen-relative bound.
+        mView.getLocationOnScreen(mTempGlobalRect);
+        final int offsetX = mTempGlobalRect[0];
+        final int offsetY = mTempGlobalRect[1];
+        mTempScreenRect.set(mTempParentRect);
+        mTempScreenRect.offset(offsetX, offsetY);
+        node.setBoundsInScreen(mTempScreenRect);
+
+        return node;
+    }
+
+    private boolean performAction(int virtualViewId, int action, Bundle arguments) {
+        switch (virtualViewId) {
+            case View.NO_ID:
+                return performActionForHost(action, arguments);
+            default:
+                return performActionForChild(virtualViewId, action, arguments);
+        }
+    }
+
+    private boolean performActionForHost(int action, Bundle arguments) {
+        return mView.performAccessibilityAction(action, arguments);
+    }
+
+    private boolean performActionForChild(int virtualViewId, int action, Bundle arguments) {
+        switch (action) {
+            case AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS:
+            case AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS:
+                return manageFocusForChild(virtualViewId, action, arguments);
+            default:
+                return onPerformActionForVirtualView(virtualViewId, action, arguments);
+        }
+    }
+
+    private boolean manageFocusForChild(int virtualViewId, int action, Bundle arguments) {
+        switch (action) {
+            case AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS:
+                return requestAccessibilityFocus(virtualViewId);
+            case AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS:
+                return clearAccessibilityFocus(virtualViewId);
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Computes whether the specified {@link android.graphics.Rect} intersects with the visible
+     * portion of its parent {@link android.view.View}. Modifies {@code localRect} to contain
+     * only the visible portion.
+     *
+     * @param localRect A rectangle in local (parent) coordinates.
+     * @return Whether the specified {@link android.graphics.Rect} is visible on the screen.
+     */
+    private boolean intersectVisibleToUser(Rect localRect) {
+        // Missing or empty bounds mean this view is not visible.
+        if ((localRect == null) || localRect.isEmpty()) {
+            return false;
+        }
+
+        // Attached to invisible window means this view is not visible.
+        if (mView.getWindowVisibility() != View.VISIBLE) {
+            return false;
+        }
+
+        // An invisible predecessor means that this view is not visible.
+        ViewParent viewParent = mView.getParent();
+        while (viewParent instanceof View) {
+            final View view = (View) viewParent;
+            if ((view.getAlpha() <= 0) || (view.getVisibility() != View.VISIBLE)) {
+                return false;
+            }
+            viewParent = view.getParent();
+        }
+
+        // A null parent implies the view is not visible.
+        if (viewParent == null) {
+            return false;
+        }
+
+        // If no portion of the parent is visible, this view is not visible.
+        if (!mView.getLocalVisibleRect(mTempVisibleRect)) {
+            return false;
+        }
+
+        // Check if the view intersects the visible portion of the parent.
+        return localRect.intersect(mTempVisibleRect);
+    }
+
+    /**
+     * Returns whether this virtual view is accessibility focused.
+     *
+     * @return True if the view is accessibility focused.
+     */
+    private boolean isAccessibilityFocused(int virtualViewId) {
+        return (mFocusedVirtualViewId == virtualViewId);
+    }
+
+    /**
+     * Attempts to give accessibility focus to a virtual view.
+     * <p>
+     * A virtual view will not actually take focus if
+     * {@link android.view.accessibility.AccessibilityManager#isEnabled()} returns false,
+     * {@link android.view.accessibility.AccessibilityManager#isTouchExplorationEnabled()} returns false,
+     * or the view already has accessibility focus.
+     *
+     * @param virtualViewId The id of the virtual view on which to place
+     *            accessibility focus.
+     * @return Whether this virtual view actually took accessibility focus.
+     */
+    private boolean requestAccessibilityFocus(int virtualViewId) {
+        final AccessibilityManager accessibilityManager =
+                (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
+
+        if (!mManager.isEnabled()
+                || !accessibilityManager.isTouchExplorationEnabled()) {
+            return false;
+        }
+        // TODO: Check virtual view visibility.
+        if (!isAccessibilityFocused(virtualViewId)) {
+            mFocusedVirtualViewId = virtualViewId;
+            // TODO: Only invalidate virtual view bounds.
+            mView.invalidate();
+            sendEventForVirtualView(virtualViewId,
+                    AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Attempts to clear accessibility focus from a virtual view.
+     *
+     * @param virtualViewId The id of the virtual view from which to clear
+     *            accessibility focus.
+     * @return Whether this virtual view actually cleared accessibility focus.
+     */
+    private boolean clearAccessibilityFocus(int virtualViewId) {
+        if (isAccessibilityFocused(virtualViewId)) {
+            mFocusedVirtualViewId = INVALID_ID;
+            mView.invalidate();
+            sendEventForVirtualView(virtualViewId,
+                    AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Provides a mapping between view-relative coordinates and logical
+     * items.
+     *
+     * @param x The view-relative x coordinate
+     * @param y The view-relative y coordinate
+     * @return virtual view identifier for the logical item under
+     *         coordinates (x,y)
+     */
+    protected abstract int getVirtualViewAt(float x, float y);
+
+    /**
+     * Populates a list with the view's visible items. The ordering of items
+     * within {@code virtualViewIds} specifies order of accessibility focus
+     * traversal.
+     *
+     * @param virtualViewIds The list to populate with visible items
+     */
+    protected abstract void getVisibleVirtualViews(List<Integer> virtualViewIds);
+
+    /**
+     * Populates an {@link android.view.accessibility.AccessibilityEvent} with information about the
+     * specified item.
+     * <p>
+     * Implementations <b>must</b> populate the following required fields:
+     * <ul>
+     * <li>event text, see {@link android.view.accessibility.AccessibilityEvent#getText} or
+     * {@link android.view.accessibility.AccessibilityEvent#setContentDescription}
+     * </ul>
+     * <p>
+     * The helper class automatically populates the following fields with
+     * default values, but implementations may optionally override them:
+     * <ul>
+     * <li>item class name, set to android.view.View, see
+     * {@link android.view.accessibility.AccessibilityEvent#setClassName}
+     * </ul>
+     * <p>
+     * The following required fields are automatically populated by the
+     * helper class and may not be overridden:
+     * <ul>
+     * <li>package name, set to the package of the host view's
+     * {@link android.content.Context}, see {@link android.view.accessibility.AccessibilityEvent#setPackageName}
+     * <li>event source, set to the host view and virtual view identifier,
+     * see {@link android.view.accessibility.AccessibilityRecord#setSource(android.view.View, int)}
+     * </ul>
+     *
+     * @param virtualViewId The virtual view id for the item for which to
+     *            populate the event
+     * @param event The event to populate
+     */
+    protected abstract void onPopulateEventForVirtualView(
+            int virtualViewId, AccessibilityEvent event);
+
+    /**
+     * Populates an {@link android.view.accessibility.AccessibilityNodeInfo} with information
+     * about the specified item.
+     * <p>
+     * Implementations <b>must</b> populate the following required fields:
+     * <ul>
+     * <li>event text, see {@link android.view.accessibility.AccessibilityNodeInfo#setText} or
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setContentDescription}
+     * <li>bounds in parent coordinates, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setBoundsInParent}
+     * </ul>
+     * <p>
+     * The helper class automatically populates the following fields with
+     * default values, but implementations may optionally override them:
+     * <ul>
+     * <li>enabled state, set to true, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setEnabled}
+     * <li>item class name, identical to the class name set by
+     * {@link #onPopulateEventForVirtualView}, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setClassName}
+     * </ul>
+     * <p>
+     * The following required fields are automatically populated by the
+     * helper class and may not be overridden:
+     * <ul>
+     * <li>package name, identical to the package name set by
+     * {@link #onPopulateEventForVirtualView}, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setPackageName}
+     * <li>node source, identical to the event source set in
+     * {@link #onPopulateEventForVirtualView}, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setSource(android.view.View, int)}
+     * <li>parent view, set to the host view, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setParent(android.view.View)}
+     * <li>visibility, computed based on parent-relative bounds, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setVisibleToUser}
+     * <li>accessibility focus, computed based on internal helper state, see
+     * {@link android.view.accessibility.AccessibilityNodeInfo#setAccessibilityFocused}
+     * <li>bounds in screen coordinates, computed based on host view bounds,
+     * see {@link android.view.accessibility.AccessibilityNodeInfo#setBoundsInScreen}
+     * </ul>
+     * <p>
+     * Additionally, the helper class automatically handles accessibility
+     * focus management by adding the appropriate
+     * {@link android.view.accessibility.AccessibilityNodeInfo#ACTION_ACCESSIBILITY_FOCUS} or
+     * {@link android.view.accessibility.AccessibilityNodeInfo#ACTION_CLEAR_ACCESSIBILITY_FOCUS}
+     * action. Implementations must <b>never</b> manually add these actions.
+     * <p>
+     * The helper class also automatically modifies parent- and
+     * screen-relative bounds to reflect the portion of the item visible
+     * within its parent.
+     *
+     * @param virtualViewId The virtual view identifier of the item for
+     *            which to populate the node
+     * @param node The node to populate
+     */
+    protected abstract void onPopulateNodeForVirtualView(
+            int virtualViewId, AccessibilityNodeInfo node);
+
+    /**
+     * Performs the specified accessibility action on the item associated
+     * with the virtual view identifier. See
+     * {@link android.view.accessibility.AccessibilityNodeInfo#performAction(int, android.os.Bundle)} for
+     * more information.
+     * <p>
+     * Implementations <b>must</b> handle any actions added manually in
+     * {@link #onPopulateNodeForVirtualView}.
+     * <p>
+     * The helper class automatically handles focus management resulting
+     * from {@link android.view.accessibility.AccessibilityNodeInfo#ACTION_ACCESSIBILITY_FOCUS}
+     * and
+     * {@link android.view.accessibility.AccessibilityNodeInfo#ACTION_CLEAR_ACCESSIBILITY_FOCUS}
+     * actions.
+     *
+     * @param virtualViewId The virtual view identifier of the item on which
+     *            to perform the action
+     * @param action The accessibility action to perform
+     * @param arguments (Optional) A bundle with additional arguments, or
+     *            null
+     * @return true if the action was performed
+     */
+    protected abstract boolean onPerformActionForVirtualView(
+            int virtualViewId, int action, Bundle arguments);
+
+    /**
+     * Exposes a virtual view hierarchy to the accessibility framework. Only
+     * used in API 16+.
+     */
+    private class ExploreByTouchNodeProvider extends AccessibilityNodeProvider {
+        @Override
+        public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
+            return ExploreByTouchHelper.this.createNode(virtualViewId);
+        }
+
+        @Override
+        public boolean performAction(int virtualViewId, int action, Bundle arguments) {
+            return ExploreByTouchHelper.this.performAction(virtualViewId, action, arguments);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/LinkAccessibilityHelper.java b/src/com/android/settings/widget/LinkAccessibilityHelper.java
new file mode 100644
index 0000000..2d4d585
--- /dev/null
+++ b/src/com/android/settings/widget/LinkAccessibilityHelper.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2014 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.widget;
+
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.text.Layout;
+import android.text.Spanned;
+import android.text.style.ClickableSpan;
+import android.util.Log;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * Copied from setup wizard.
+ */
+public class LinkAccessibilityHelper extends ExploreByTouchHelper {
+
+    private static final String TAG = "LinkAccessibilityHelper";
+
+    private final TextView mView;
+    private final Rect mTempRect = new Rect();
+
+    public LinkAccessibilityHelper(TextView view) {
+        super(view);
+        mView = view;
+    }
+
+    @Override
+    protected int getVirtualViewAt(float x, float y) {
+        final CharSequence text = mView.getText();
+        if (text instanceof Spanned) {
+            final Spanned spannedText = (Spanned) text;
+            final int offset = mView.getOffsetForPosition(x, y);
+            ClickableSpan[] linkSpans = spannedText.getSpans(offset, offset, ClickableSpan.class);
+            if (linkSpans.length == 1) {
+                ClickableSpan linkSpan = linkSpans[0];
+                return spannedText.getSpanStart(linkSpan);
+            }
+        }
+        return INVALID_ID;
+    }
+
+    @Override
+    protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
+        final CharSequence text = mView.getText();
+        if (text instanceof Spanned) {
+            final Spanned spannedText = (Spanned) text;
+            ClickableSpan[] linkSpans = spannedText.getSpans(0, spannedText.length(),
+                    ClickableSpan.class);
+            for (ClickableSpan span : linkSpans) {
+                virtualViewIds.add(spannedText.getSpanStart(span));
+            }
+        }
+    }
+
+    @Override
+    protected void onPopulateEventForVirtualView(int virtualViewId, AccessibilityEvent event) {
+        final ClickableSpan span = getSpanForOffset(virtualViewId);
+        if (span != null) {
+            event.setContentDescription(getTextForSpan(span));
+        } else {
+            Log.e(TAG, "ClickableSpan is null for offset: " + virtualViewId);
+            event.setContentDescription(mView.getText());
+        }
+    }
+
+    @Override
+    protected void onPopulateNodeForVirtualView(int virtualViewId, AccessibilityNodeInfo info) {
+        final ClickableSpan span = getSpanForOffset(virtualViewId);
+        if (span != null) {
+            info.setContentDescription(getTextForSpan(span));
+        } else {
+            Log.e(TAG, "ClickableSpan is null for offset: " + virtualViewId);
+            info.setContentDescription(mView.getText());
+        }
+        info.setFocusable(true);
+        info.setClickable(true);
+        getBoundsForSpan(span, mTempRect);
+        if (!mTempRect.isEmpty()) {
+            info.setBoundsInParent(getBoundsForSpan(span, mTempRect));
+        } else {
+            Log.e(TAG, "LinkSpan bounds is empty for: " + virtualViewId);
+            mTempRect.set(0, 0, 1, 1);
+            info.setBoundsInParent(mTempRect);
+        }
+        info.addAction(AccessibilityNodeInfo.ACTION_CLICK);
+    }
+
+    @Override
+    protected boolean onPerformActionForVirtualView(int virtualViewId, int action,
+            Bundle arguments) {
+        if (action == AccessibilityNodeInfo.ACTION_CLICK) {
+            ClickableSpan span = getSpanForOffset(virtualViewId);
+            if (span != null) {
+                span.onClick(mView);
+                return true;
+            } else {
+                Log.e(TAG, "LinkSpan is null for offset: " + virtualViewId);
+            }
+        }
+        return false;
+    }
+
+    private ClickableSpan getSpanForOffset(int offset) {
+        CharSequence text = mView.getText();
+        if (text instanceof Spanned) {
+            Spanned spannedText = (Spanned) text;
+            ClickableSpan[] spans = spannedText.getSpans(offset, offset, ClickableSpan.class);
+            if (spans.length == 1) {
+                return spans[0];
+            }
+        }
+        return null;
+    }
+
+    private CharSequence getTextForSpan(ClickableSpan span) {
+        CharSequence text = mView.getText();
+        if (text instanceof Spanned) {
+            Spanned spannedText = (Spanned) text;
+            return spannedText.subSequence(spannedText.getSpanStart(span),
+                    spannedText.getSpanEnd(span));
+        }
+        return text;
+    }
+
+    // Find the bounds of a span. If it spans multiple lines, it will only return the bounds for the
+    // section on the first line.
+    private Rect getBoundsForSpan(ClickableSpan span, Rect outRect) {
+        CharSequence text = mView.getText();
+        outRect.setEmpty();
+        if (text instanceof Spanned) {
+            Spanned spannedText = (Spanned) text;
+            final int spanStart = spannedText.getSpanStart(span);
+            final int spanEnd = spannedText.getSpanEnd(span);
+            final Layout layout = mView.getLayout();
+            final float xStart = layout.getPrimaryHorizontal(spanStart);
+            final float xEnd = layout.getPrimaryHorizontal(spanEnd);
+            final int lineStart = layout.getLineForOffset(spanStart);
+            final int lineEnd = layout.getLineForOffset(spanEnd);
+            layout.getLineBounds(lineStart, outRect);
+            outRect.left = (int) xStart;
+            if (lineEnd == lineStart) {
+                outRect.right = (int) xEnd;
+            } // otherwise just leave it at the end of the start line
+
+            // Offset for padding
+            outRect.offset(mView.getTotalPaddingLeft(), mView.getTotalPaddingTop());
+        }
+        return outRect;
+    }
+}
diff --git a/src/com/android/settings/widget/LinkTextView.java b/src/com/android/settings/widget/LinkTextView.java
new file mode 100644
index 0000000..ab72fcf
--- /dev/null
+++ b/src/com/android/settings/widget/LinkTextView.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 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.widget;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.TextView;
+
+/**
+ * Copied from setup wizard.
+ */
+public class LinkTextView extends TextView {
+
+    private LinkAccessibilityHelper mAccessibilityHelper;
+
+    public LinkTextView(Context context) {
+        this(context, null);
+    }
+
+    public LinkTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mAccessibilityHelper = new LinkAccessibilityHelper(this);
+        setAccessibilityDelegate(mAccessibilityHelper);
+    }
+
+    @Override
+    protected boolean dispatchHoverEvent(@NonNull MotionEvent event) {
+        if (mAccessibilityHelper.dispatchHoverEvent(event)) {
+            return true;
+        }
+        return super.dispatchHoverEvent(event);
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 1a4b1dd..774c54b 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -458,9 +458,17 @@
                 String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
                 if (clientCert.equals(unspecifiedCert)) clientCert = "";
                 config.enterpriseConfig.setClientCertificateAlias(clientCert);
-                config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
-                config.enterpriseConfig.setAnonymousIdentity(
-                        mEapAnonymousView.getText().toString());
+                if (eapMethod == Eap.SIM || eapMethod == Eap.AKA || eapMethod == Eap.AKA_PRIME) {
+                    config.enterpriseConfig.setIdentity("");
+                    config.enterpriseConfig.setAnonymousIdentity("");
+                } else if (eapMethod == Eap.PWD) {
+                    config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
+                    config.enterpriseConfig.setAnonymousIdentity("");
+                } else {
+                    config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
+                    config.enterpriseConfig.setAnonymousIdentity(
+                            mEapAnonymousView.getText().toString());
+                }
 
                 if (mPasswordView.isShown()) {
                     // For security reasons, a previous password is not displayed to user.