Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
diff --git a/res/raw/udfps_left_edge_hint_lottie.json b/res/raw/udfps_left_edge_hint_lottie.json
index e69de29..9e26dfe 100644
--- a/res/raw/udfps_left_edge_hint_lottie.json
+++ b/res/raw/udfps_left_edge_hint_lottie.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/res/raw/udfps_right_edge_hint_lottie.json b/res/raw/udfps_right_edge_hint_lottie.json
index e69de29..9e26dfe 100644
--- a/res/raw/udfps_right_edge_hint_lottie.json
+++ b/res/raw/udfps_right_edge_hint_lottie.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/res/raw/udfps_tip_hint_lottie.json b/res/raw/udfps_tip_hint_lottie.json
index e69de29..9e26dfe 100644
--- a/res/raw/udfps_tip_hint_lottie.json
+++ b/res/raw/udfps_tip_hint_lottie.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3014851..ffa2b6a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2436,7 +2436,7 @@
<string name="accessibility_text_reading_options_suggestion_title" msgid="2492155642665312733">"تغيير كيفية عرض النص"</string>
<string name="accessibility_text_reading_preview_mail_subject" msgid="4597374768612733616">"الموضوع: تصميمات منطاد الهواء الساخن"</string>
<string name="accessibility_text_reading_preview_mail_from" msgid="1797499780365288020">"مِن: حازم"</string>
- <string name="accessibility_text_reading_preview_mail_content" msgid="8078152365771951802">"صباح الخير.\n\nأردت فقط الاطمئنان على سير العمل في التصميمات. هل ستكون التصميمات جاهزة قبل البدء في إنشاء النوافذ المنبثقة الجديدة؟"</string>
+ <string name="accessibility_text_reading_preview_mail_content" msgid="8078152365771951802">"صباح الخير.\n\nأودّ الاطمئنان على التقدّم المحرز في التصميمات. هل ستكون جاهزة قبل البدء في إنشاء البالونات الجديدة؟"</string>
<string name="accessibility_text_reading_reset_button_title" msgid="5960753279788187669">"إعادة ضبط الإعدادات"</string>
<string name="accessibility_text_reading_reset_message" msgid="824644303661026712">"تمت إعادة ضبط إعدادات حجم الشاشة والنص."</string>
<string name="accessibility_text_reading_confirm_dialog_title" msgid="2865331351355690389">"هل تريد إعادة ضبط حجم الشاشة والنص؟"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index eb5bed6..334477d 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -597,7 +597,7 @@
<string name="security_advanced_settings_keywords" msgid="5294945170370974974">"সুৰক্ষা, সুৰক্ষা সম্পৰ্কীয় অধিক ছেটিং, অধিক ছেটিং, উন্নত সুৰক্ষা সম্পৰ্কীয় ছেটিং"</string>
<string name="privacy_advanced_settings" msgid="8828215456566937719">"গোপনীয়তাৰ অধিক ছেটিং"</string>
<string name="privacy_advanced_settings_summary" msgid="2927281894237561935">"স্বয়ংক্ৰিয়ভাৱে পূৰ হোৱা সুবিধা, কাৰ্যকলাপৰ নিয়ন্ত্ৰণ আৰু বহুতো"</string>
- <string name="fingerprint_add_max" msgid="8639321019299347447">"আপুনি <xliff:g id="COUNT">%d</xliff:g>লৈকে ফিংগাৰপ্ৰিণ্ট যোগ কৰিব পাৰে"</string>
+ <string name="fingerprint_add_max" msgid="8639321019299347447">"আপুনি <xliff:g id="COUNT">%d</xliff:g> টালৈকে ফিংগাৰপ্ৰিণ্ট যোগ কৰিব পাৰে"</string>
<string name="fingerprint_intro_error_max" msgid="4431784409732135610">"আপুনি সৰ্বাধিক সংখ্যক ফিংগাৰপ্ৰিণ্টবোৰ যোগ কৰিছে"</string>
<string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"আৰু অধিক ফিংগাৰপ্ৰিণ্ট যোগ কৰিব নোৱাৰি"</string>
<string name="fingerprint_last_delete_title" msgid="4081475675646514726">"আটাইবোৰ ফিংগাৰপ্ৰিণ্ট আঁতৰাবনে?"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 748853f..5ca1f6e 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -576,7 +576,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Želite li da preskočite podešavanje lozinke?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Želite da preskočite podešavanje lozinke i lica?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Preskočićete podešavanje lozinke i otiska prsta?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Preskočićete podešavanje lozinke, lica i otiska?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Preskočićete podešavanje lozinke, lica i otiska prsta?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Želite li da preskočite podešavanje šablona?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Želite da preskočite podešavanje šablona i lica?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Preskočićete podešavanje šablona i otiska prsta?"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b0c2b98..b0b5232 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2073,7 +2073,7 @@
<string name="enable_text" msgid="8570798764647110430">"Активиране"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"Изчистване на данните"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"Деинсталиране на актуализации"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Разрешаване на ограничените настройки"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Разрешаване на ограничени настройки"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"Някои избрани от вас действия се отварят по подразбиране в това приложение."</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Избрахте да разрешите на това приложение да създава приспособления и да осъществява достъп до данните им."</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"Не са зададени стандартни."</string>
@@ -2477,8 +2477,8 @@
<string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибриране при звънене"</string>
<string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибриране при известия"</string>
<string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Обратна връзка при докосване"</string>
- <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Използване на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
- <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отваряне на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+ <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Използване на: <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+ <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отваряне на: <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
<string name="accessibility_service_auto_added_qs_tooltip_content" msgid="2941824314912928072">"Приложението <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> е добавено към бързите настройки. По всяко време можете да прекарате пръст надолу, за да го включите или изключите."</string>
<string name="accessibility_service_qs_tooltip_content" msgid="6002493441414967868">"Можете също да добавите <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> към бързите настройки от горната част на екрана"</string>
<string name="accessibility_color_correction_auto_added_qs_tooltip_content" msgid="9092661358437404374">"Функцията за корекция на цветовете е добавена към бързите настройки. По всяко време можете да прекарате пръст надолу, за да я включите или изключите."</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 54bc07c..71c1778 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -588,7 +588,7 @@
<string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="132085362209418770">"Registracija nije dovršena"</string>
<string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="5479647886550695766">"Vrijeme za registraciju otiska prsta je isteklo. Pokušajte ponovo."</string>
<string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"Registracija otiska prsta nije uspjela. Pokušajte ponovo ili koristite drugi prst."</string>
- <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Dodaj još jedan"</string>
+ <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Dodajte još jedan"</string>
<string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Naprijed"</string>
<string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Osim otključavanja telefona, otisak prsta takođe možete koristiti za odobravanje kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
<string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"Opcija zaključavanja ekrana je onemogućena. Da saznate više, kontaktirajte administratora organizacije."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2ee797a..73d3e63 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1259,7 +1259,7 @@
<string name="sound_settings" msgid="7622986039384531304">"So i vibració"</string>
<string name="all_volume_title" msgid="6196367642878437513">"Volum"</string>
<string name="musicfx_title" msgid="5458574743312283473">"Efectes musicals"</string>
- <string name="ring_volume_title" msgid="4869034595079914541">"Volum de to i de notificacions"</string>
+ <string name="ring_volume_title" msgid="4869034595079914541">"Volum de sons i notificacions"</string>
<string name="vibrate_in_silent_title" msgid="5076579100685867363">"Vibra quan estigui en silenci"</string>
<string name="notification_sound_title" msgid="8747567935870133157">"So de notificació predeterminat"</string>
<string name="incoming_call_volume_title" msgid="8445408274513654261">"So de trucada"</string>
@@ -1696,8 +1696,8 @@
<string name="storage_wizard_migrate_v2_checklist_apps" msgid="1882077445750580783">"Algunes aplicacions no funcionaran"</string>
<string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="6111770421449869539">"Mantén aquesta tauleta carregada"</string>
<string name="storage_wizard_migrate_v2_checklist_battery" product="default" msgid="8826915870192535008">"Mantén aquest telèfon carregat"</string>
- <string name="storage_wizard_migrate_v2_now" msgid="3341460117088026966">"Transfereix el contingut"</string>
- <string name="storage_wizard_migrate_v2_later" msgid="6067756122853315642">"Transfereix el contingut més tard"</string>
+ <string name="storage_wizard_migrate_v2_now" msgid="3341460117088026966">"Mou el contingut"</string>
+ <string name="storage_wizard_migrate_v2_later" msgid="6067756122853315642">"Mou el contingut més tard"</string>
<string name="storage_wizard_migrate_progress_v2_title" msgid="8791318509516968103">"S\'està transferint el contingut…"</string>
<string name="storage_wizard_slow_v2_title" msgid="3760766921170980221">"Suport extern lent (<xliff:g id="NAME">^1</xliff:g>)"</string>
<string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"Pots continuar fent servir aquest suport extern (<xliff:g id="NAME_0">^1</xliff:g>), tot i que pot trigar una mica. \n\nÉs possible que les aplicacions emmagatzemades en aquest suport extern (<xliff:g id="NAME_1">^2</xliff:g>) no funcionin correctament i que les transferències de contingut triguin molt de temps. \n\nProva un altre suport (<xliff:g id="NAME_2">^3</xliff:g>) més ràpid o fes servir aquest (<xliff:g id="NAME_3">^4</xliff:g>) com a emmagatzematge portàtil."</string>
@@ -3696,7 +3696,7 @@
<string name="remote_media_volume_option_title" msgid="8760846743943305764">"Volum emès"</string>
<string name="call_volume_option_title" msgid="1461105986437268924">"Volum de trucada"</string>
<string name="alarm_volume_option_title" msgid="6398641749273697140">"Volum d\'alarma"</string>
- <string name="ring_volume_option_title" msgid="1520802026403038560">"Volum de to i de notificacions"</string>
+ <string name="ring_volume_option_title" msgid="1520802026403038560">"Volum de sons i notificacions"</string>
<string name="notification_volume_option_title" msgid="4838818791683615978">"Volum de notificació"</string>
<string name="ringtone_title" msgid="3271453110387368088">"So de trucada del telèfon"</string>
<string name="notification_ringtone_title" msgid="6924501621312095512">"So de notificació predeterminat"</string>
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Més informació"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Configuració restringida"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"S\'ha permès la configuració restringida per a <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Es permet la configuració restringida per a <xliff:g id="APP_NAME">%s</xliff:g>"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Per la teva seguretat, aquesta opció de configuració no està disponible en aquests moments."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Informació del dispositiu finançat"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"La teva entitat de crèdit pot canviar la configuració i instal·lar programari en aquest dispositiu.\n\nSi t\'oblides d\'un pagament, el dispositiu es bloquejarà.\n\nPer obtenir més informació, contacta amb l\'entitat de crèdit."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e223ac4..0e72182 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vil du springe adgangskodekonfiguration over?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Vil du udelade konfiguration af adgangskode og ansigt?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Vil du udelade konfiguration af adgangskode og fingeraftryk?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Vil du udelade konfiguration af adgangskode, ansigt og fingeraftryk?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Vil du udelade at bruge adgangskode, ansigt og fingeraftryk?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vil du springe mønsterkonfiguration over?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Vil du udelade konfiguration af mønster og ansigt?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Vil du udelade konfiguration af mønster og fingeraftryk?"</string>
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Få flere oplysninger"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Begrænset indstilling"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Begrænsede indstillinger tillades for <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Begrænsede indstillinger tilladt for <xliff:g id="APP_NAME">%s</xliff:g>"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Af hensyn til din sikkerhed er denne indstilling i øjeblikket ikke tilgængelig."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Oplysninger om finansieret enhed"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Din kreditudbyder kan ændre indstillinger og installere software på denne enhed.\n\nHvis du glemmer en betaling, bliver din enhed låst.\n\nKontakt din kreditudbyder for at få flere oplysninger."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cc867b6..a04c1b2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -445,7 +445,7 @@
<string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nein danke"</string>
<string name="security_settings_fingerprint_enroll_introduction_agree" msgid="4068276083536421828">"Ich stimme zu"</string>
<string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Fingerabdruck überspringen?"</string>
- <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"Die Fingerabdruck-Einrichtung dauert nur ein, zwei Minuten. Wenn du sie jetzt überspringst, kannst du sie später über die Einstellungen nachholen."</string>
+ <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"Die Einrichtung des Fingerabdrucks dauert nur wenige Minuten. Wenn du sie jetzt überspringst, kannst du sie später über die Einstellungen nachholen."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"Wenn du dieses Symbol siehst, kannst du deinen Fingerabdruck zur Authentifizierung verwenden, beispielsweise zur Anmeldung in Apps oder um Käufe zu autorisieren"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"Hinweis"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" msgid="5824014348182478279">"Das Entsperren per Fingerabdruck kann möglicherweise nicht so sicher sein wie ein komplexes Muster oder eine PIN."</string>
@@ -525,7 +525,7 @@
<string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerabdruck hinzugefügt"</string>
<string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Tablet zu entsperren oder dich in Apps zu authentifizieren, beispielsweise um dich anzumelden"</string>
<string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Gerät zu entsperren oder dich in Apps zu authentifizieren, beispielsweise um dich anzumelden"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder dich in Apps zu authentifizieren, beispielsweise um dich anzumelden"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder dich in Apps zu authentifizieren, beispielsweise um dich anzumelden."</string>
<string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Später"</string>
<string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Hebe den Finger an und lege ihn dann noch mal auf den Sensor"</string>
<string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Halte nacheinander beide Seiten der Fingerkuppe einen Moment lang auf den Sensor"</string>
@@ -2343,7 +2343,7 @@
<string name="accessibility_text_reading_options_suggestion_title" msgid="2492155642665312733">"Textanzeige ändern"</string>
<string name="accessibility_text_reading_preview_mail_subject" msgid="4597374768612733616">"Betreff: Designs für Heißluftballons"</string>
<string name="accessibility_text_reading_preview_mail_from" msgid="1797499780365288020">"Von: Bernd"</string>
- <string name="accessibility_text_reading_preview_mail_content" msgid="8078152365771951802">"Hallo,\n\nwie geht es mit den Entwürfen voran? Werden sie fertig sein, bevor wir mit dem Erstellen der neuen Info-Pop-ups beginnen?"</string>
+ <string name="accessibility_text_reading_preview_mail_content" msgid="8078152365771951802">"Guten Morgen,\n\nwie geht es mit den Entwürfen voran? Werden sie fertig sein, bevor wir mit der Herstellung der neuen Ballons beginnen?"</string>
<string name="accessibility_text_reading_reset_button_title" msgid="5960753279788187669">"Einstellungen zurücksetzen"</string>
<string name="accessibility_text_reading_reset_message" msgid="824644303661026712">"Einstellungen für Anzeigegröße und Text wurden zurückgesetzt"</string>
<string name="accessibility_text_reading_confirm_dialog_title" msgid="2865331351355690389">"Anzeigegröße und Text zurücksetzen?"</string>
@@ -2541,8 +2541,8 @@
<string name="daltonizer_mode_protanomaly_title" msgid="6392456967103014723">"Rot-Grün-Sehschwäche"</string>
<string name="daltonizer_mode_tritanomaly_title" msgid="2278786218762602022">"Blau-Gelb-Sehschwäche"</string>
<string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Graustufen"</string>
- <string name="daltonizer_mode_deuteranomaly_summary" msgid="2117727423019598455">"Grün-Sehschwäche"</string>
- <string name="daltonizer_mode_protanomaly_summary" msgid="4617032854982040748">"Rot-Sehschwäche"</string>
+ <string name="daltonizer_mode_deuteranomaly_summary" msgid="2117727423019598455">"Grün-Sehschwäche, Deuteranomalie"</string>
+ <string name="daltonizer_mode_protanomaly_summary" msgid="4617032854982040748">"Rot-Sehschwäche, Protanomalie"</string>
<string name="daltonizer_mode_tritanomaly_summary" msgid="2428218320118180070">"Tritanomalie"</string>
<string name="reduce_bright_colors_preference_title" msgid="2249314004651574997">"Extradunkel"</string>
<string name="reduce_bright_colors_switch_title" msgid="1751678397884065312">"Display extradunkel aktivieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ae76e72..47fb29d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Μάθετε περισσότερα"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Περιορισμένη ρύθμιση"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Επιτρέπονται οι περιορισμένες ρυθμίσεις για <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Επιτρέπονται οι περιορισμένες ρυθμίσεις για το <xliff:g id="APP_NAME">%s</xliff:g>"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Για την ασφάλειά σας, αυτή η ρύθμιση δεν είναι διαθέσιμη αυτήν τη στιγμή."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Πληροφορίες χρηματοδοτούμενης συσκευής"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Ο πωλητής συσκευών με πίστωση μπορεί να αλλάζει τις ρυθμίσεις και να εγκαθιστά λογισμικό σε αυτήν τη συσκευή.\n\nΕάν δεν καταβάλετε κάποια πληρωμή, η συσκευή σας θα κλειδωθεί.\n\nΓια να μάθετε περισσότερα, επικοινωνήστε με τον πωλητή συσκευών με πίστωση."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 65ab282..c2e291c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -4295,7 +4295,7 @@
<string name="device_feedback" msgid="5351614458411688608">"Enviar comentarios del dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="4435410646541671918">"Ingresa el PIN de administrador"</string>
<string name="switch_on_text" msgid="5664542327776075105">"Activado"</string>
- <string name="switch_off_text" msgid="1315547447393646667">"Desactivado"</string>
+ <string name="switch_off_text" msgid="1315547447393646667">"Sin activar"</string>
<string name="nfc_setting_on" msgid="7701896496026725772">"Activada"</string>
<string name="nfc_setting_off" msgid="7142103438532732309">"Desactivada"</string>
<string name="screen_pinning_switch_on_text" msgid="6971386830247542552">"Activada"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 37a89ae..1e341b2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Más información"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Ajuste restringido"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Ajustes restringidos permitidos para <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Se permiten los ajustes restringidos para <xliff:g id="APP_NAME">%s</xliff:g>"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Por seguridad, este ajuste no está disponible actualmente."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Información sobre el dispositivo financiado"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Tu entidad de crédito puede cambiar ajustes e instalar software en este dispositivo.\n\nSi olvidas un pago, tu dispositivo se bloqueará.\n\nPide más información a tu entidad de crédito."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 5ea3358..59b593f 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -521,9 +521,9 @@
<string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Horrela, hatz-markaren eremu zabalagoa hartzen da"</string>
<string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Hatz-markaren ehuneko <xliff:g id="PERCENTAGE">%d</xliff:g> erregistratu da"</string>
<string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Gehitu da hatz-marka"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Orain, hatz-marka erabil dezakezu tableta desblokeatzeko edo zeu zarela egiaztatzeko, hala nola aplikazioetan saioa hastean"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Orain, hatz-marka erabil dezakezu gailua desblokeatzeko edo zeu zarela egiaztatzeko, hala nola aplikazioetan saioa hastean"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Orain, hatz-marka erabil dezakezu telefonoa desblokeatzeko edo zeu zarela egiaztatzeko, hala nola aplikazioetan saioa hastean"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Orain, tableta desblokeatzeko edo zeu zarela egiaztatzeko erabil dezakezu hatz-marka, hala nola aplikazioetan saioa hastean"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Orain, gailua desblokeatzeko edo zeu zarela egiaztatzeko erabil dezakezu hatz-marka, hala nola aplikazioetan saioa hastean"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Orain, telefonoa desblokeatzeko edo zeu zarela egiaztatzeko erabil dezakezu hatz-marka, hala nola aplikazioetan saioa hastean"</string>
<string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Geroago"</string>
<string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Jaso hatza eta ukitu berriro"</string>
<string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Jarri hatz-markaren albo bat sentsorearen gainean eta eutsi horrela. Ondoren, egin gauza bera beste alboarekin."</string>
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Lortu informazio gehiago"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Ezarpen mugatua"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Eman da <xliff:g id="APP_NAME">%s</xliff:g> aplikazioan ezarpen mugatuak erabiltzeko baimena"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Baimendu dira ezarpen mugatuak <xliff:g id="APP_NAME">%s</xliff:g> aplikazioan"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Zure segurtasuna bermatzeko, ezarpena ez dago erabilgarri une honetan."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Gailu finantzatuaren informazioa"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Kreditu bidezko gailu-hornitzaileak gailuaren ezarpenak alda ditzake, eta bertan softwarea instalatu.\n\nOrdainketaren bat egiten ez baduzu, gailua blokeatu egingo da.\n\nInformazio gehiago lortzeko, jarri harremanetan kreditu bidezko gailu-hornitzailearekin."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 006a929..dc7adaa 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3015,7 +3015,7 @@
<string name="voice_interaction_security_warning" msgid="7962884055885987671">"Ce service de saisie vocale pourra effectuer une écoute vocale permanente et utiliser en votre nom les applications commandées par la voix. Il provient de l\'application : <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Autoriser l\'utilisation de ce service ?"</string>
<string name="tts_engine_preference_title" msgid="7808775764174571132">"Moteur préféré"</string>
<string name="tts_engine_settings_title" msgid="1298093555056321577">"Paramètres du moteur"</string>
- <string name="tts_sliders_title" msgid="6901146958648426181">"Cadence et ton"</string>
+ <string name="tts_sliders_title" msgid="6901146958648426181">"Débit et ton"</string>
<string name="tts_engine_section_title" msgid="5115035218089228451">"Moteur"</string>
<string name="tts_install_voice_title" msgid="5133545696447933812">"Voix"</string>
<string name="tts_spoken_language" msgid="4652894245474520872">"Langue parlée"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ce52c99..a5f430a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Queres omitir a configuración do contrasinal?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Omitir configuración (contrasinal e cara)?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Omitir configuración de contrasinal e impresión?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Omitir axuste (contrasinal, cara e impresión)?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Omitir configuración de contrasinal, cara e impresión dixital?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Queres omitir a configuración do padrón?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Omitir configuración (padrón e cara)?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Omitir configuración (padrón e impresión)?"</string>
@@ -2071,7 +2071,7 @@
<string name="enable_text" msgid="8570798764647110430">"Activar"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"Borrar almacenamento"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"Desinstalar actualizacións"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Permite as opcións de configuración restrinxidas"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Permite as opcións restrinxidas"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"Algunhas actividades que seleccionaches ábrense nesta aplicación de forma predeterminada."</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Decidiches permitir a esta aplicación crear widgets e acceder aos seus datos."</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"Non se definiu ningún valor predeterminado."</string>
@@ -4590,7 +4590,7 @@
<string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"A batería pódese esgotar máis rápido. Deixarase de restrinxir o uso da batería en segundo plano por parte da aplicación."</string>
<string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Recomendado para aumentar a duración da batería"</string>
<string name="ignore_optimizations_title" msgid="3464172726254542889">"Queres permitir que <xliff:g id="APP">%s</xliff:g> ignore as optimizacións da batería?"</string>
- <string name="app_list_preference_none" msgid="1635406344616653756">"Ningunha"</string>
+ <string name="app_list_preference_none" msgid="1635406344616653756">"Ningún"</string>
<string name="work_profile_usage_access_warning" msgid="3477719910927319122">"A desactivación do acceso aos datos de uso desta aplicación non impide que o teu administrador realice o seguimento do uso de datos das aplicacións no teu perfil de traballo"</string>
<string name="accessibility_lock_screen_progress" msgid="4597298121698665401">"Uso de <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> caracteres"</string>
<string name="draw_overlay" msgid="7902083260500573027">"Superpor a aplicacións"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 70cad00..d169029 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2344,7 +2344,7 @@
<string name="accessibility_text_reading_reset_button_title" msgid="5960753279788187669">"सेटिंग रीसेट करें"</string>
<string name="accessibility_text_reading_reset_message" msgid="824644303661026712">"डिसप्ले साइज़ और टेक्स्ट की सेटिंग रीसेट हो गई हैं"</string>
<string name="accessibility_text_reading_confirm_dialog_title" msgid="2865331351355690389">"क्या आपको डिसप्ले के साइज़ और टेक्स्ट को रीसेट करना है?"</string>
- <string name="accessibility_text_reading_confirm_dialog_message" msgid="517090197003540264">"आपके डिसप्ले का साइज़ और मैसेज भेजने की प्राथमिकता, फ़ोन की मूल सेटिंग पर रीसेट कर दी जाएगी"</string>
+ <string name="accessibility_text_reading_confirm_dialog_message" msgid="517090197003540264">"आपके डिसप्ले का साइज़ और टेक्स्ट की सेटिंग, फ़ोन की मूल सेटिंग पर रीसेट कर दी जाएगी"</string>
<string name="accessibility_text_reading_confirm_dialog_reset_button" msgid="8215800137850243736">"रीसेट करें"</string>
<string name="accessibility_text_reading_conversation_message_1" msgid="7883952203831957831">"वीकेंड का कोई प्लान है?"</string>
<string name="accessibility_text_reading_conversation_message_2" msgid="8112160435318635856">"बीच की ओर जा रहे हैं. क्या आपको आना है?"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 67c38db..b7ce456 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Իմանալ ավելին"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Սահմանափակ ռեժիմի կարգավորում"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Սահմանափակումները թույլատրված են <xliff:g id="APP_NAME">%s</xliff:g> հավելվածի համար"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"<xliff:g id="APP_NAME">%s</xliff:g> հավելվածի համար թույլատրված են սահմանափակված կարգավորումները"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Անվտանգության նկատառումներից ելնելով՝ այս կարգավորումը ներկայումս անհասանելի է։"</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Ֆինանսավորվող սարքի մասին"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Ձեր բանկը կարող է փոխել կարգավորումները և այս սարքում ծրագրեր տեղադրել։\n\nԵթե դուք բաց թողնեք վճարումը, ձեր սարքը կկողպվի։\n\nԼրացուցիչ տեղեկությունների համար դիմեք ձեր բանկին։"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7f2ba46..b176b61 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Saltare l\'impostazione della password?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Saltare l\'impostazione di password e volto?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Saltare l\'impostazione di password e impronta?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Saltare impostaz. di password, volto e impronta?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Non vuoi impostare password, volto e impronta?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Saltare l\'impostazione della sequenza?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Saltare l\'impostazione di sequenza e volto?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Saltare l\'impostazione di sequenza e impronta?"</string>
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Scopri di più"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Impostazioni con limitazioni"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Impostazioni con limitazioni consentite per l\'app <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Impostazioni con limitazioni consentite per <xliff:g id="APP_NAME">%s</xliff:g>"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Per la tua sicurezza, questa impostazione non è al momento disponibile."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Informazioni sul dispositivo finanziato"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Il tuo fornitore di credito può modificare le impostazioni e installare software su questo dispositivo.\n\nSe salti un pagamento, il dispositivo verrà bloccato.\n\nPer saperne di più, contatta il fornitore di credito."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 78138fa..fb4683f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -430,9 +430,9 @@
<string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"指紋の設定"</string>
<string name="security_settings_fingerprint_enroll_consent_introduction_title" msgid="2278592030102282364">"指紋認証によるロック解除の許可"</string>
<string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"指紋の使用"</string>
- <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="tablet" msgid="1533352560544756928">"タブレットのロック解除や本人確認（アプリへのログインや購入の承認など）に、指紋を使えるようにします。"</string>
- <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="device" msgid="3570866595300511932">"デバイスのロック解除や本人確認（アプリへのログインや購入の承認など）に、指紋を使えるようにします。"</string>
- <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="default" msgid="8539442240212670385">"スマートフォンのロック解除や本人確認（アプリへのログインや購入の承認など）に、指紋を使えるようにします。"</string>
+ <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="tablet" msgid="1533352560544756928">"指紋を使ってタブレットのロック解除や本人確認（アプリへのログインや購入の承認など）を行えるようにします。"</string>
+ <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="device" msgid="3570866595300511932">"指紋を使ってデバイスのロック解除や本人確認（アプリへのログインや購入の承認など）を行えるようにします。"</string>
+ <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="default" msgid="8539442240212670385">"指紋を使ってスマートフォンのロック解除や本人確認（アプリへのログインや購入の承認など）を行えるようにします。"</string>
<string name="security_settings_fingerprint_enroll_introduction_consent_message" msgid="1833139688278350628">"お子様に、指紋を使ってスマートフォンのロック解除や本人確認を行うことを許可します。アプリへのログインや購入の承認などに顔を使用できるようになります。"</string>
<string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"データはデバイス内だけに保存"</string>
<string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1" msgid="1122676690472680734">"あなたとお子様が管理できます"</string>
@@ -440,7 +440,7 @@
<string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"指紋によって記録されたデータはスマートフォンにのみ、安全に保存されます。データは [設定] でいつでも削除できます。"</string>
<string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"指紋は複雑なパターンや PIN よりも安全面で劣る場合があります。"</string>
<string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"スマートフォンに保存された最近の指紋画像は、指紋モデルの改善のためにデバイスが使用することがあります。"</string>
- <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋を使ってこのデバイスのロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"指紋を使ってスマートフォンのロック解除や購入の承認を行えるようにします。\n\n注: 指紋を使ってこのデバイスのロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"キャンセル"</string>
<string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"利用しない"</string>
<string name="security_settings_fingerprint_enroll_introduction_agree" msgid="4068276083536421828">"同意する"</string>
@@ -468,9 +468,9 @@
<string name="security_settings_fingerprint_v2_enroll_acquire_too_fast" msgid="5891227328100822018">"振動を感じるまで指を離さないでください"</string>
<string name="security_settings_fingerprint_v2_enroll_acquire_too_bright" msgid="769646735950329315">"もっと明るい場所に移動してもう一度お試しください"</string>
<string name="security_settings_fingerprint_v2_enroll_error_max_attempts" msgid="1464972470750764128">"試行回数の上限を超えました"</string>
- <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="179325591887291180">"タブレットのロック解除や本人確認（アプリへのログインなど）に、指紋を使えるようにします。"</string>
- <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="2503218139575057099">"デバイスのロック解除や本人確認（アプリへのログインなど）に、指紋を使えるようにします。"</string>
- <string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="481286891358925579">"スマートフォンのロック解除や本人確認（アプリへのログインなど）に、指紋を使えるようにします。"</string>
+ <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="179325591887291180">"指紋を使ってタブレットのロック解除や本人確認（アプリへのログインなど）を行えるようにします。"</string>
+ <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="2503218139575057099">"指紋を使ってデバイストのロック解除や本人確認（アプリへのログインなど）を行えるようにします。"</string>
+ <string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="481286891358925579">"指紋を使ってスマートフォンのロック解除や本人確認（アプリへのログインなど）を行えるようにします。"</string>
<string name="security_settings_biometric_preference_title" msgid="298146483579539448">"顔認証と指紋認証によるロック解除"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="6941188982863819389">"タップして設定してください"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"顔と指紋を登録しました"</string>
@@ -604,7 +604,7 @@
<string name="fingerprint_delete_title" msgid="1469865327307917858">"「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」の削除"</string>
<string name="fingerprint_delete_message" msgid="1454995433333496541">"この指紋を削除しますか？"</string>
<string name="fingerprint_v2_delete_message" msgid="4136720729608391131">"デバイスに保存されている「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」に関連付けられた指紋の画像とモデルが削除されます"</string>
- <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"スマートフォンのロック解除やアプリでの本人確認に、指紋を使用できなくなります。"</string>
+ <string name="fingerprint_last_delete_message" msgid="7860374760549404410">"指紋を使ってスマートフォンのロック解除やアプリでの本人確認を行うことができなくなります。"</string>
<string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"仕事用プロファイルのロック解除や、購入の承認、仕事用アプリへのログインに、指紋を使用できなくなります。"</string>
<string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"削除"</string>
<string name="encryption_settings_title" msgid="2848716008695618360">"暗号化"</string>
@@ -1968,7 +1968,7 @@
<string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"続行するにはデバイスのパターンを使用してください"</string>
<string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"続行するにはデバイスの PIN を入力してください"</string>
<string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"続行するにはデバイスのパスワードを入力してください"</string>
- <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"続行するには仕事用のパターンを使用してください"</string>
+ <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"仕事用のパターンを使って続行します"</string>
<string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"続行するには仕事用の PIN を入力してください"</string>
<string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"続行するには仕事用のパスワードを入力してください"</string>
<string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"セキュリティ強化のため、デバイスのパターンを入力してください"</string>
@@ -2037,9 +2037,9 @@
</plurals>
<string name="forgot_password_title" msgid="3967873480875239885">"IT 管理者にお問い合わせください"</string>
<string name="forgot_password_text" msgid="2583194470767613163">"PIN、パターン、またはパスワードのリセットを依頼できます"</string>
- <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"不明なアプリをインストールするとタブレットや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
- <string name="install_all_warning" product="default" msgid="652516435709047343">"不明なアプリをインストールするとスマートフォンや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるスマートフォンへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
- <string name="install_all_warning" product="device" msgid="2348262609815354500">"不明なアプリをインストールするとデバイスや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるデバイスへの損害やデータの損失について、ユーザーご自身が責任を負うことに同意するものとします。"</string>
+ <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"不明なアプリをインストールするとタブレットや個人データの侵害に対する安全性が低下します。この提供元からアプリをインストールすることで、アプリの使用により生じる可能性があるタブレットへの侵害やデータの損失について、ユーザーご自身が責任を負うことに同意することになります。"</string>
+ <string name="install_all_warning" product="default" msgid="652516435709047343">"不明なアプリをインストールするとスマートフォンや個人データの侵害に対する安全性が低下します。この提供元からアプリをインストールすることで、アプリの使用により生じる可能性があるスマートフォンへの侵害やデータの損失について、ユーザーご自身が責任を負うことに同意することになります。"</string>
+ <string name="install_all_warning" product="device" msgid="2348262609815354500">"不明なアプリをインストールするとスマートフォンや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるスマートフォンへの損害やデータの損失について、ユーザーご自身が責任を負うことに同意することになります。"</string>
<string name="advanced_settings" msgid="2368905204839169094">"詳細設定"</string>
<string name="advanced_settings_summary" msgid="1823765348195530035">"詳細設定オプションを有効にする"</string>
<string name="application_info_label" msgid="1015706497694165866">"アプリ情報"</string>
@@ -2071,7 +2071,7 @@
<string name="enable_text" msgid="8570798764647110430">"有効にする"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"ストレージを消去"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"アップデートのアンインストール"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"制限付き設定の許可"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"制限付き設定を許可"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"デフォルトでは、選択した一部のアクティビティがこのアプリ内で開きます。"</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"このアプリによるウィジェットの作成とデータへのアクセスを許可しました。"</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"設定されていません。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 75c9231..c8f3648 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"გამოტოვებთ პაროლის დაყენებას?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"გსურთ, გამოტოვოთ პაროლის და სახის დაყენება?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"გსურთ, გამოტოვოთ პაროლის და თითის ანაბეჭდის დაყენება?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"გსურთ, გამოტოვოთ პაროლის, სახის და თითის ანაბეჭდის დაყენება?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"გამოვტოვოთ პაროლის, სახის და თითის ანაბეჭდის დაყენება?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"გამოტოვებთ ნიმუშის დაყენებას?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"გსურთ, გამოტოვოთ განმბლოკავი ნიმუშის და სახის დაყენება?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"გსურთ, გამოტოვოთ განმბლოკავი ნიმუშის და თითის ანაბეჭდის დაყენება?"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 27dfe3b..c87dd9b 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -535,8 +535,8 @@
<string name="lock_screen_pin_skip_message" product="device" msgid="8841426051550671169">"PIN код түзмөк жоголсо же уурдалса, аны коргойт"</string>
<string name="lock_screen_pattern_skip_message" product="device" msgid="6296702954920045923">"Графикалык ачкыч түзмөк жоголсо же уурдалса, аны коргойт"</string>
<string name="lock_screen_password_skip_message" product="device" msgid="9186075211441188900">"Сырсөз түзмөк жоголсо же уурдалса, аны коргойт"</string>
- <string name="lock_screen_pin_skip_message" product="default" msgid="4301690296689572747">"PIN код телефон жоголсо же уурдалса, аны коргойт"</string>
- <string name="lock_screen_pattern_skip_message" product="default" msgid="7387967847446084260">"Графикалык ачкыч телефон жоголсо же уурдалса, аны коргойт"</string>
+ <string name="lock_screen_pin_skip_message" product="default" msgid="4301690296689572747">"PIN код жоголгон же уурдалган телефондогу нерселерди коргойт"</string>
+ <string name="lock_screen_pattern_skip_message" product="default" msgid="7387967847446084260">"Графикалык ачкыч жоголгон же уурдалган телефондогу нерселерди коргойт"</string>
<string name="lock_screen_password_skip_message" product="default" msgid="6415788841227543063">"Сырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт"</string>
<string name="lock_screen_pin_skip_fingerprint_message" product="tablet" msgid="2350062798056164403">"Манжа изи менен ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код планшет жоголсо же уурдалса, аны коргойт."</string>
<string name="lock_screen_pattern_skip_fingerprint_message" product="tablet" msgid="222574071926747300">"Манжа изи менен ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч планшет жоголсо же уурдалса, аны коргойт."</string>
@@ -544,8 +544,8 @@
<string name="lock_screen_pin_skip_fingerprint_message" product="device" msgid="7421096089691939451">"Манжа изи менен ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код түзмөк жоголсо же уурдалса, аны коргойт."</string>
<string name="lock_screen_pattern_skip_fingerprint_message" product="device" msgid="6458468083711413617">"Манжа изи менен ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч түзмөк жоголсо же уурдалса, аны коргойт."</string>
<string name="lock_screen_password_skip_fingerprint_message" product="device" msgid="1632249532665518954">"Манжа изи менен ачуу функциясын тууралоо үчүн сырсөз талап кылынат.\n\nСырсөз түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pin_skip_fingerprint_message" product="default" msgid="3101384462491132314">"Манжа изи менен ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код телефон жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="382422778886929469">"Манжа изи менен ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч телефон жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pin_skip_fingerprint_message" product="default" msgid="3101384462491132314">"Манжа изи менен ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
+ <string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="382422778886929469">"Манжа изи менен ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
<string name="lock_screen_password_skip_fingerprint_message" product="default" msgid="5515199168425229243">"Манжа изи менен ачуу функциясын тууралоо үчүн сырсөз талап кылынат.\n\nСырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт."</string>
<string name="lock_screen_pin_skip_face_message" product="tablet" msgid="2454239555320628731">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код планшет жоголсо же уурдалса, аны коргойт."</string>
<string name="lock_screen_pattern_skip_face_message" product="tablet" msgid="4354138725903415816">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч планшет жоголсо же уурдалса, аны коргойт."</string>
@@ -553,26 +553,26 @@
<string name="lock_screen_pin_skip_face_message" product="device" msgid="3729243407606881750">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код түзмөк жоголсо же уурдалса, аны коргойт."</string>
<string name="lock_screen_pattern_skip_face_message" product="device" msgid="6966329744346503807">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч түзмөк жоголсо же уурдалса, аны коргойт."</string>
<string name="lock_screen_password_skip_face_message" product="device" msgid="3020827854443297996">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн сырсөз талап кылынат.\n\nСырсөз түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pin_skip_face_message" product="default" msgid="2155678903559865476">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код телефон жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pattern_skip_face_message" product="default" msgid="473271568005748452">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч телефон жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pin_skip_face_message" product="default" msgid="2155678903559865476">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн PIN код талап кылынат.\n\nPIN код жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
+ <string name="lock_screen_pattern_skip_face_message" product="default" msgid="473271568005748452">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="4319934862372116788">"Жүзүнөн таанып ачуу функциясын тууралоо үчүн сырсөз талап кылынат.\n\nСырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="647987565338402155">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн PIN код талап кылынат.\n\nPIN код планшет жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5293609077890072841">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч планшет жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2660359318928684172">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн сырсөз талап кылынат.\n\nСырсөз планшет жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="1278795063897397815">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн PIN код талап кылынат.\n\nPIN код түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="8766169819759371801">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="8611216039321306045">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн сырсөз талап кылынат.\n\nСырсөз түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="8796878521409329051">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн PIN код талап кылынат.\n\nPIN код телефон жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="8423700958936341596">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч телефон жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="5411689248299854172">"Жүзүнөн таанып ачуу жана Манжа изи менен ачуу функцияларын жөндөө үчүн сырсөз талап кылынат.\n\nСырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="647987565338402155">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код планшет жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5293609077890072841">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч планшет жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2660359318928684172">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз планшет жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="1278795063897397815">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код түзмөк жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="8766169819759371801">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч түзмөк жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="8611216039321306045">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз түзмөк жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="8796878521409329051">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="8423700958936341596">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="5411689248299854172">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт."</string>
<string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN кодду койбойсузбу?"</string>
<string name="lock_screen_pin_skip_face_title" msgid="8810770395309512358">"PIN кодду жана жүзүнөн таанууну койбойсузбу?"</string>
<string name="lock_screen_pin_skip_fingerprint_title" msgid="371214283158750976">"PIN кодду жана манжа изин койбой өткөрүп жибересизби?"</string>
<string name="lock_screen_pin_skip_biometrics_title" msgid="1082066572914073311">"PIN кодду, жүзүнөн таанууну жана манжа изин койбой өткөрүп жибересизби?"</string>
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Сырсөздү койбойсузбу?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Сырсөздү жана жүзүнөн таанууну койбойсузбу?"</string>
- <string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Сырсөздү жана манжа изин койбой өткөрүп жибересизби?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Сырсөздү, жүзүнөн таанууну жана манжа изин койбой өткөрүп жибересизби?"</string>
+ <string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Сырсөздү жана манжа изин койбойсузбу?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Сырсөздү, жүзүнөн таанууну жана манжа изин койбойсузбу?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Графикалык ачкычты койбойсузбу?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Графикалык ачкычты жана жүзүнөн таанууну койбойсузбу?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Графикалык ачкычты жана манжа изин койбой өткөрүп жибересизби?"</string>
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Кеңири маалымат"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Чектелген функция"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Чектелген жөндөөлөр <xliff:g id="APP_NAME">%s</xliff:g> үчүн уруксат берилген"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"<xliff:g id="APP_NAME">%s</xliff:g> колдонмосуна чектелген параметрлерге уруксат берилген"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Коопсуздук максатында бул параметр азырынча иштебейт."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Насыяга алынган түзмөк тууралуу маалымат"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Насыя берүүчү бул түзмөктөгү жөндөөлөрдү өзгөртүп, программаларды орното алат.\n\nЭгер убагында төлөбөсөңүз, түзмөк кулпуланып калат.\n\nКеңири маалымат алуу үчүн насыя берүүчүгө кайрылыңыз."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index d646bd4..681f05b 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"പാസ്വേഡ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"പാസ്വേഡ്, മുഖം എന്നിവയുടെ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"പാസ്വേഡ്, ഫിംഗർപ്രിന്റ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"പാസ്വേഡ്, മുഖം, ഫിംഗർപ്രിന്റ് എന്നിവയുടെ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"പാസ്വേഡ്, ഫെയ്സ്, ഫിംഗർപ്രിന്റ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"പാറ്റേൺ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"പാറ്റേൺ, മുഖം, എന്നിവയുടെ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"പാറ്റേൺ, ഫിംഗർപ്രിന്റ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
@@ -2071,7 +2071,7 @@
<string name="enable_text" msgid="8570798764647110430">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"സ്റ്റോറേജ് മായ്ക്കുക"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"അപ്ഡേറ്റുകൾ അൺഇൻസ്റ്റാളുചെയ്യുക"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"നിയന്ത്രിത ക്രമീകരണം അനുവദിക്കുക"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"നിയന്ത്രിത ക്രമീകരണം അനുവദിക്കൂ"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"നിങ്ങൾ തിരഞ്ഞെടുത്ത ചില ആക്റ്റിവിറ്റികൾ ഡിഫോൾട്ടായി ഈ ആപ്പിൽ തുറക്കും."</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"വിജറ്റുകൾ സൃഷ്ടിക്കാനും അവയുടെ ഡാറ്റ ആക്സസ്സുചെയ്യാനും ഈ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നത് നിങ്ങൾ തിരഞ്ഞെടുത്തു."</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"ഡിഫോൾട്ടുകളൊന്നും സജ്ജീകരിച്ചിട്ടില്ല."</string>
@@ -2279,7 +2279,7 @@
<string name="usage_stats_label" msgid="6523644917803320085">"ഉപയോഗ വിവരക്കണക്ക്"</string>
<string name="testing_usage_stats" msgid="4660643799010906365">"ഉപയോഗ സ്ഥിതിവിവരക്കണക്ക്"</string>
<string name="display_order_text" msgid="7120394778684605892">"ഇതുപ്രകാരം അടുക്കുക:"</string>
- <string name="app_name_label" msgid="3809910527680143673">"അപ്ലിക്കേഷൻ"</string>
+ <string name="app_name_label" msgid="3809910527680143673">"ആപ്പ്"</string>
<string name="last_time_used_label" msgid="2639712813493534074">"അവസാനം ഉപയോഗിച്ചത്"</string>
<string name="usage_time_label" msgid="9105343335151559883">"ഉപയോഗ സമയം"</string>
<string name="accessibility_settings" msgid="4713215774904704682">"ഉപയോഗസഹായി"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 58c2d3e..c5213f6 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2580,7 +2580,7 @@
<string name="captioning_preset" msgid="4174276086501638524">"Тайлбарын загвар"</string>
<string name="captioning_custom_options_title" msgid="3858866498893566351">"Тусгай сонголтууд"</string>
<string name="captioning_background_color" msgid="5231412761368883107">"Дэвсгэр өнгө"</string>
- <string name="captioning_background_opacity" msgid="6453738649182382614">"Дэвсгэрийн бүдэгрэлт"</string>
+ <string name="captioning_background_opacity" msgid="6453738649182382614">"Арын дэвсгэрийн тод байдал"</string>
<string name="captioning_window_color" msgid="1406167274530183119">"Тайлбар цонхны өнгө"</string>
<string name="captioning_window_opacity" msgid="4031752812991199525">"Хүрээний бүүдгэршил"</string>
<string name="captioning_foreground_color" msgid="9057327228286129232">"Текстийн өнгө"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 89a446c..196e56c 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -2673,7 +2673,7 @@
<string name="print_printing_state_title_template" msgid="7367513245156603431">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट करत आहे"</string>
<string name="print_cancelling_state_title_template" msgid="9094795458159980190">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करत आहे"</string>
<string name="print_failed_state_title_template" msgid="4751695809935404505">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
- <string name="print_blocked_state_title_template" msgid="3134100215188411074">"प्रिंटरने <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> अवरोधित केले"</string>
+ <string name="print_blocked_state_title_template" msgid="3134100215188411074">"प्रिंटरने <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ब्लॉक केला"</string>
<string name="print_search_box_shown_utterance" msgid="6215002365360341961">"शोध बॉक्स दर्शविला"</string>
<string name="print_search_box_hidden_utterance" msgid="5355387966141712567">"शोध बॉक्स लपविला"</string>
<string name="printer_info_desc" msgid="1206872325746154206">"या प्रिंटर विषयी अधिक माहिती"</string>
@@ -4123,7 +4123,7 @@
<string name="app_notification_override_dnd_title" msgid="3769539356442226691">"व्यत्यय आणू नका ओव्हरराइड करा"</string>
<string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"जेव्हा \'व्यत्यय आणू नका\' सुरू असेल तेव्हा या सूचना सुरू राहू द्या"</string>
<string name="app_notification_visibility_override_title" msgid="7778628150022065920">"लॉक स्क्रीन"</string>
- <string name="app_notification_row_banned" msgid="4513523107019706924">"अवरोधित"</string>
+ <string name="app_notification_row_banned" msgid="4513523107019706924">"ब्लॉक केले"</string>
<string name="app_notification_row_priority" msgid="8100777138078316446">"प्राधान्य"</string>
<string name="app_notification_row_sensitive" msgid="7374688948587174964">"संवेदनशील"</string>
<string name="app_notifications_dialog_done" msgid="573716608705273004">"पूर्ण झाले"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b8eb910..46625a1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"ပိုမိုလေ့လာရန်"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"ကန့်သတ်ထားသည့် ဆက်တင်များ"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"<xliff:g id="APP_NAME">%s</xliff:g> အတွက် ကန့်သတ်ထားသည့်ဆက်တင်များ ခွင့်ပြုပြီးပြီ"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"ကန့်သတ်ဆက်တင်များကို <xliff:g id="APP_NAME">%s</xliff:g> အတွက် ခွင့်ပြုပြီးပြီ"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"သင့်လုံခြုံရေးအတွက် ဤဆက်တင်ကို ယခု အသုံးမပြုနိုင်ပါ။"</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"အရစ်ကျဝယ်ယူထားသော စက်ပစ္စည်း၏အချက်အလက်"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"သင်၏ ခရက်ဒစ်ဝန်ဆောင်မှုပေးသူသည် ဤစက်တွင် ဆက်တင်များပြောင်းလဲပြီး ဆော့ဖ်ဝဲထည့်သွင်းနိုင်သည်။\n\nငွေပေးချေမှု မပြုမိပါက သင့်စက်ကို လော့ခ်ချပါမည်။\n\nပိုမိုလေ့လာရန် သင်၏ ခရက်ဒစ်ဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်နိုင်သည်။"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 84599ea..21644e8 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ପାସ୍ୱାର୍ଡ ସେଟ୍ ଅପ୍ ବାଦ୍ ଦେବେ କି?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"ପାସୱାର୍ଡ ଓ ଫେସ୍ ପାଇଁ ସେଟଅପ୍ ବାଦ୍ ଦେବେ?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"ପାସୱାର୍ଡ ଓ ଟିପଚିହ୍ନ ପାଇଁ ସେଟଅପ୍ ବାଦ୍ ଦେବେ?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"ପାସୱାର୍ଡ, ଫେସ୍ ଓ ଟିପଚିହ୍ନ ପାଇଁ ସେଟଅପ୍ ବାଦ୍ ଦେବେ?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"ପାସୱାର୍ଡ, ଫେସ ଓ ଟିପଚିହ୍ନ ପାଇଁ ସେଟଅପ ବାଦ୍ ଦେବେ?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ପାଟର୍ନ ସେଟ୍ଅପ୍କୁ ବାଦ୍ ଦେବେ କି?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"ପାଟର୍ନ ଓ ଫେସ୍ ପାଇଁ ସେଟଅପ୍ ବାଦ୍ ଦେବେ?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"ପାଟର୍ନ ଓ ଟିପଚିହ୍ନ ପାଇଁ ସେଟଅପ୍ ବାଦ୍ ଦେବେ?"</string>
@@ -597,7 +597,7 @@
<string name="security_advanced_settings_keywords" msgid="5294945170370974974">"ସୁରକ୍ଷା, ଅଧିକ ସୁରକ୍ଷା ସେଟିଂସ, ଅଧିକ ସେଟିଂସ, ଉନ୍ନତ ସୁରକ୍ଷା ସେଟିଂସ"</string>
<string name="privacy_advanced_settings" msgid="8828215456566937719">"ଅଧିକ ଗୋପନୀୟତା ସେଟିଂସ"</string>
<string name="privacy_advanced_settings_summary" msgid="2927281894237561935">"ଅଟୋଫିଲ, କାର୍ଯ୍ୟକଳାପ ନିୟନ୍ତ୍ରଣ ଏବଂ ଆହୁରି ଅନେକ କିଛି"</string>
- <string name="fingerprint_add_max" msgid="8639321019299347447">"ଆପଣ ସର୍ବାଧିକ <xliff:g id="COUNT">%d</xliff:g>ଟି ଆଙ୍ଗୁଠି ଚିହ୍ନ ଯୋଡ଼ିପାରିବେ"</string>
+ <string name="fingerprint_add_max" msgid="8639321019299347447">"ଆପଣ ସର୍ବାଧିକ <xliff:g id="COUNT">%d</xliff:g>ଟି ଟିପଚିହ୍ନ ଯୋଗ କରିପାରିବେ"</string>
<string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ଆପଣ ସର୍ବାଧିକ ସଂଖ୍ୟାର ଆଙ୍ଗୁଠି ଚିହ୍ନ ଯୋଡିଛନ୍ତି"</string>
<string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ଆଉ ଅଧିକ ଟିପଚିହ୍ନ ଯୋଡିପାରିବ ନାହିଁ"</string>
<string name="fingerprint_last_delete_title" msgid="4081475675646514726">"ସମସ୍ତ ଟିପଚିହ୍ନ କାଢ଼ିଦେବେ?"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ab54ea8..ee17490 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -580,7 +580,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pominąć konfigurację hasła?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Pominąć konfigurowanie hasła i rozpoznawania twarzy?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Pominąć konfigurowanie hasła i odcisku palca?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Pominąć konfigurowanie hasła, rozpoznawania twarzy i odcisku palca?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Pominąć ustawianie hasła, rozpoznawania twarzy i odcisku?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pominąć konfigurację wzoru?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Pominąć konfigurowanie wzoru i rozpoznawania twarzy?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Pominąć konfigurowanie wzoru i odcisku palca?"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a7fa51c..8fc31f9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pretende ignorar configuração da palavra-passe?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Ignorar configuração de palavra-passe e rosto?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Ignorar configuração de palavra-passe e impressão digital?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Ignorar configuração de palavra-passe, rosto e impressão digital?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Não configurar pal.-passe, face e imp. digital?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pretende ignorar a configuração do padrão?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Ignorar configuração de padrão e rosto?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Ignorar configuração de padrão e impressão digital?"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e07d102..cc05943 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -572,7 +572,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"මුරපදය සැකසීම මඟ හරින්නේද?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"මුරපදය සහ මුහුණ සඳහා පිහිටුවීම මග හරින්නද?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"මුරපදය සහ ඇඟිලි සලකුණ සඳහා පිහිටුවීම මග හරින්නද?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"මුරප., මුහුණ සහ ඇඟිලි සල. සඳහා පිහි. මග හරින්නද?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"මුරපදය, මුහුණ සහ ඇඟිලි සලකුණු සඳහා පිහිටුවීම මඟ හරින්නද?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"රටාව සැකසීම මඟ හරින්නේද?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"රටාව සහ මුහුණ සඳහා පිහිටුවීම මග හරින්නද?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"රටාව සහ ඇඟිලි සලකුණ සඳහා පිහිටුවීම මග හරින්නද?"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8f5303c..26f0c75 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2121,7 +2121,7 @@
<string name="enable_text" msgid="8570798764647110430">"Aktivovať"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"Vymazať obsah úložiska"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"Odinštalovať aktualizácie"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Povolenie obmedzených nastavení"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Povoliť obmedzené nastavenia"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"Niektoré aktivity, ktoré ste vybrali, sa predvolene otvoria v tejto aplikácii."</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Tejto aplikácii ste povolili vytváranie miniaplikácií a pristupovanie k ich údajom."</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"Nie sú nastavené žiadne predvolené"</string>
@@ -5234,7 +5234,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Ďalšie informácie"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Obmedzené nastavenie"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Obmedzené nastavenia boli povolené pre aplikáciu <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Povolené obmedzené nastavenia pre apl. <xliff:g id="APP_NAME">%s</xliff:g>"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"V rámci ochrany zabezpečenia toto nastavenie nie je momentálne k dispozícii."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Informácie o financovanom zariadení"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Poskytovateľ úveru môže v tomto zariadení meniť nastavenia a inštalovať softvér.\n\nAk zmeškáte splátku, vaše zariadenie bude uzamknuté.\n\nViac sa dozviete od svojho poskytovateľa úveru."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d0dc78d..4a36df4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2121,7 +2121,7 @@
<string name="enable_text" msgid="8570798764647110430">"Omogoči"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"Počisti shrambo"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"Odmesti posodobitve"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Dovoljevanje omejenih nastavitev"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Dovoli omejene nastavitve"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"Nekatere dejavnosti, ki ste jih izbrali, se privzeto odprejo v tej aplikaciji."</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Aplikaciji dovolite, da ustvari pripomočke in dostopa do njihovih podatkov."</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"Ni privzetih nastavitev."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4f18c37..c27bbea 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -576,7 +576,7 @@
<string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Желите ли да прескочите подешавање лозинке?"</string>
<string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Желите да прескочите подешавање лозинке и лица?"</string>
<string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Прескочићете подешавање лозинке и отиска прста?"</string>
- <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Прескочићете подешавање лозинке, лица и отиска?"</string>
+ <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Прескочићете подешавање лозинке, лица и отиска прста?"</string>
<string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Желите ли да прескочите подешавање шаблона?"</string>
<string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Желите да прескочите подешавање шаблона и лица?"</string>
<string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Прескочићете подешавање шаблона и отиска прста?"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3d1be73..cd61591e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Matuto pa"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Pinaghihigpitang setting"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Pinapayagan sa <xliff:g id="APP_NAME">%s</xliff:g> ang mga pinaghihigpitang setting"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Pinapayagan ang mga pinaghihigpitang setting sa <xliff:g id="APP_NAME">%s</xliff:g>"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Para sa iyong seguridad, hindi available ang setting na ito sa ngayon."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Impormasyon ng pinopondohang device"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Mababago ng iyong credit provider ang mga setting at makakapag-install ito ng software sa device na ito.\n\nKung may mapalampas kang bayad, mala-lock ang device mo.\n\nPara matuto pa, makipag-ugnayan sa iyong credit provider."</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 03b4ff4..9582143 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2071,7 +2071,7 @@
<string name="enable_text" msgid="8570798764647110430">"فعال کریں"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"اسٹوریج صاف کریں"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"اپ ڈیٹس اَن انسٹال کریں"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"محدود ترتیبات کی اجازت دیں"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"پابندی والی ترتیبات کی اجازت دیں"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"آپ کی منتخب کردہ کچھ سرگرمیاں اس ایپ میں بطور ڈیفالٹ کھلتی ہیں۔"</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"ویجیٹس بنانے اور ان کے ڈیٹا تک رسائی حاصل کرنے کیلئے آپ نے اس ایپ کو اجازت دینے کو منتخب کیا ہے۔"</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"کوئی ڈیفالٹس سیٹ نہیں ہیں۔"</string>
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"مزید جانیں"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"محدود ترتیب"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"<xliff:g id="APP_NAME">%s</xliff:g> کے لیے محدود ترتیبات کی اجازت ہے"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"<xliff:g id="APP_NAME">%s</xliff:g> کیلئے پابندی والی ترتیبات کی اجازت ہے"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"آپ کی سیکیورٹی کے لیے، یہ ترتیب فی الحال دستیاب نہیں ہے۔"</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"مالی تعاون یافتہ آلے کی معلومات"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"آپ کا کریڈٹ فراہم کنندہ ترتیبات کو تبدیل اور اس آلے پر سافٹ ویئر انسٹال کر سکتا ہے۔\n\nاگر آپ سے ادائیگی چھوٹ جاتی ہے تو آپ کا آلہ مقفل ہو جائے گا۔\n\nمزید جاننے کے لیے، اپنے کریڈٹ فراہم کنندہ سے رابطہ کریں۔"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5bc740e..4c92c3c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -5074,7 +5074,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"Tìm hiểu thêm"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"Chế độ cài đặt bị hạn chế"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Đã cho phép các chế độ cài đặt bị hạn chế cho <xliff:g id="APP_NAME">%s</xliff:g>"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"Đã cho phép <xliff:g id="APP_NAME">%s</xliff:g> sử dụng các chế độ cài đặt bị hạn chế"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"Để đảm bảo an toàn cho bạn, chế độ cài đặt này hiện bị vô hiệu hoá."</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"Thông tin về thiết bị trả góp"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"Tổ chức tín dụng của bạn có thể thay đổi chế độ cài đặt và cài đặt phần mềm trên thiết bị này.\n\nNếu bạn chưa thanh toán, thiết bị của bạn sẽ bị khoá.\n\nĐể tìm hiểu thêm, hãy liên hệ với tổ chức tín dụng."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 60308fd..a532da5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2071,7 +2071,7 @@
<string name="enable_text" msgid="8570798764647110430">"启用"</string>
<string name="clear_user_data_text" msgid="6773186434260397947">"清空存储空间"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"卸载更新"</string>
- <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"允许执行受限制的设置"</string>
+ <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"允许受限制的设置"</string>
<string name="auto_launch_enable_text" msgid="8912714475823807798">"您已选择的一些活动默认会在此应用中打开。"</string>
<string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"您已选择允许该应用创建微件并查看其数据。"</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"无默认设置。"</string>
@@ -5072,7 +5072,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"了解详情"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"受限制的设置"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"已允许“<xliff:g id="APP_NAME">%s</xliff:g>”执行受限制的设置"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"已允许“<xliff:g id="APP_NAME">%s</xliff:g>”使用受限制的设置"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"出于安全考虑，此设置目前不可用。"</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"分期付款设备的信息"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"您的分期付款提供商可更改此设备的设置以及在此设备上安装软件。\n\n如果您未按时支付款项，您的设备将被锁定。\n\n如需了解详情，请联系您的分期付款提供商。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0b34e0c..e07d7fa 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -5075,7 +5075,7 @@
<string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
<string name="learn_more" msgid="3534519107947510952">"瞭解詳情"</string>
<string name="blocked_by_restricted_settings_title" msgid="7334715011474037399">"受限設定"</string>
- <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"已允許「<xliff:g id="APP_NAME">%s</xliff:g>」的受限設定"</string>
+ <string name="toast_allows_restricted_settings_successfully" msgid="1219116121291466102">"已允許「<xliff:g id="APP_NAME">%s</xliff:g>」使用受限設定"</string>
<string name="blocked_by_restricted_settings_content" msgid="3628660029601161080">"為安全起見，系統目前不提供此設定。"</string>
<string name="financed_privacy_settings" msgid="2575114436197204145">"分期付款裝置資料"</string>
<string name="financed_privacy_intro" msgid="5458393846604867947">"信貸提供者可在此裝置上變更設定及安裝軟件。\n\n如果您未按時付款，系統便會鎖定您的裝置。\n\n如要瞭解詳情，請聯絡您的信貸提供者。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8a57a92..b305b7d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1967,16 +1967,16 @@
<string name="lockpassword_forgot_password" msgid="5730587692489737223">"忘記密碼了嗎？"</string>
<string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"忘記解鎖圖案了嗎？"</string>
<string name="lockpassword_forgot_pin" msgid="7164232234705747672">"忘記 PIN 碼了嗎？"</string>
- <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"請畫出你的裝置解鎖圖案以繼續作業"</string>
+ <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"請用裝置解鎖圖案解鎖以繼續"</string>
<string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"輸入裝置 PIN 碼即可繼續"</string>
<string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"請輸入你的裝置密碼以繼續作業"</string>
- <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"請畫出你的 Work 解鎖圖案以繼續作業"</string>
+ <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"請用工作資料夾的解鎖圖案解鎖以繼續"</string>
<string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"請輸入你的工作資料夾 PIN 碼以繼續作業"</string>
<string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"請輸入你的 Work 密碼以繼續作業"</string>
<string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"為了提升安全性，請使用裝置解鎖圖案"</string>
<string name="lockpassword_strong_auth_required_device_pin" msgid="9163822166411129815">"為了提升安全性，請輸入裝置 PIN 碼"</string>
<string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"為了提升安全性，請輸入裝置密碼"</string>
- <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"為了提升安全性，請使用 Work 解鎖圖案"</string>
+ <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"為了提升安全性，請用工作資料夾的解鎖圖案解鎖"</string>
<string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"為了提升安全性，請輸入 Work PIN 碼"</string>
<string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"為了提升安全性，請輸入 Work 密碼"</string>
<string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"你的手機已恢復原廠設定。如要使用這支手機，請輸入先前設定的解鎖圖案。"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a0fad2..ff80b0c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11745,12 +11745,6 @@
<!-- [CHAR LIMIT=60] Summary string on dark theme explaining why the toggle is disabled while the setting is off-->
<string name="dark_ui_mode_disabled_summary_dark_theme_off">Temporarily turned on due to Battery Saver</string>
- <!-- [CHAR_LIMIT=NONE] Summary that is shown in the footer when dark mode is selected -->
- <string name="dark_ui_settings_dark_summary">Supported apps will also switch to dark theme</string>
-
- <!-- [CHAR_LIMIT=40] Positive button text in dark theme notification -->
- <string name="dark_ui_settings_dialog_acknowledge">Got it</string>
-
<!-- [CHAR_LIMIT=50] Title string in the dark theme slice(suggestion) -->
<string name="dark_theme_slice_title">Try Dark theme</string>
diff --git a/src/com/android/settings/display/DarkUIInfoDialogFragment.java b/src/com/android/settings/display/DarkUIInfoDialogFragment.java
deleted file mode 100644
index ce517e8..0000000
--- a/src/com/android/settings/display/DarkUIInfoDialogFragment.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.display;
-
-import android.app.Dialog;
-import android.app.UiModeManager;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
-public class DarkUIInfoDialogFragment extends InstrumentedDialogFragment
- implements DialogInterface.OnClickListener{
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.DIALOG_DARK_UI_INFO;
- }
-
- @NonNull
- @Override
- public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
- Context context = getContext();
- AlertDialog.Builder dialog = new AlertDialog.Builder(context);
- LayoutInflater inflater = LayoutInflater.from(dialog.getContext());
- View titleView = inflater.inflate(R.layout.settings_dialog_title, null);
- ((ImageView) titleView.findViewById(R.id.settings_icon))
- .setImageDrawable(context.getDrawable(R.drawable.dark_theme));
- ((TextView) titleView.findViewById(R.id.settings_title)).setText(R.string.dark_ui_mode);
-
- dialog.setCustomTitle(titleView)
- .setMessage(R.string.dark_ui_settings_dark_summary)
- .setPositiveButton(
- R.string.dark_ui_settings_dialog_acknowledge,
- this);
- return dialog.create();
- }
-
- @Override
- public void onDismiss(@NonNull DialogInterface dialog) {
- enableDarkTheme();
- super.onDismiss(dialog);
- }
-
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- // We have to manually dismiss the dialog because changing night mode causes it to
- // recreate itself.
- dialogInterface.dismiss();
- enableDarkTheme();
- }
-
- private void enableDarkTheme() {
- final Context context = getContext();
- if (context != null) {
- Settings.Secure.putInt(context.getContentResolver(),
- Settings.Secure.DARK_MODE_DIALOG_SEEN,
- DarkUIPreferenceController.DIALOG_SEEN);
- context.getSystemService(UiModeManager.class)
- .setNightMode(UiModeManager.MODE_NIGHT_YES);
- }
- }
-}
diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java
index d07410e..f1bbfcd 100644
--- a/src/com/android/settings/display/DarkUIPreferenceController.java
+++ b/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -23,10 +23,8 @@
import android.content.IntentFilter;
import android.content.res.Configuration;
import android.os.PowerManager;
-import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -39,7 +37,6 @@
public class DarkUIPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnStart, OnStop {
- public static final String DARK_MODE_PREFS = "dark_mode_prefs";
public static final String PREF_DARK_MODE_DIALOG_SEEN = "dark_mode_dialog_seen";
public static final int DIALOG_SEEN = 1;
@@ -48,9 +45,6 @@
private UiModeManager mUiModeManager;
private PowerManager mPowerManager;
- private Context mContext;
-
- private Fragment mFragment;
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
@@ -61,7 +55,6 @@
public DarkUIPreferenceController(Context context, String key) {
super(context, key);
- mContext = context;
mUiModeManager = context.getSystemService(UiModeManager.class);
mPowerManager = context.getSystemService(PowerManager.class);
}
@@ -86,12 +79,6 @@
@Override
public boolean setChecked(boolean isChecked) {
- final boolean dialogSeen =
- Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.DARK_MODE_DIALOG_SEEN, 0) == DIALOG_SEEN;
- if (!dialogSeen && isChecked) {
- showDarkModeDialog();
- }
return mUiModeManager.setNightModeActivated(isChecked);
}
@@ -100,13 +87,6 @@
return R.string.menu_key_display;
}
- private void showDarkModeDialog() {
- final DarkUIInfoDialogFragment frag = new DarkUIInfoDialogFragment();
- if (mFragment != null && mFragment.getFragmentManager() != null) {
- frag.show(mFragment.getFragmentManager(), getClass().getName());
- }
- }
-
@VisibleForTesting
void updateEnabledStateIfNeeded() {
if (mPreference == null) {
@@ -133,11 +113,6 @@
new IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
}
- // used by AccessibilitySettings
- public void setParentFragment(Fragment fragment) {
- mFragment = fragment;
- }
-
@Override
public void onStop() {
mContext.unregisterReceiver(mReceiver);
diff --git a/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceController.java
index 10cda53..c45bb3d 100644
--- a/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceController.java
+++ b/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceController.java
@@ -27,7 +27,6 @@
import com.android.settings.core.BasePreferenceController;
import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
/**
* Controller for custom mode night mode time settings
@@ -35,7 +34,6 @@
public class DarkModeCustomPreferenceController extends BasePreferenceController {
private static final String START_TIME_KEY = "dark_theme_start_time";
private static final String END_TIME_KEY = "dark_theme_end_time";
- public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm a");
private final UiModeManager mUiModeManager;
private TimeFormatter mFormat;
private DarkModeSettingsFragment mFragmet;
@@ -63,7 +61,10 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return mUiModeManager.getNightMode() == MODE_NIGHT_CUSTOM
+ && mUiModeManager.getNightModeCustomType()
+ == UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE
+ ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
public TimePickerDialog getDialog() {
@@ -88,13 +89,6 @@
@Override
protected void refreshSummary(Preference preference) {
- if (mUiModeManager.getNightMode() != MODE_NIGHT_CUSTOM
- || mUiModeManager.getNightModeCustomType()
- != UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE) {
- preference.setVisible(false);
- return;
- }
- preference.setVisible(true);
final LocalTime time;
if (TextUtils.equals(getPreferenceKey(), START_TIME_KEY)) {
time = mUiModeManager.getCustomNightModeStart();
diff --git a/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java b/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
index a5103b0..17d32a5 100644
--- a/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
+++ b/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
@@ -21,6 +21,7 @@
import android.os.PowerManager;
import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,9 +44,6 @@
private DarkModeObserver mContentObserver;
private DarkModeCustomPreferenceController mCustomStartController;
private DarkModeCustomPreferenceController mCustomEndController;
- private Runnable mCallback = () -> {
- updatePreferenceStates();
- };
private static final int DIALOG_START_TIME = 0;
private static final int DIALOG_END_TIME = 1;
@@ -60,7 +58,12 @@
public void onStart() {
super.onStart();
// Listen for changes only while visible.
- mContentObserver.subscribe(mCallback);
+ mContentObserver.subscribe(() -> {
+ PreferenceScreen preferenceScreen = getPreferenceScreen();
+ mCustomStartController.displayPreference(preferenceScreen);
+ mCustomEndController.displayPreference(preferenceScreen);
+ updatePreferenceStates();
+ });
}
@Override
diff --git a/tests/robotests/src/com/android/settings/display/DarkUIInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/display/DarkUIInfoDialogFragmentTest.java
deleted file mode 100644
index f90c590..0000000
--- a/tests/robotests/src/com/android/settings/display/DarkUIInfoDialogFragmentTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.display;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.provider.Settings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DarkUIInfoDialogFragmentTest {
- private DarkUIInfoDialogFragment mFragment;
- @Mock
- private DialogInterface dialog;
-
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- mFragment = spy(new DarkUIInfoDialogFragment());
- }
-
- @Test
- public void dialogDismissedOnConfirmation() {
- doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
- SharedPreferences prefs = RuntimeEnvironment.application.getSharedPreferences(
- DarkUIPreferenceController.DARK_MODE_PREFS,
- Context.MODE_PRIVATE);
- assertThat(prefs.getBoolean(DarkUIPreferenceController.PREF_DARK_MODE_DIALOG_SEEN, false))
- .isFalse();
- mFragment.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
- verify(dialog, times(1)).dismiss();
- assertThat(Settings.Secure.getInt(RuntimeEnvironment.application.getContentResolver(),
- Settings.Secure.DARK_MODE_DIALOG_SEEN, -1)).isEqualTo(1);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
index 9924cb4..9a24d32 100644
--- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
@@ -16,35 +16,33 @@
package com.android.settings.display;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
import android.content.Context;
-import androidx.fragment.app.Fragment;
+
import com.android.settings.display.darkmode.DarkModePreference;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
@RunWith(RobolectricTestRunner.class)
public class DarkUIPreferenceControllerTest {
private DarkUIPreferenceController mController;
private Context mContext;
- @Mock
- private Fragment mFragment;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mController = spy(new DarkUIPreferenceController(mContext, "dark_ui_mode"));
- mController.setParentFragment(mFragment);
mController.mPreference = new DarkModePreference(mContext, null /* AttributeSet attrs */);
mController.onStart();
}
diff --git a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceControllerTest.java
index 4a26205..8ac6257 100644
--- a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeCustomPreferenceControllerTest.java
@@ -15,6 +15,11 @@
package com.android.settings.display.darkmode;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -71,68 +76,55 @@
}
@Test
- public void nightMode_manualOn_hidePreference() {
+ public void getAvailabilityStatus_nightModeManualOn_unavailable() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_YES);
mConfig.uiMode = Configuration.UI_MODE_NIGHT_YES;
- mController.refreshSummary(mPreference);
-
- verify(mPreference).setVisible(eq(false));
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
- public void nightMode_manualOff_hidePreference() {
+ public void getAvailabilityStatus_nightModeManualOff_unavailable() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_NO);
mConfig.uiMode = Configuration.UI_MODE_NIGHT_NO;
- mController.refreshSummary(mPreference);
-
- verify(mPreference).setVisible(eq(false));
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
-
@Test
- public void nightMode_customOn_showPreference() {
+ public void getAvailabilityStatus_nightModeCustomOn_available() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_CUSTOM);
mConfig.uiMode = Configuration.UI_MODE_NIGHT_YES;
- mController.refreshSummary(mPreference);
-
- verify(mPreference).setVisible(eq(true));
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
- public void nightMode_customOff_showPreference() {
+ public void getAvailabilityStatus_nightModeCustomOff_available() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_CUSTOM);
mConfig.uiMode = Configuration.UI_MODE_NIGHT_NO;
- mController.refreshSummary(mPreference);
-
- verify(mPreference).setVisible(eq(true));
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
- public void nightMode_customBedtimeOn_hidePreference() {
+ public void getAvailabilityStatus_nightModeCustomBedtimeOn_unavailable() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_CUSTOM);
when(mService.getNightModeCustomType())
.thenReturn(UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
mConfig.uiMode = Configuration.UI_MODE_NIGHT_YES;
- mController.refreshSummary(mPreference);
-
- verify(mPreference).setVisible(eq(false));
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
- public void nightMode_customBedtimeOff_hidePreference() {
+ public void getAvailabilityStatus_nightModeCustomBedtimeOff_unavailable() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_CUSTOM);
when(mService.getNightModeCustomType())
.thenReturn(UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
mConfig.uiMode = Configuration.UI_MODE_NIGHT_NO;
- mController.refreshSummary(mPreference);
-
- verify(mPreference).setVisible(eq(false));
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test