diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a7fc5134f86..13e74c641e0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloca el mismo dedo en el sensor de huellas digitales y levántalo después de sentir una vibración."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digit. agregada"</string>
     <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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Cuando veas este ícono, podrás utilizar tu huella digital."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Para cambiar la configuración, ve a Configuración, Seguridad, Huella digital."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"¿Quitar las huellas digitales?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"No podrás utilizar las huellas digitales para desbloquear el teléfono, autorizar compras ni acceder a las aplicaciones con ellas."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sí, deseo quitarlas"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utiliza tu huella digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tablet"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 881499fc076..d0360af0a09 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Jarri hatz bera hatz-marka digitalen sentsorean eta altxa ezazu dardara sentitzean."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gehitu da hatz-marka!"</string>
     <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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Ikono hau ikusten baduzu, hatz-marka digitala erabil dezakezu."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Ezarpenak aldatzeko, zoaz Ezarpenak &gt; Segurtasuna &gt; Hatz-marka digitala aukerara."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> hartz-marka gehi ditzakezu gehienez"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Hatz-marka digitalak kendu nahi dituzu?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Ezin izango dituzu hatz-marka digitalak erabili telefonoa desblokeatzeko, erosketak baimentzeko edo haiekin aplikazioetan saioa hasteko."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Bai, kendu"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Jarraitzeko, erabili hatz-marka."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkriptatzea"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkriptatu tableta"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c72a9231acf..3fb21e56429 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"همان انگشت را روی حسگر اثر انگشت بگذارید و بعد از احساس لرزش آن را بردارید."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"اثر انگشت اضافه شد."</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"برای روشن کردن و باز کردن قفل دستگاهتان کافیست حسگر اثر انگشت را لمس کنید."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"وقتی این نماد را می‌بینید، می‌توانید از اثر انگشتتان استفاده کنید."</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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان استفاده کنید."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"‏برای تغییر تنظیماتتان، به تنظیمات &gt; امنیت &gt; اثر انگشت بروید."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"می‌توانید حداکثر <xliff:g id="COUNT">%d</xliff:g> اثرانگشت اضافه کنید"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <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="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>
@@ -2763,7 +2758,7 @@
     <string name="default_assist_none" msgid="3709083569608735487">"هیچ‌کدام"</string>
     <string name="choose_assist_title" msgid="2373353478479305516">"انتخاب برنامه همیار"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> همیار شما شود؟"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"«دستیار» می‌تواند اطلاعات مربوط به برنامه‌های در حال استفاده در سیستم شما را بخواند، از جمله اطلاعاتی که در صفحه شما قابل مشاهده است یا در برنامه‌ها قابل دسترسی است."</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"«دستیار» می‌تواند اطلاعات مربوط به برنامه‌های در حال استفاده در سیستم شما را بخواند، از جمله اطلاعاتی که در صفحه نمایش شما قابل مشاهده است یا در برنامه‌ها قابل دسترسی است."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"موافقم"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"موافق نیستم"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"انتخاب ورودی گفتاری"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f577aa901b2..4169b21a777 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Mettez le même doigt sur le capteur d\'empreinte digitale et enlevez-le après avoir senti une vibration."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte digitale ajoutée!"</string>
     <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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Lorsque cette icône s\'affiche, vous pouvez utiliser votre empreinte digitale."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Pour modifier les paramètres, sélectionnez Paramètres &gt; Sécurité &gt; Empreinte digitale."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Supprimer toutes les empreintes digitales?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Vous ne pourrez pas utiliser vos empreintes digitales pour déverrouiller votre téléphone, autoriser vos achats ni vous connecter à des applications."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Oui, supprimer"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utilisez votre empreinte digitale pour continuer."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement (ou cryptage)"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 7d16b0e4ff2..f44830e26cc 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -141,7 +141,7 @@
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Appuyer sur le bouton"</item>
     <item msgid="1624323946324499595">"Code PIN de l\'appareil associé"</item>
-    <item msgid="5366790421523328066">"Code PIN de l\'appareil"</item>
+    <item msgid="5366790421523328066">"Code de l\'appareil"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"Connecté"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a8f311ca0a1..a03e5ffa2ce 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -373,7 +373,7 @@
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Veuillez charger votre batterie, puis réessayer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Veuillez brancher votre chargeur, puis réessayer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun code PIN ni mot de passe saisi pour le verrouillage de l\'écran"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Vous devez définir un code ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Chiffrer ?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
@@ -617,7 +617,7 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"Réseaux Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Utiliser WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Autres options"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Utiliser WPS avec code PIN"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Utiliser WPS avec un code"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Rechercher"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
@@ -1940,7 +1940,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Les identifiants sont effacés."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Impossible eff. stockage identifiants."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un code PIN ou un mot de passe pour le verrouillage d\'écran."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un code ou un mot de passe pour le verrouillage d\'écran."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis accédant aux infos utilisation"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e599b7c0f4c..c8f95281b28 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1528,9 +1528,9 @@
     <string name="vpn_settings_not_available" msgid="956841430176985598">"‏הגדרות VPN אינן זמינות עבור המשתמש הזה."</string>
     <string name="tethering_settings_not_available" msgid="6765770438438291012">"הגדרות עבור שיתוף של חיבור אינטרנט אינן זמינות עבור המשתמש הזה"</string>
     <string name="apn_settings_not_available" msgid="7873729032165324000">"‏הגדרות עבור שם נקודת גישה (APN) אינן זמינות עבור המשתמש הזה"</string>
-    <string name="enable_adb" msgid="7982306934419797485">"‏ניקוי באגים ב-USB"</string>
+    <string name="enable_adb" msgid="7982306934419797485">"‏ניפוי באגים ב-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"‏מצב תיקון באגים כאשר USB מחובר"</string>
-    <string name="clear_adb_keys" msgid="4038889221503122743">"‏ביטול הרשאות לניקוי באגים ב-USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"‏ביטול הרשאות לניפוי ב-USB"</string>
     <string name="bugreport_in_power" msgid="7923901846375587241">"קיצור של דוח באגים"</string>
     <string name="bugreport_in_power_summary" msgid="1778455732762984579">"כדי ליצור דוח באגים, הצג לחצן בתפריט לניהול צריכת החשמל"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"השאר פועל"</string>
@@ -1567,9 +1567,9 @@
     <string name="debug_view_attributes" msgid="6485448367803310384">"אפשר בדיקת תכונת תצוגה"</string>
     <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏השתמש בלקוח DHCP של Lollipop במקום לקוח DHCP החדש של Android."</string>
     <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"‏השאר את הנתונים לנייד פעילים תמיד, גם כש-Wi‑Fi פעיל (למעבר מהיר בין רשתות)."</string>
-    <string name="adb_warning_title" msgid="6234463310896563253">"‏לאפשר ניקוי באגים של USB?"</string>
-    <string name="adb_warning_message" msgid="7316799925425402244">"‏ניקוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת אפליקציות במכשיר ללא התראה ולקריאת נתוני יומן."</string>
-    <string name="adb_keys_warning_message" msgid="5659849457135841625">"‏האם לבטל את הגישה לניקוי באגים ב-USB מכל המחשבים שהענקת להם בעבר הרשאה?"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"‏לאפשר ניפוי באגים של USB?"</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"‏ניפוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת אפליקציות במכשיר ללא התראה ולקריאת נתוני יומן."</string>
+    <string name="adb_keys_warning_message" msgid="5659849457135841625">"‏האם לבטל את הגישה לניפוי ב-USB מכל המחשבים שהענקת להם בעבר הרשאה?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"האם להתיר הגדרות פיתוח?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"הגדרות אלה מיועדות לשימוש בפיתוח בלבד. הן עלולות לגרום למכשיר או לאפליקציות המותקנות בו לקרוס או לפעול באופן לא תקין."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"‏אמת אפליקציות באמצעות USB"</string>
@@ -2097,10 +2097,10 @@
     <string name="select_all" msgid="1562774643280376715">"בחר הכל"</string>
     <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_not_set" msgid="718752499586403499">"לא הוגדרה אפליקציה לניקוי באגים"</string>
-    <string name="debug_app_set" msgid="2063077997870280017">"אפליקציה לניקוי באגים: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="debug_debugging_category" msgid="6781250159513471316">"ניפוי באגים"</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>
     <string name="no_application" msgid="2813387563129153880">"אף אחת"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"המתן למנקה באגים"</string>
@@ -2122,7 +2122,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"‏הבזק תצוגות בתוך חלונות בעת ציור באמצעות ה-GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"הצג עדכוני שכבות חומרה"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"הצג הבהוב ירוק לשכבות חומרה כשהן מתעדכנות"</string>
-    <string name="debug_hw_overdraw" msgid="2968692419951565417">"‏חריגה בניקוי באגים ב-GPU"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"‏חריגה בניפוי באגים ב-GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"‏השבת שכבות על של HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"‏השתמש תמיד ב-GPU להרכבת מסך"</string>
     <string name="simulate_color_space" msgid="6745847141353345872">"צור הדמיה של מרחב צבעים"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 3da22c302e0..24cebf891f9 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2358,21 +2358,16 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"შრიფტის ზომის შეცვლა"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"შეხებით გადახდა"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"როგორ მუშაობს"</string>
-    <!-- no translation found for nfc_payment_no_apps (5477904979148086424) -->
-    <skip />
+    <string name="nfc_payment_no_apps" msgid="5477904979148086424">"გადაიხადეთ მაღაზიებში თქვენი ტელეფონით"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"გადახდის სტანდარტული აპი"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"არ არის დაყენებული"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <!-- no translation found for nfc_payment_use_default (3234730182120288495) -->
-    <skip />
-    <!-- no translation found for nfc_payment_favor_default (5743781166099608372) -->
-    <skip />
-    <!-- no translation found for nfc_payment_favor_open (1923314062109977944) -->
-    <skip />
+    <string name="nfc_payment_use_default" msgid="3234730182120288495">"ნაგულისხმევის გამოყენება"</string>
+    <string name="nfc_payment_favor_default" msgid="5743781166099608372">"ყოველთვის"</string>
+    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"გარდა იმ შემთხვევისა, როცა გადახდის სხვა აპია გახსნილი"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"შეხებით გადახდა ტერმინალიდან, გადახდა:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"ტერმინალთან გადახდა"</string>
-    <!-- no translation found for nfc_how_it_works_content (4749007806393224934) -->
-    <skip />
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"დააყენეთ გადახდის აპი. შემდეგ უბრალოდ მიადეთ თქვენი ტელეფონის უკანა მხარე ნებისმიერ ტერმინალს, რომელსაც უკონტაქტო სიმბოლო აქვს."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"გასაგებია"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"მეტი..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"დაყენდეს, როგორც უპირატესი?"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3f5e064c14d..3fb9dabcd0a 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Letakkan jari yang sama pada penderia cap jari dan angkat jari anda selepas merasa getaran."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Cap jari ditambahkan!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Apabila anda melihat ikon ini, anda boleh menggunakan cap jari untuk pengenalan atau membenarkan pembelian."</string>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Anda boleh menggunakan cap jari setiap kali ikon ini kelihatan."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Untuk menukar tetapan anda, pergi ke Tetapan &gt; Keselamatan &gt; Cap jari."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Anda boleh menambah sehingga <xliff:g id="COUNT">%d</xliff:g> cap jari"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Alih keluar semua cap jari?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Anda tidak akan dapat menggunakan cap jari untuk membuka kunci telefon, membenarkan pembelian atau log masuk ke apl."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ya, alih keluar"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Gunakan cap jari anda untuk meneruskan."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Penyulitan"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Sulitkan tablet"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 85af0d88abb..1d52ee7555d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloque o mesmo dedo no sensor de impressão digital e retire-o após sentir uma vibração."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada"</string>
     <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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Para alterar suas configurações, vá para \"Configurações &gt; Segurança &gt; Impressão digital\"."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas as impressões digitais?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Você não poderá usar suas impressões digitais para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use sua impressão digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e967d9e2161..f64db73c847 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloque o mesmo dedo no sensor de impressão digital e levante-o depois de sentir uma vibração."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Impres. digital adic.!"</string>
     <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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Quando vir este ícone, pode utilizar a sua impressão digital."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Para alterar as suas definições, aceda a Definições &gt; Segurança &gt; Impressão digital."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Pode adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas impressões digitais?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Não poderá utilizar as impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações com elas."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Utilize a sua impressão digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 85af0d88abb..1d52ee7555d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Coloque o mesmo dedo no sensor de impressão digital e retire-o após sentir uma vibração."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada"</string>
     <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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Sempre que esse ícone é exibido, você pode usar sua impressão digital."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Para alterar suas configurações, vá para \"Configurações &gt; Segurança &gt; Impressão digital\"."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Remover todas as impressões digitais?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Você não poderá usar suas impressões digitais para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Sim, remover"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Use sua impressão digital para continuar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 59010610f1d..b05ad6f6c93 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -348,10 +348,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Приложите палец к сканеру и удерживайте, пока не почувствуете вибрацию. Всегда используйте один и тот же палец."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечаток добавлен!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Этот значок сообщает, что вы можете подтверждать покупки и проходить индентификацию с помощью отпечатка пальца."</string>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Чтобы разблокировать устройство, приложите палец к сканеру."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Этот значок сообщает, что вы можете использовать отпечаток пальца."</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>
@@ -364,12 +362,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Этот значок сообщает, что вы можете использовать отпечаток пальца."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Чтобы изменить параметры, нажмите \"Настройки &gt; Безопасность &gt; Отпечатки пальцев\"."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Максимальное количество отпечатков пальца, которые можно добавить: <xliff:g id="COUNT">%d</xliff:g>"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <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="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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ff3d9e9ceae..b42f04ac099 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Sätt samma finger på fingeravtryckssensorn och lyft det när du känner vibrationen."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeravtrycket har lagts till!"</string>
     <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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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="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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"När du ser den här ikonen kan du använda ditt fingeravtryck."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Om du vill ändra inställningarna väljer du Inställningar &gt; Säkerhet &gt; Fingeravtryck."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Du kan lägga till upp till <xliff:g id="COUNT">%d</xliff:g> fingeravtryck"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Vill du ta bort alla fingeravtryck?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Du kommer inte längre att kunna låsa upp mobilen, godkänna köp eller logga in i appar med hjälp av fingeravtryck."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Ja, ta bort"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Fortsätt med hjälp av ditt fingeravtryck."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera surfplattan"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6204625abac..480e4a1dccb 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"Aynı parmağınızı parmak izi sensörünün üzerine koyun ve bir titreşim hissettikten sonra parmağınızı kaldırın."</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>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <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>
     <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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Bu simgeyi her gördüğünüzde parmak izinizi kullanabilirsiniz."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Ayarlarınızı değiştirmek için Ayarlar &gt; Güvenlik &gt; Parmak izi\'ne gidin."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> adede kadar parmak izi ekleyebilirsiniz"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Tüm parmak izleri kaldırılsın mı?"</string>
+    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izlerinizi kullanamayacaksınız."</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Evet, kaldır"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Devam etmek için parmak izinizi kullanın."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifreleme"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tableti şifrele"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 38f2d8094cf..b0d686691e5 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"وہی انگلی فنگر پرنٹ سینسر پر رکھیں اور وائبریشن محسوس کرنے کے بعد ہٹائیں۔"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"فنگر پرنٹ شامل کیا!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ شناخت کرنے یا خریداری کی توثیق کرنے کیلئے اپنا فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"اپنے آلے کو جگانے اور غیر مقفل کرنے کیلئے بس فنگرپرنٹ سنسر کو ٹچ کریں۔"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"جب آپ اس آئیکن کو دیکھیں تو آپ اپنا فنگرپرنٹ استعمال کر سکتے ہیں۔"</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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ اپنی فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"‏اپنی ترتیبات تبدیل کرنے کیلئے، ترتیبات ‎&lt;‎ سیکیورٹی ‎&lt;‎ فنگر پرنٹ پر جائیں۔"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"آپ <xliff:g id="COUNT">%d</xliff:g> تک فنگر پرنٹس کا اضافہ کر سکتے ہیں"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <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="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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 6a17eb6bda2..cf8fd90c05d 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2763,7 +2763,7 @@
     <string name="default_assist_none" msgid="3709083569608735487">"無"</string>
     <string name="choose_assist_title" msgid="2373353478479305516">"選擇輔助應用程式"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"讓 <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> 成為您的小幫手？"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"這個小幫手將能夠讀取與您系統使用中的應用程式有關的資料，包括螢幕上顯示的資料或可在應用程式中存取的資料。"</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"這個小幫手將能讀取系統目前使用的應用程式資料，包括螢幕顯示的資料或可在應用程式中存取的資料。"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"同意"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"不同意"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"選擇語音輸入"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0e0cf35b967..2fe0b7a5b59 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -344,10 +344,8 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="8846866512704467036">"將同一根手指放在指紋感應器上，直到感應器震動後再移開手指。"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋新增成功！"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示您可以使用指紋來驗證身分或授權進行購物交易。"</string>
-    <!-- no translation found for setup_fingerprint_enroll_finish_message (7234264291957984004) -->
-    <skip />
-    <!-- no translation found for setup_fingerprint_enroll_finish_message_secondary (7280546429133276374) -->
-    <skip />
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"輕觸指紋感應器即可將裝置喚醒及解鎖。"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"只要看到這個圖示，就表示您可以使用指紋。"</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>
@@ -360,12 +358,9 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"只要看到這個圖示，就表示您可以使用指紋。"</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"如要變更您的設定，請依序前往 [設定] &gt; [安全性] &gt; [指紋]。"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"您最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
-    <!-- no translation found for fingerprint_last_delete_title (6410310101247028988) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_message (8318926239554839722) -->
-    <skip />
-    <!-- no translation found for fingerprint_last_delete_confirm (2634726361059274289) -->
-    <skip />
+    <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="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>