diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d6367217225..28df2b20d4a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1700,7 +1700,7 @@
     <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – noch etwa <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> – bei Wechselstrom voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> – bei Stromanschluss voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – über USB voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<xliff:g id="LEVEL">%1$s</xliff:g> – bei kabellosem Laden voll in <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="2409288197839512482">"Verbrauch seit letztem vollen Aufladen"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 33bd44ba7c5..6746442dec0 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -319,8 +319,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Add fingerprint"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints setup</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint setup</item>
+      <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_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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 33bd44ba7c5..6746442dec0 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -319,8 +319,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Add fingerprint"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints setup</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint setup</item>
+      <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_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>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 33bd44ba7c5..6746442dec0 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -319,8 +319,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Add fingerprint"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints setup</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint setup</item>
+      <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_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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 681f38d4c45..c218fed86ba 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -339,9 +339,9 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"¡Vamos a empezar!"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Pon el dedo en el sensor y levántalo cuando notes una vibración"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Pon el dedo en el sensor y levántalo cuando notes una vibración."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"¡Genial! Ahora repítelo"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para añadir todas las partes de tu huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para añadir todas las partes de tu huella digital."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digital añadida"</string>
     <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>
@@ -2799,7 +2799,7 @@
     <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="167707234832117768">"Cargando"</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>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 488f7d79653..f7e95945b11 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -326,7 +326,7 @@
     <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>
     <string name="security_settings_fingerprint_enroll_onboard_message_2" msgid="4158160658182631304">"Ajouter votre empreinte digitale"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déver. avec empr. dig."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Il vous suffit de toucher le capteur d\'empreinte digitale pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Remarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un motif ou un NIP fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"En savoir plus"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 32137a6c992..ad39e534889 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -322,13 +322,13 @@
       <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_enroll_onboard_title" msgid="4735546436672054254">"Config. impr. digitale"</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>
     <string name="security_settings_fingerprint_enroll_onboard_message_2" msgid="4158160658182631304">"Aggiungere l\'impronta digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sblocca con l\'impronta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app desiderate. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN efficaci."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Nota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso."</string>
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Ulteriori informazioni"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
@@ -338,11 +338,11 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Elimina"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Inizia."</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Inizia"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Appoggia il dito sul sensore e sollevalo quando sentirai una vibrazione"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Bene. Ora ripeti"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Bene, ora ripeti"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Muovi leggermente il dito per aggiungere tutte le diverse parti della tua impronta digitale"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Impronta aggiunta."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Impronta aggiunta"</string>
     <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>
@@ -350,7 +350,7 @@
     <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="fingerprint_enroll_button_add" msgid="6317978977419045463">"Aggiungi un\'altra"</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>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4504501581228672208">"Opzione Blocco schermo disattivata. Puoi comunque utilizzare la tua impronta digitale per autorizzare acquisti e accessi alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
@@ -363,7 +363,7 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Cripta tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Cripta telefono"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crittografato"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptato"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Puoi criptare account, impostazioni, app scaricate e relativi dati, contenuti multimediali e altri file. Una volta criptato il tablet, presumendo che tu abbia impostato il blocco schermo (vale a dire una sequenza, un PIN numerico o una password), devi sbloccare lo schermo per decriptare il tablet a ogni accensione. L\'unico altro metodo di decriptazione consiste nell\'eseguire un ripristino dei dati di fabbrica, che cancella tutti i dati.\n\nLa procedura di crittografia richiede almeno un\'ora. Devi iniziarla con la batteria completamente carica e tenere il telefono sempre collegato a una presa di corrente per tutta la durata della procedura. Qualora dovessi interromperla, perderai tutti i dati o parte di essi."</string>
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Puoi criptare account, impostazioni, app scaricate e relativi dati, contenuti multimediali e altri file. Una volta criptato il telefono, presumendo che tu abbia impostato il blocco schermo (vale a dire una sequenza, un PIN numerico o una password), devi sbloccare lo schermo per decriptare il telefono a ogni accensione. L\'unico altro metodo di decriptazione consiste nell\'eseguire un ripristino dei dati di fabbrica, che cancella tutti i dati.\n\nLa procedura di crittografia richiede almeno un\'ora. Devi iniziarla con la batteria completamente carica e tenere il telefono sempre collegato a una presa di corrente per tutta la durata della procedura. Qualora dovessi interromperla, perderai tutti i dati o parte di essi."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Cripta tablet"</string>
@@ -378,8 +378,8 @@
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Crittografia"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Attendi il termine della crittografia del tablet. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Attendi il termine della crittografia del telefono. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Attendi che il tablet venga crittografato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Attendi che il telefono venga crittografato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Attendi che il tablet venga criptato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Attendi che il telefono venga criptato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Per sbloccare il tablet, spegnilo e accendilo."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Per sbloccare il telefono, spegnilo e accendilo."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avviso. I dati del dispositivo verranno cancellati dopo altri <xliff:g id="COUNT">^1</xliff:g> tentativi di sblocco non riusciti."</string>
@@ -2782,9 +2782,9 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Ottimizzazione batteria"</string>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"Non ottimizzate"</string>
+    <string name="high_power_filter_on" msgid="3222265297576680099">"Senza ottimizzazione"</string>
     <string name="high_power_on" msgid="3382367497549906927">"senza ottimizzazione della batteria"</string>
-    <string name="high_power_off" msgid="3393904131961263278">"Con ottimizzazione dell\'uso della batteria"</string>
+    <string name="high_power_off" msgid="3393904131961263278">"Uso della batteria ottimizzato"</string>
     <string name="high_power_system" msgid="7362862974428225301">"Ottimizzazione della batteria non disponibile"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Non applicare l\'ottimizzazione della batteria. La batteria potrebbe scaricarsi più rapidamente."</string>
     <plurals name="high_power_count" formatted="false" msgid="2464701722383894640">
@@ -2799,7 +2799,7 @@
     <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="167707234832117768">"In carica"</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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 809bc34d747..6f13b094f63 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -847,7 +847,7 @@
     <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_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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 62424952515..a512dbf8663 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -340,7 +340,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"삭제"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"시작"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"센서에 손가락을 올리고 진동이 느껴지면 떼세요."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"좋습니다. 반복하세요."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"좋습니다. 계속하세요."</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"손가락을 살짝 움직여 지문의 다른 부분도 전부 추가하세요."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"지문이 추가되었습니다."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 증명하거나 구매를 승인할 수 있습니다."</string>
@@ -358,7 +358,7 @@
     <string name="fingerprint_add_max" msgid="1020927549936895822">"지문을 <xliff:g id="COUNT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"모든 지문을 삭제할까요?"</string>
     <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"지문을 사용하여 휴대전화를 잠금 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
-    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"예, 삭제합니다."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"삭제"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"계속하려면 지문을 사용하세요."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"태블릿 암호화"</string>
@@ -2844,7 +2844,7 @@
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"최적화하지 않음"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"최적화"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"배터리가 더 빨리 방전될 수 있습니다."</string>
-    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"배터리 수명을 늘리기 위한 추천사항"</string>
+    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"배터리 수명을 늘리려면 선택하세요."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g>에서 배터리 최적화를 무시하도록 허용할까요?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"없음"</string>
     <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"이 앱의 사용량 액세스 기능을 사용 중지해도 관리자가 직장 프로필에서 앱의 데이터 사용량을 추적할 수 있습니다."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bb7b7fb1f48..0f5ca110d75 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -342,7 +342,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaats uw vinger op de sensor en til deze op nadat u een trilling heeft gevoeld"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Prima! Herhaal dit nu."</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Beweeg uw vinger enigszins om alle delen van uw vingerafdruk toe te voegen"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Vingerafdr. toegevoegd"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gelukt!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer u dit pictogram ziet, kunt u uw 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 uw apparaat te activeren en te ontgrendelen."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Wanneer dit pictogram wordt weergegeven, kunt u uw vingerafdruk gebruiken."</string>
@@ -2843,7 +2843,7 @@
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"De app kan de functie Niet storen in-/uitschakelen en wijzigingen aanbrengen in gerelateerde instellingen."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Niet optimaliseren"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimaliseren"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Hierdoor kan uw accuverbruik toenemen."</string>
+    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Hierdoor kan uw accuverbruik toenemen"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Aanbevolen voor een langere accuduur"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> toestaan om accuoptimalisatie te negeren?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Geen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4cd7c44756d..30f304648f1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -296,7 +296,7 @@
     <string name="time_picker_title" msgid="483460752287255019">"Godzina"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blokuj automatycznie"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Po <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> uśpienia"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Zaraz po uśpieniu, ale nie wtedy, gdy jest odblokowany przez <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Zaraz po uśpieniu (z wyjątkiem sytuacji, gdy blokadę anuluje <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>)"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po uśpieniu (z wyjątkiem sytuacji, gdy blokadę anuluje <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>)"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Pokaż tę informację na ekranie blokady"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Wiadomość przy blokadzie"</string>
@@ -321,17 +321,17 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Dodaj odcisk palca"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"blokada ekranu"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="few">Konfiguracja odcisku: <xliff:g id="COUNT_1">%1$d</xliff:g> palce</item>
-      <item quantity="many">Konfiguracja odcisku: <xliff:g id="COUNT_1">%1$d</xliff:g> palców</item>
-      <item quantity="other">Konfiguracja odcisku: <xliff:g id="COUNT_1">%1$d</xliff:g> palca</item>
-      <item quantity="one">Konfiguracja odcisku: <xliff:g id="COUNT_0">%1$d</xliff:g> palec</item>
+      <item quantity="few">Ustawiono <xliff:g id="COUNT_1">%1$d</xliff:g> odciski palców</item>
+      <item quantity="many">Ustawiono <xliff:g id="COUNT_1">%1$d</xliff:g> odcisków palców</item>
+      <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_enroll_onboard_title" msgid="4735546436672054254">"Konf. odcisku palca"</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 zapasową metodę blokowania ekranu"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Skonfiguruj dodatkową metodę blokowania ekranu"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_2" msgid="4158160658182631304">"Dodać swój odcisk palca"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odblokuj odciskiem palca"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Wystarczy dotknąć czujnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Dobrze się jednak zastanów, czyje odciski palców dodasz, bo każda dodana osoba będzie mogła robić wszystkie wymienione tutaj rzeczy."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Z rozwagą dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Uwaga: odcisk palca może być mniej bezpieczny niż trudny wzór lub kod PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Więcej informacji"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anuluj"</string>
@@ -343,11 +343,11 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Usuń"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Rozpocznij"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Przyłóż palec do czytnika, a potem odsuń, gdy poczujesz wibracje"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Świetnie. Teraz powtórz"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Obróć delikatnie palec, by odcisk był dokładniejszy"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Dodano odcisk palca."</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Gdy wyświetla się ta ikona, możesz użyć odcisku palca na potrzeby identyfikacji lub autoryzacji zakupu."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Przyłóż palec do czytnika. Podnieś go, gdy poczujesz wibracje."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Powtórz czynność"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Obróć lekko palcem, by odcisk był bardziej dokładny."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Odcisk palca dodany"</string>
+    <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="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Skonfiguruj blokadę ekranu"</string>
@@ -358,10 +358,10 @@
     <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>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4504501581228672208">"Opcja blokady ekranu jest wyłączona. Odcisku palca wciąż możesz używać do autoryzowania zakupów i dostępu do aplikacji. "<annotation id="url">"Więcej informacji"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Unieś palec, a potem znowu dotknij czujnika"</string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Podnieś palec, a potem przyłóż go do czytnika jeszcze raz."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Możesz dodać do <xliff:g id="COUNT">%d</xliff:g> odcisków palców"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Usunąć wszystkie odciski palców?"</string>
-    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Odcisków palców nie będzie można używać do odblokowywania telefonu, autoryzowania płatności ani logowania się w aplikacjach."</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Odcisków palców nie będzie można używać do odblokowywania telefonu, autoryzowania zakupów ani logowania się w aplikacjach."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Tak, usuń"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Użyj odcisku palca, by kontynuować."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
@@ -396,7 +396,7 @@
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Wpisane hasło jest prawidłowe, ale Twoje dane są uszkodzone. \n\nAby móc korzystać z telefonu, musisz zresetować go do ustawień fabrycznych. Następnie podczas konfigurowania urządzenia możesz przywrócić wszystkie dane, których kopię zapasową masz na koncie Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Przełącz metodę wprowadzania"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Wybierz zapasową metodę blokowania ekranu"</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Wybierz dodatkową metodę blokowania ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blokada ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmiana blokady ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Zmień lub wyłącz zabezpieczenie ekranu (wzór, PIN lub hasło)"</string>
@@ -2685,9 +2685,9 @@
     <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Możesz wzmocnić ochronę urządzenia przez wymaganie kodu PIN do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
     <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Możesz wzmocnić ochronę urządzenia przez wymaganie wzoru do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
     <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Możesz wzmocnić ochronę urządzenia przez wymaganie hasła do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Jako uzupełnienie odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania kodu PIN przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Jako uzupełnienie odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania wzoru przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Jako uzupełnienie odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania kodu PIN przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania wzoru przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
     <string name="encrypt_require_pin" msgid="2063945047845243752">"Wymagaj kodu PIN przy włączaniu urządzenia"</string>
     <string name="encrypt_require_pattern" msgid="6898479411004015810">"Wymagaj wzoru przy włączaniu urządzenia"</string>
     <string name="encrypt_require_password" msgid="8770628366276570518">"Wymagaj hasła przy włączaniu urządzenia"</string>
@@ -2750,7 +2750,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Brak próśb o przyznanie uprawnień"</string>
     <string name="launch_defaults_some" msgid="313159469856372621">"Część ustawień domyślnych"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Brak ustawień domyślnych"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"Wszystkie aplikacje"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Pokaż wszystkie aplikacje"</string>
     <string name="filter_enabled_apps" msgid="3318021007093070639">"Włączone"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobiste"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Do pracy"</string>
@@ -2782,7 +2782,7 @@
     <string name="app_link_open_always" msgid="2474058700623948148">"Otwieraj w tej aplikacji"</string>
     <string name="app_link_open_ask" msgid="7800878430190575991">"Pytaj za każdym razem"</string>
     <string name="app_link_open_never" msgid="3407647600352398543">"Nie otwieraj w tej aplikacji"</string>
-    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nie rozpoznano"</string>
+    <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Nie rozpoznano odcisku palca."</string>
     <string name="default_apps_title" msgid="1854974637597514435">"Domyślne aplikacje"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asystent i rozpoznawanie mowy"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacja asystująca"</string>
@@ -2818,7 +2818,7 @@
     <string name="high_power_on" msgid="3382367497549906927">"Ignoruje optymalizację baterii"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Ma włączoną optymalizację baterii"</string>
     <string name="high_power_system" msgid="7362862974428225301">"Optymalizacja baterii niedostępna"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"Nie stosuj optymalizacji baterii. Może powodować szybsze zużywanie energii."</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"Nie stosuj optymalizacji baterii. Może powodować szybsze wyczerpywanie się baterii."</string>
     <plurals name="high_power_count" formatted="false" msgid="2464701722383894640">
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacje mogą ignorować optymalizację baterii</item>
       <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> aplikacji może ignorować optymalizację baterii</item>
@@ -2842,7 +2842,7 @@
     <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 dla wejścia 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>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0ce4b4ce684..16696e14f99 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -247,7 +247,7 @@
     <string name="okay" msgid="1997666393121016642">"Ok"</string>
     <string name="forget" msgid="1400428660472591263">"Ignorar"</string>
     <string name="save" msgid="879993180139353333">"Salvar"</string>
-    <string name="done" msgid="6942539184162713160">"Concluída"</string>
+    <string name="done" msgid="6942539184162713160">"Concluído"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
@@ -2799,7 +2799,7 @@
     <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="167707234832117768">"Carregando"</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>
@@ -2844,7 +2844,7 @@
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Não otimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Otimizar"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Isso pode esgotar sua bateria mais rapidamente"</string>
-    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendadas para melhor duração da bateria."</string>
+    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para maior duração da bateria."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Permitir que <xliff:g id="APP">%s</xliff:g> ignore as otimizações de bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nenhum"</string>
     <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"A desativação do acesso de uso desse app não impede que seu administrador rastreie o uso de dados dos apps no seu perfil de trabalho."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0ce4b4ce684..16696e14f99 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -247,7 +247,7 @@
     <string name="okay" msgid="1997666393121016642">"Ok"</string>
     <string name="forget" msgid="1400428660472591263">"Ignorar"</string>
     <string name="save" msgid="879993180139353333">"Salvar"</string>
-    <string name="done" msgid="6942539184162713160">"Concluída"</string>
+    <string name="done" msgid="6942539184162713160">"Concluído"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
@@ -2799,7 +2799,7 @@
     <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="167707234832117768">"Carregando"</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>
@@ -2844,7 +2844,7 @@
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Não otimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Otimizar"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Isso pode esgotar sua bateria mais rapidamente"</string>
-    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendadas para melhor duração da bateria."</string>
+    <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para maior duração da bateria."</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Permitir que <xliff:g id="APP">%s</xliff:g> ignore as otimizações de bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Nenhum"</string>
     <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"A desativação do acesso de uso desse app não impede que seu administrador rastreie o uso de dados dos apps no seu perfil de trabalho."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0eae4dd249d..b1b8e50e0de 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -330,7 +330,7 @@
     <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>
     <string name="security_settings_fingerprint_enroll_onboard_message_2" msgid="4158160658182631304">"Dodati prstni odtis"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odklep s prst. odtisom"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odklepanje s prstnim odtisom"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Preprosto dotaknite se tipala prstnega odtisa, da odklenete telefon, dovolite nakupe ali se prijavite v aplikacije. Ta dejanja bo mogoče izvesti z vsemi dodanimi prstnimi odtisi, zato pazite, čigave prstne odtise boste dodali."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Opomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"Več o tem"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8f6b5e55582..531b5e317ad 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -338,8 +338,8 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ชื่อ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ตกลง"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ลบ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"มาเริ่มต้นกันเลย!"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"วางนิ้วลงบนเซ็นเซอร์และยกขึ้นหลังจากรู้สึกถึงการสั่น"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"มาเริ่มกันเลย"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"วางนิ้วบนเซ็นเซอร์และยกขึ้นหลังจากรู้สึกถึงการสั่น"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"เยี่ยม! ทำซ้ำเลย"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"เลื่อนนิ้วเล็กน้อยเพื่อเพิ่มส่วนต่างๆ ทั้งหมดของลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"เพิ่มลายนิ้วมือแล้ว!"</string>
@@ -1730,7 +1730,7 @@
     <string name="power_camera" msgid="4976286950934622605">"กล้องถ่ายรูป"</string>
     <string name="power_wifi" msgid="1135085252964054957">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"บลูทูธ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"การไม่ใช้งานเครือข่าย"</string>
+    <string name="power_cell" msgid="6596471490976003056">"สแตนด์บายเครือข่าย"</string>
     <string name="power_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ไม่มีการใช้งานแท็บเล็ต"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</string>
@@ -2781,17 +2781,17 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"เฉลี่ย <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"การเพิ่มประสิทธิภาพแบตเตอรี"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"การเพิ่มประสิทธิภาพแบตเตอรี่"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
-    <string name="high_power_on" msgid="3382367497549906927">"ละเว้นการเพิ่มประสิทธิภาพแบตเตอรี"</string>
+    <string name="high_power_on" msgid="3382367497549906927">"ละเว้นการเพิ่มประสิทธิภาพแบตเตอรี่"</string>
     <string name="high_power_off" msgid="3393904131961263278">"เพิ่มประสิทธิภาพการใช้แบตเตอรี"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"การเพิ่มประสิทธิภาพแบตเตอรีไม่พร้อมใช้งาน"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"ไม่ใช้การเพิ่มประสิทธิภาพแบตเตอรี อาจทำให้แบตเตอรีหมดเร็วยิ่งขึ้น"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"การเพิ่มประสิทธิภาพแบตเตอรี่ไม่พร้อมใช้งาน"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"ไม่ใช้การเพิ่มประสิทธิภาพแบตเตอรี่ อาจทำให้แบตเตอรี่หมดเร็วยิ่งขึ้น"</string>
     <plurals name="high_power_count" formatted="false" msgid="2464701722383894640">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> แอปได้รับอนุญาตให้ละเว้นการเพิ่มประสิทธิภาพแบตเตอรี</item>
-      <item quantity="one">1 แอปได้รับอนุญาตให้ละเว้นการเพิ่มประสิทธิภาพแบตเตอรี</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> แอปได้รับอนุญาตให้ละเว้นการเพิ่มประสิทธิภาพแบตเตอรี่</item>
+      <item quantity="one">1 แอปได้รับอนุญาตให้ละเว้นการเพิ่มประสิทธิภาพแบตเตอรี่</item>
     </plurals>
-    <string name="high_power_prompt_title" msgid="4257734526819699048">"ไม่สนใจการเพิ่มประสิทธิภาพแบตเตอรีใช่ไหม"</string>
+    <string name="high_power_prompt_title" msgid="4257734526819699048">"ไม่สนใจการเพิ่มประสิทธิภาพแบตเตอรี่ใช่ไหม"</string>
     <string name="high_power_prompt_body" msgid="4072587909486730876">"ให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> เชื่อมต่อในพื้นหลังต่อไปไหม การดำเนินการนี้อาจใช้แบตเตอรีมากขึ้น"</string>
     <string name="battery_summary" msgid="101415762036784289">"ใช้ <xliff:g id="PERCENTAGE">%1$d</xliff:g>%% ตั้งแต่การชาร์จเต็มครั้งล่าสุด"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"ไม่มีการใช้แบตเตอรี่ตั้งแต่การชาร์จเต็มครั้งล่าสุด"</string>
@@ -2841,7 +2841,7 @@
     <string name="no_data_usage" msgid="9131454024293628063">"ไม่ได้ใช้อินเทอร์เน็ต"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"อนุญาตให้ <xliff:g id="APP">%1$s</xliff:g> เข้าถึงโหมดห้ามรบกวนไหม"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"แอปจะสามารถเปิด/ปิดโหมดห้ามรบกวนและทำการเปลี่ยนแปลงการตั้งค่าที่เกี่ยวข้องได้"</string>
-    <string name="ignore_optimizations_on" msgid="6915689518016285116">"อย่าเพิ่มประสิทธิภาพ"</string>
+    <string name="ignore_optimizations_on" msgid="6915689518016285116">"ไม่เพิ่มประสิทธิภาพ"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"เพิ่มประสิทธิภาพ"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"อาจทำให้แบตเตอรี่หมดอย่างรวดเร็ว"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"แนะนำเพื่ออายุการใช้งานแบตเตอรี่ที่นานขึ้น"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e05c7874355..7b563b8ce63 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -319,8 +319,8 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Parmak izi ekle"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ekran kilidi"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> parmak izi ayarı</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> parmak izi ayarı</item>
+      <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_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>
@@ -343,7 +343,7 @@
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Harika! Şimdi tekrarlayın"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı çok az hareket ettirin."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Parmak izi eklendi!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu simgeyi her gördüğünüzde, bir satın alma işlemini tanımlamak veya satın alma işlemine onay vermek için parmak izinizi kullanabilirsiniz."</string>
+    <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="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidini ayarla"</string>
@@ -352,7 +352,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Cihazınızda parmak izi sensörünü 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">"Satın alma işlemlerini ve uygulama erişimini yetkilendirmek için, telefonunuzun kilidini açmaya ek olarak parmak izinizi de kullanabilirsiniz. "<annotation id="url">"Daha fazla bilgi edinin"</annotation></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>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4504501581228672208">"Ekran kilidi seçeneği devre dışı bırakıldı. Yine de satın alma işlemlerini ve uygulama erişimini yetkilendirmek için parmak izinizi kullanabilirsiniz. "<annotation id="url">"Daha fazla bilgi edinin"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Parmağınızı kaldırın ve sensöre tekrar dokunun"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> adede kadar parmak izi ekleyebilirsiniz"</string>
@@ -1235,7 +1235,7 @@
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ayarlandı"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Desen ayarlandı"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"Devam etmek için cihazınızın desenini kullanın."</string>
-    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Devam etmek için cihazınızın PIN\'ini kullanın."</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"Devam etmek için cihazınızın PIN\'ini girin."</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"Devam etmek için cihazınızın şifresini girin."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Yanlış PIN"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Yanlış şifre"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3d3b26d2a55..93fde70ce83 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -352,7 +352,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用您设备上的指纹传感器。"</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>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了将手机解锁，您还可以在购买物品时和登录应用时使用自己的指纹来验证身份。"<annotation id="url">"了解详情"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4504501581228672208">"屏幕锁定选项已停用。您仍然可以使用自己的指纹对购买交易和应用使用进行授权。"<annotation id="url">"了解详情"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"移开手指，然后再次触摸传感器"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"您最多可以添加 <xliff:g id="COUNT">%d</xliff:g> 个指纹"</string>
@@ -1227,7 +1227,7 @@
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"选择PIN码"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"确认您的密码"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"确认您的图案"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"确认PIN码"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"确认 PIN 码"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"密码不匹配"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN码不匹配！"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"解锁方式选择"</string>
@@ -1235,7 +1235,7 @@
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已设置PIN码"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"图案已设置"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"请绘制您的设备解锁图案，然后再继续。"</string>
-    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"请输入您的设备 PIN 码，然后再继续。"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"您需输入设备 PIN 码才能继续。"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"请输入您的设备密码，然后再继续。"</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN 码错误"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密码错误"</string>
@@ -2786,7 +2786,7 @@
     <string name="high_power_on" msgid="3382367497549906927">"忽略电池优化"</string>
     <string name="high_power_off" msgid="3393904131961263278">"优化电池使用"</string>
     <string name="high_power_system" msgid="7362862974428225301">"没有电池优化设置"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"不应用电池优化设置，但电量可能会更快耗尽。"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"不应用电池优化设置，但电量的消耗速度可能会更快。"</string>
     <plurals name="high_power_count" formatted="false" msgid="2464701722383894640">
       <item quantity="other">已允许 <xliff:g id="COUNT">%d</xliff:g> 个应用忽略电池优化</item>
       <item quantity="one">已允许 1 个应用忽略电池优化</item>
@@ -2843,7 +2843,7 @@
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"此应用将可开启/关闭“勿扰”模式以及更改相关设置。"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"不优化"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"优化"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"可能会更快耗尽电池电量"</string>
+    <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"电池电量的消耗可能会更快"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"建议选择此项以延长电池续航时间"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"要允许<xliff:g id="APP">%s</xliff:g>忽略电池优化吗？"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"无"</string>