Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a8a06ab..570d6d7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -763,7 +763,7 @@
<string name="lockpassword_password_too_short" msgid="1938086368137797700">"{count,plural, =1{يجب أن تحتوي كلمة المرور على حرف واحد على الأقل.}zero{يجب ألّا يقل عدد الحروف عن # حرف.}two{يجب ألّا يقل عدد الحروف عن حرفَين.}few{يجب ألّا يقل عدد الحروف عن # أحرف.}many{يجب ألّا يقل عدد الحروف عن # حرفًا.}other{يجب ألّا يقل عدد الحروف عن # حرف.}}"</string>
<string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على رقم واحد على الأقل.}zero{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # رقم على الأقل.}two{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على رقمَين على الأقل.}few{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # أرقام على الأقل.}many{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # رقمًا على الأقل.}other{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # رقم على الأقل.}}"</string>
<string name="lockpassword_pin_too_short" msgid="8910105226463085689">"{count,plural, =1{يجب أن يحتوي رقم التعريف الشخصي على رقم واحد على الأقل.}zero{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل.}two{يجب أن يحتوي رقم التعريف الشخصي على رقمَين على الأقل.}few{يجب أن يحتوي رقم التعريف الشخصي على # أرقام على الأقل.}many{يجب أن يحتوي رقم التعريف الشخصي على # رقمًا على الأقل.}other{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل.}}"</string>
- <string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{يجب أن يحتوي رقم التعريف الشخصي على رقم واحد على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} رقم لمزيد من الأمان.}zero{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} رقم لمزيد من الأمان.}two{يجب أن يحتوي رقم التعريف الشخصي على رقمَين على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} رقم لمزيد من الأمان.}few{يجب أن يحتوي رقم التعريف الشخصي على # أرقام على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} رقم لمزيد من الأمان.}many{يجب أن يحتوي رقم التعريف الشخصي على # رقمًا على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} رقم لمزيد من الأمان.}other{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} رقم لمزيد من الأمان.}}"</string>
+ <string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{يجب أن يحتوي رقم التعريف الشخصي على رقم واحد على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} لمزيد من الأمان.}zero{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} لمزيد من الأمان.}two{يجب أن يحتوي رقم التعريف الشخصي على رقمَين على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} لمزيد من الأمان.}few{يجب أن يحتوي رقم التعريف الشخصي على # أرقام على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} لمزيد من الأمان.}many{يجب أن يحتوي رقم التعريف الشخصي على # رقمًا على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} لمزيد من الأمان.}other{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} لمزيد من الأمان.}}"</string>
<string name="lockpassword_password_too_long" msgid="1940345313260498308">"{count,plural, =1{يجب أن تحتوي كلمة المرور على أقل من حرف واحد.}zero{يجب أن تحتوي كلمة المرور على أقل من # حرف.}two{يجب أن تحتوي كلمة المرور على أقل من حرفَين.}few{يجب أن تحتوي كلمة المرور على أقل من # أحرف.}many{يجب أن تحتوي كلمة المرور على أقل من # حرفًا.}other{يجب أن تحتوي كلمة المرور على أقل من # حرف.}}"</string>
<string name="lockpassword_pin_too_long" msgid="1678212054564388576">"{count,plural, =1{يجب أن يحتوي رقم التعريف الشخصي على أقل من رقم واحد.}zero{يجب أن يحتوي رقم التعريف الشخصي على أقل من # رقم.}two{يجب أن يحتوي رقم التعريف الشخصي على أقل من رقمَين.}few{يجب أن يحتوي رقم التعريف الشخصي على أقل من # أرقام.}many{يجب أن يحتوي رقم التعريف الشخصي على أقل من # رقمًا.}other{يجب أن يحتوي رقم التعريف الشخصي على أقل من # رقم.}}"</string>
<string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي تم استخدامه مؤخرًا"</string>
@@ -2246,8 +2246,8 @@
<string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"إقران سماعتَي الأذن الطبيتين"</string>
<string name="accessibility_hearingaid_pair_instructions_message" msgid="581652489109350119">"في الشاشة التالية، انقر على سماعات الأذن الطبية. قد يُطلَب منك إقران سماعتَي الأذن الطبيتين اليسرى واليمنى بشكل منفصل.\n\nتأكَّد من تشغيل سماعتَي الأذن الطبيتين وجاهزيتهما للإقران."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مفعَّل"</string>
- <string name="accessibility_hearingaid_left_side_device_summary" msgid="1907302799168261001">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>، تم تشغيل سماعة الأذن الطبية اليسرى فقط."</string>
- <string name="accessibility_hearingaid_right_side_device_summary" msgid="148257064855054376">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>، تم تشغيل سماعة الأذن الطبية اليمنى فقط"</string>
+ <string name="accessibility_hearingaid_left_side_device_summary" msgid="1907302799168261001">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>، تم تشغيل سماعة الأذن الطبية اليسرى فقط."</string>
+ <string name="accessibility_hearingaid_right_side_device_summary" msgid="148257064855054376">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>، تم تشغيل سماعة الأذن الطبية اليمنى فقط"</string>
<string name="accessibility_hearingaid_left_and_right_side_device_summary" msgid="4268221140368164452">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>، تم تشغيل سماعتَي الأذن الطبيتين اليسرى واليمنى."</string>
<string name="accessibility_hearingaid_more_device_summary" msgid="8092641784056942546">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> وجهاز واحد إضافي"</string>
<string name="accessibility_hearing_device_pairing_title" msgid="2701812183769537320">"إقران جهاز جديد"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d7b6e0f..ed05ac5 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -622,7 +622,7 @@
<string name="private_space_gaia_education_title" msgid="3787414895669666563">"Kreirajte Google račun da zaštitite privatnost podataka"</string>
<string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na sljedećem ekranu se možete prijaviti na račun da ga koristite s privatnim prostorom"</string>
<string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Kreirajte namjenski račun da spriječite pojavljivanje podataka izvan privatnog prostora, npr.:"</b></string>
- <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinhronizirajte slike, fajlove, e-poruke, kontakte, događaje u kalendaru i druge podatke"</string>
+ <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinhronizirane slike, fajlovi, e-poruke, kontakti, događaji u kalendaru i drugi podaci"</string>
<string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historija preuzimanja aplikacija i preporuke"</string>
<string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historija pregledanja, oznake i sačuvane lozinke"</string>
<string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Predloženi sadržaj povezan s aktivnošću u aplikacijama u privatnom prostoru"</string>
@@ -1996,7 +1996,7 @@
<string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kontrast boja"</string>
<string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Viši kontrast omogućava veću istaknutost teksta, dugmadi i ikona. Odaberite kontrast koji vam izgleda najbolje."</string>
<string name="color_contrast_note" msgid="7592686603372566198">"Određene aplikacije možda neće podržavati sve postavke kontrasta boja i teksta"</string>
- <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Podesite način na koji boje i tekst izgledaju u odnosu na boju pozadine ekrana"</string>
+ <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Podesite izgled boja i tekst u odnosu na boju pozadine ekrana"</string>
<string name="color_contrast_preview" msgid="6791430227535363883">"Pregledajte"</string>
<string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
<string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Prije 2 dana"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 15a3abb..c26b827 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1922,7 +1922,7 @@
<string name="trackpad_switch_apps_title" msgid="7342032935377284039">"Canvia d\'aplicació"</string>
<string name="trackpad_switch_apps_summary" msgid="9193942041912927440">"Fes lliscar quatre dits cap a l\'esquerra o cap a la dreta"</string>
<string name="modifier_keys_settings" msgid="2537108435032034683">"Tecles modificadores"</string>
- <string name="modifier_keys_settings_summary" msgid="6933143361657444436">"Canvia el funcionament de les tecles"</string>
+ <string name="modifier_keys_settings_summary" msgid="6933143361657444436">"Canvia el comportament de les tecles"</string>
<string name="modifier_keys_reset_title" msgid="948294258402761066">"Restableix-ho tot"</string>
<string name="modifier_keys_default_summary" msgid="8701640508670973258">"Predeterminat"</string>
<string name="modifier_keys_reset_message" msgid="5236994817619936058">"Confirmes que vols restablir totes les tecles modificadores al seu valor predeterminat?"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1a252b8..a180854 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1539,7 +1539,7 @@
<string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Chcete spravovat síťová připojení pomocí aplikace <xliff:g id="NEW_APP">%1$s</xliff:g> namísto aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
<string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Chcete spravovat síťová připojení pomocí aplikace <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
<string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nedávné žádosti o určení polohy"</string>
- <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Umístění pracovního profilu"</string>
+ <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Poloha pro pracovní profil"</string>
<string name="location_app_level_permissions" msgid="907206607664629759">"Oprávnění aplikací pro přístup k poloze"</string>
<string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Určování polohy je vypnuto"</string>
<string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Přístup k poloze má # z {total} aplikací}few{Přístup k poloze mají # z {total} aplikací}many{Přístup k poloze má # z {total} aplikací}other{Přístup k poloze má # z {total} aplikací}}"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d5c5187..81e0703 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -133,7 +133,7 @@
<string name="previous_connected_see_all" msgid="7759413145713251328">"Alle anzeigen"</string>
<string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"Alle anzeigen"</string>
<string name="stylus_device_details_title" msgid="7618295136015480864">"Eingabestift"</string>
- <string name="stylus_default_notes_app" msgid="4165657465911764628">"Drücken der Eingabestifttaste"</string>
+ <string name="stylus_default_notes_app" msgid="4165657465911764628">"Drücken der Funktionstaste"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (Arbeitsprofil)"</string>
<string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Textfelder ausfüllen"</string>
<string name="stylus_ignore_button" msgid="7734540973145241391">"Drücken der Taste am Eingabestift ignorieren"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4febef4..c22879c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -643,7 +643,7 @@
<string name="suggested_fingerprint_lock_settings_title" msgid="3140266181874137984">"Agrega una huella dactilar como desbloqueo"</string>
<string name="lock_settings_picker_title" msgid="9219376327364915334">"Bloqueo de pantalla"</string>
<string name="lock_settings_picker_new_lock_title" msgid="3113042086804290919">"Elige un bloqueo de pantalla"</string>
- <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Nuevo bloqueo de pantalla"</string>
+ <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Elegir un nuevo bloqueo de pantalla"</string>
<string name="lock_settings_picker_new_profile_lock_title" msgid="2270462215256413800">"Bloqueo de apps de trabajo"</string>
<string name="lock_settings_picker_update_profile_lock_title" msgid="5929068163516308927">"Nuevo bloqueo de trabajo"</string>
<string name="lock_settings_picker_biometrics_added_security_message" msgid="1105247657304421299">"Para mayor seguridad, establece un bloqueo de pantalla secundario"</string>
@@ -962,7 +962,7 @@
<string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra el código QR debajo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escanea un código QR para conectarte a la red Wi-Fi"</string>
<string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi‑Fi"</string>
- <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
+ <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con otro dispositivo para conectarlo a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Vuelve a intentarlo. Si el problema persiste, comunícate con el fabricante del dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Se produjo un error"</string>
@@ -1523,7 +1523,7 @@
<string name="tether_settings_summary_usb_and_bluetooth_and_ethernet" msgid="5880591133984166550">"USB, Bluetooth y Ethernet"</string>
<string name="tether_settings_summary_all" msgid="7565193614882005775">"Hotspot, USB, Bluetooth y Ethernet"</string>
<string name="tether_settings_summary_off" msgid="2526164899130351968">"No se comparte Internet con otros dispositivos"</string>
- <string name="tether_preference_summary_off" msgid="6266799346319794630">"Desactivada"</string>
+ <string name="tether_preference_summary_off" msgid="6266799346319794630">"Desactivados"</string>
<string name="usb_tethering_button_text" msgid="7364633823180913777">"Conexión a red por USB"</string>
<string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"Conexión Bluetooth"</string>
<string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Conexión Ethernet"</string>
@@ -1858,7 +1858,7 @@
<string name="hardkeyboard_category" msgid="8729780593378161071">"Configuración de teclado físico"</string>
<string name="auto_punctuate_summary" msgid="3549190848611386748">"Presionar la tecla de espacio dos veces para insertar \".\""</string>
<string name="show_password" msgid="7101900779571040117">"Mostrar contraseñas"</string>
- <string name="show_password_summary" msgid="9025960283785111619">"Mostrar caracteres brevemente mientras escribes"</string>
+ <string name="show_password_summary" msgid="9025960283785111619">"Muestra los caracteres brevemente mientras escribes"</string>
<string name="spellchecker_security_warning" msgid="2016059050608271820">"Este corrector ortográfico puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas usar este corrector ortográfico?"</string>
<string name="spellchecker_quick_settings" msgid="6449414356743946577">"Configuración"</string>
<string name="spellchecker_language" msgid="8905487366580285282">"Idioma"</string>
@@ -1879,7 +1879,7 @@
<string name="sticky_keys" msgid="7317317044898161747">"Teclas especiales"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"Presiona una tecla a la vez para hacer la combinación de teclas en lugar de presionarlas juntas"</string>
<string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Combinaciones de teclas"</string>
- <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de combinación de teclas"</string>
+ <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Mostrar lista de combinaciones de teclas"</string>
<string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Teclados y herramientas del perfil de trabajo"</string>
<string name="virtual_keyboards_for_work_title" msgid="786459157034008675">"Teclado en pantalla para el trabajo"</string>
<string name="keyboard_default_layout" msgid="5377811770620422301">"Predeterminado"</string>
@@ -1922,7 +1922,7 @@
<string name="trackpad_switch_apps_title" msgid="7342032935377284039">"Cambia de app"</string>
<string name="trackpad_switch_apps_summary" msgid="9193942041912927440">"Desliza hacia la izquierda o la derecha con cuatro dedos"</string>
<string name="modifier_keys_settings" msgid="2537108435032034683">"Teclas modificadoras"</string>
- <string name="modifier_keys_settings_summary" msgid="6933143361657444436">"Cambia el comportamiento de las teclas"</string>
+ <string name="modifier_keys_settings_summary" msgid="6933143361657444436">"Cambiar el comportamiento de las teclas"</string>
<string name="modifier_keys_reset_title" msgid="948294258402761066">"Restablecer todas"</string>
<string name="modifier_keys_default_summary" msgid="8701640508670973258">"Predeterminados"</string>
<string name="modifier_keys_reset_message" msgid="5236994817619936058">"¿Confirmas que quieres restablecer todas las teclas modificadoras a su configuración predeterminada?"</string>
@@ -3502,7 +3502,7 @@
<string name="notif_type_silent" msgid="6273951794420331010">"Silencio"</string>
<string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificaciones que nunca suenan ni vibran"</string>
<string name="notification_listener_allowed" msgid="5536962633536318551">"Con permiso"</string>
- <string name="notification_listener_not_allowed" msgid="3352962779597846538">"No permitida"</string>
+ <string name="notification_listener_not_allowed" msgid="3352962779597846538">"Sin permiso"</string>
<string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ver todas las apps"</string>
<string name="notif_listener_excluded_app_summary" msgid="2914567678047195396">"Cambia la configuración de cada una de las apps que envían notificaciones"</string>
<string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps que se muestran en el dispositivo"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fec5d09..525ca8b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -266,7 +266,7 @@
<string name="zone_time_type_standard" msgid="6865420715430680352">"Hora estándar"</string>
<string name="zone_menu_by_region" msgid="2963565278710225652">"Seleccionar por región"</string>
<string name="zone_menu_by_offset" msgid="1257702747474426745">"Seleccionar por compensación de UTC"</string>
- <string name="lock_after_timeout" msgid="8682769000437403444">"Bloquear tras suspender pantalla"</string>
+ <string name="lock_after_timeout" msgid="8682769000437403444">"Bloquear tras tiempo de espera de la pantalla"</string>
<string name="lock_after_timeout_summary" msgid="4869265514658147304">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después del tiempo de espera"</string>
<string name="lock_immediately_summary_with_exception" msgid="40819611828339044">"Inmediatamente después del tiempo de espera (salvo si <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mantiene el dispositivo desbloqueado)"</string>
<string name="lock_after_timeout_summary_with_exception" msgid="3441806647509073124">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de agotarse el tiempo de espera de la pantalla, salvo si <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> mantiene el dispositivo desbloqueado"</string>
@@ -962,7 +962,7 @@
<string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra el código QR de abajo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escanea el código QR para conectarte a la red Wi‑Fi"</string>
<string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi‑Fi"</string>
- <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
+ <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con otro dispositivo para conectarlo a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Vuelve a intentarlo. Si el problema persiste, ponte en contacto con el fabricante del dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ha habido un error"</string>
@@ -5091,8 +5091,8 @@
<string name="contrast_medium" msgid="384414510709285811">"Medio"</string>
<string name="contrast_high" msgid="3988567609694797696">"Alto"</string>
<string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Esta aplicación solo puede abrirse en una ventana"</string>
- <string name="generic_accessibility_service_on" msgid="4466229372357726824">"Activada"</string>
- <string name="generic_accessibility_service_off" msgid="4759859497651675724">"Desactivada"</string>
+ <string name="generic_accessibility_service_on" msgid="4466229372357726824">"Activado"</string>
+ <string name="generic_accessibility_service_off" msgid="4759859497651675724">"Desactivado"</string>
<string name="generic_accessibility_feature_shortcut_off" msgid="4022872394514077907">"Desactivado"</string>
<string name="accessibility_shortcut_state_off" msgid="8158137799007601475">"Desactivado"</string>
<string name="daltonizer_state_on" msgid="131013270022603983">"Activado"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1c29467..17823da 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -962,7 +962,7 @@
<string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrez le code QR ci-dessous pour vous connecter à « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
<string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Connectez-vous au Wi-Fi en numérisant un code QR"</string>
<string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partager le Wi‑Fi"</string>
- <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Numérisez ce code QR avec un autre appareil pour vous connecter à « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
+ <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Numérisez ce code QR avec un autre appareil pour le connecter à « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Numérisez ce code QR pour établir la connexion au réseau « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Réessayez. Si le problème persiste, communiquez avec le fabricant de l\'appareil"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Un problème s\'est produit"</string>
@@ -1061,7 +1061,7 @@
<string name="wifi_p2p_menu_search" msgid="8383306178784876840">"Rechercher des appareils"</string>
<string name="wifi_p2p_menu_searching" msgid="3428767661028761100">"Recherche en cours…"</string>
<string name="wifi_p2p_menu_rename" msgid="7059994112737743336">"Renommer l\'appareil"</string>
- <string name="wifi_p2p_peer_devices" msgid="5158559154640283546">"Appareils associés"</string>
+ <string name="wifi_p2p_peer_devices" msgid="5158559154640283546">"Appareils à appairer"</string>
<string name="wifi_p2p_remembered_groups" msgid="5497007770930525695">"Groupes mémorisés"</string>
<string name="wifi_p2p_failed_connect_message" msgid="6767831720507440027">"Impossible de se connecter."</string>
<string name="wifi_p2p_failed_rename_message" msgid="1317434386267376606">"Échec du changement de nom de l\'appareil."</string>
@@ -1540,7 +1540,7 @@
<string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> pour gérer vos connexions réseau?"</string>
<string name="location_category_recent_location_requests" msgid="2205900488782832082">"Demandes de localisation récentes"</string>
<string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Position pour profil profess."</string>
- <string name="location_app_level_permissions" msgid="907206607664629759">"Autor. localisation de l\'appli"</string>
+ <string name="location_app_level_permissions" msgid="907206607664629759">"Autor. localisation des applis"</string>
<string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Le signalement de position est désactivé"</string>
<string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# application sur {total} a accès à la position}one{# application sur {total} a accès à la position}other{# applications sur {total} ont accès à la position}}"</string>
<string name="location_category_recent_location_access" msgid="2558063524482178146">"Accès récents"</string>
@@ -2033,7 +2033,7 @@
<string name="accessibility_screen_magnification_joystick_title" msgid="1803769708582404964">"Manche"</string>
<string name="accessibility_screen_magnification_joystick_summary" msgid="4640300148573982720">"Activez et déplacez la loupe à l\'aide d\'un manche à l\'écran. Touchez et maintenez, puis faites glisser le manche pour contrôler la loupe. Touchez et faites glisser pour déplacer le manche lui-même."</string>
<string name="accessibility_screen_magnification_about_title" msgid="8857919020223505415">"À propos de la fonctionnalité d\'agrandissement"</string>
- <string name="accessibility_screen_magnification_footer_learn_more_content_description" msgid="924848332575978463">"En savoir plus sur la fonctionnalité d\'agrandissement"</string>
+ <string name="accessibility_screen_magnification_footer_learn_more_content_description" msgid="924848332575978463">"En savoir plus sur la fonctionnalité Agrandissement"</string>
<string name="accessibility_magnification_mode_title" msgid="8446475127807168063">"Type d\'agrandissement"</string>
<string name="accessibility_magnification_area_settings_message" msgid="8498648925928109462">"Agrandissez la totalité de votre écran, une région précise ou passez d\'une option à l\'autre"</string>
<string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Plein écran"</string>
@@ -2192,8 +2192,8 @@
<string name="accessibility_autoclick_seekbar_desc" msgid="8363959277814621118">"Durée du clic automatique"</string>
<string name="accessibility_vibration_settings_title" msgid="936301142478631993">"Vibrations et effets tactils"</string>
<string name="accessibility_vibration_settings_summary" msgid="3690308537483465527">"Contrôler la force des vibrations pour différentes utilisations"</string>
- <string name="accessibility_vibration_settings_state_on" msgid="5566026932372832502">"Activées"</string>
- <string name="accessibility_vibration_settings_state_off" msgid="7946588741954981703">"Désactivées"</string>
+ <string name="accessibility_vibration_settings_state_on" msgid="5566026932372832502">"Activés"</string>
+ <string name="accessibility_vibration_settings_state_off" msgid="7946588741954981703">"Désactivés"</string>
<string name="accessibility_vibration_setting_disabled_for_silent_mode_summary" msgid="3982701772953323190">"Le paramètre est désactivé parce que l\'appareil est en mode silencieux"</string>
<string name="accessibility_call_vibration_category_title" msgid="2545607568768192318">"Appels"</string>
<string name="accessibility_notification_alarm_vibration_category_title" msgid="2683635252414849417">"Notifications et alarmes"</string>
@@ -3236,7 +3236,7 @@
<string name="emergency_tone_vibrate" msgid="6282296789406984698">"Vibrations"</string>
<string name="boot_sounds_title" msgid="5033062848948884111">"Activation par les sons"</string>
<string name="live_caption_title" msgid="8617086825712756983">"Sous-titres instantanés"</string>
- <string name="live_caption_summary" msgid="2898451867595161809">"Ajouter automatiquement des sous-titres aux contenus multimédias"</string>
+ <string name="live_caption_summary" msgid="2898451867595161809">"Ajoutez automatiquement des sous-titres aux contenus multimédias"</string>
<string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Casque d\'écoute filaire"</string>
<string name="spatial_audio_text" msgid="8201387855375146000">"Le son des appareils multimédias compatibles devient plus immersif"</string>
<string name="spatial_summary_off" msgid="8272678804629774378">"Désactivé"</string>
@@ -4360,7 +4360,7 @@
<string name="credman_app_list_preference_none" msgid="2509646651254971448">"Aucun élément sélectionné"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Assurez-vous de faire confiance à cette application</b> <br/> <br/> <xliff:g id=app_name example=Google Remplissage automatique>%1$s</xliff:g> utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
<string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Les nouveaux mots de passe, clés d\'accès et autres renseignements seront désormais enregistrés ici. <xliff:g id=app_name example=Provider>%1$s</xliff:g> peut utiliser ce qui se trouve à l\'écran pour déterminer les données qui peuvent être remplies automatiquement."</string>
- <string name="credman_picker_title" msgid="8442086614222006564">"Fournisseur de services préféré pour les mots de passe, les clés d\'accès et le remplissage automatique"</string>
+ <string name="credman_picker_title" msgid="8442086614222006564">"Fourn. de serv. préf. pour mots de passe, clés d\'accès et remp. aut."</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Désactiver %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Désactiver ce service?</b> <br/> <br/> Lorsque vous vous connectez, les renseignements enregistrés, comme les mots de passe, les clés d\'accès, les modes de paiement, ou tout autre renseignement, ne seront pas remplis. Pour utiliser vos renseignements enregistrés, choisissez un mot de passe, une clé d\'accès ou un service de données."</string>
<string name="account_dashboard_title_with_passkeys" msgid="6214673787161409996">"Mots de passe, clés d\'accès, remp. aut."</string>
@@ -4870,7 +4870,7 @@
<string name="bluetooth_main_switch_title" msgid="8409835540311309632">"Utiliser le Bluetooth"</string>
<string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"Utiliser le blocage de la sonnerie"</string>
<string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"Utiliser le point d\'accès Wi-Fi"</string>
- <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Utiliser l\'épinglage d\'application"</string>
+ <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Utiliser l\'Épinglage d\'application"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Utiliser les options pour les développeurs"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Utiliser le service d\'impression"</string>
<string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Autoriser plusieurs utilisateurs"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3bd92b3..b949d4b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -136,7 +136,7 @@
<string name="stylus_default_notes_app" msgid="4165657465911764628">"Appui sur le bouton du stylet"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (Profil professionnel)"</string>
<string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Écrire dans les champs de texte"</string>
- <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorer toutes les pressions sur les boutons du stylet"</string>
+ <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorer toutes les pressions sur le bouton du stylet"</string>
<string name="stylus_connected_devices_title" msgid="2823967577941359812">"Stylet"</string>
<string name="audio_streams_empty" msgid="8803517701437394982">"Aucun flux audio n\'a été détecté"</string>
<string name="date_and_time" msgid="1788358029823431692">"Date et heure"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6be810e..bf229ed 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -4358,7 +4358,7 @@
<string name="credman_button_change" msgid="4072629639218503790">"Cambiar"</string>
<string name="credman_button_open" msgid="7519871964170816850">"Abrir"</string>
<string name="credman_app_list_preference_none" msgid="2509646651254971448">"Ningún elemento seleccionado"</string>
- <string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Asegúrate de que confías nesta aplicación</b> <br/> <br/> <xliff:g id=app_name example=Autocompletar de Google>%1$s</xliff:g> utiliza o contido da pantalla para determinar o que se pode completar."</string>
+ <string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Asegúrate de que confías nesta aplicación</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> utiliza o contido da pantalla para determinar o que se pode completar."</string>
<string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Utilizas <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> A partir de agora, determinada información nova (contrasinais, claves de acceso e outros datos) gardarase aquí. <xliff:g id=app_name example=Provider>%1$s</xliff:g> pode usar o que apareza na pantalla para determinar o que se pode autocompletar."</string>
<string name="credman_picker_title" msgid="8442086614222006564">"Servizo preferido para contrasinais, claves de acceso e autocompletar"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Queres desactivar %1$s?"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 053c6e8..fd9e559 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -133,7 +133,7 @@
<string name="previous_connected_see_all" msgid="7759413145713251328">"सभी देखें"</string>
<string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"सभी देखें"</string>
<string name="stylus_device_details_title" msgid="7618295136015480864">"स्टाइलस"</string>
- <string name="stylus_default_notes_app" msgid="4165657465911764628">"स्टाइलस बटन को दबाएं"</string>
+ <string name="stylus_default_notes_app" msgid="4165657465911764628">"स्टाइलस बटन दबाने पर यह ऐप्लिकेशन खुले"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (वर्क प्रोफ़ाइल)"</string>
<string name="stylus_textfield_handwriting" msgid="2363579035338976327">"टेक्स्ट फ़ील्ड में कुछ लिखें"</string>
<string name="stylus_ignore_button" msgid="7734540973145241391">"स्टाइलस के बटन के सभी इनपुट को नज़रअंदाज़ करें"</string>
@@ -308,7 +308,7 @@
<string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
<string name="security_settings_face_enroll_introduction_accessibility_vision" msgid="7700394302162170363"></string>
<string name="security_settings_face_enroll_introduction_cancel" msgid="7551159644361639436">"रद्द करें"</string>
- <string name="security_settings_face_enroll_introduction_no_thanks" msgid="1820618982738898717">"अभी नहीं"</string>
+ <string name="security_settings_face_enroll_introduction_no_thanks" msgid="1820618982738898717">"रहने दें"</string>
<string name="security_settings_face_enroll_introduction_agree" msgid="6319476573697497750">"मैं सहमत हूं"</string>
<string name="security_settings_face_enroll_introduction_more" msgid="1970820298889710532">"ज़्यादा देखें"</string>
<string name="security_settings_face_enroll_introduction_title" msgid="7061610077237098046">"चेहरे से डिवाइस अनलाॅक करें"</string>
@@ -387,7 +387,7 @@
<string name="biometric_settings_intro_with_face" msgid="7671919122230588521">"स्मार्टवॉच से फ़ोन अनलॉक करने की सुविधा, अपने फ़ोन को आसानी से अनलॉक करने का एक बेहतरीन तरीका है. यह तरीका, कई मौकों पर काम आ सकता है. जैसे, जब आपके चेहरे से पहचान न हो पा रही हो."</string>
<string name="biometric_settings_use_fingerprint_or_watch_for" msgid="1160830065613858095">"डिवाइस खोलने के लिए, फ़िंगरप्रिंट या स्मार्टवॉच का इस्तेमाल करें"</string>
<string name="biometric_settings_use_face_or_watch_for" msgid="1507077107150278532">"डिवाइस खोलने के लिए, फ़ेस लॉक या स्मार्टवॉच का इस्तेमाल करें"</string>
- <string name="biometric_settings_use_face_fingerprint_or_watch_for" msgid="7495835723072020641">"डिवाइस खोलने के लिए, फ़ेस लॉक, फ़िंगरप्रिंट या स्मार्टवॉच का इस्तेमाल करें"</string>
+ <string name="biometric_settings_use_face_fingerprint_or_watch_for" msgid="7495835723072020641">"डिवाइस अनलॉक करने के लिए, चेहरे, फ़िंगरप्रिंट या स्मार्टवॉच का इस्तेमाल करें"</string>
<string name="biometric_settings_use_watch_for" msgid="5454545622244040110">"डिवाइस खोलने के लिए, स्मार्टवॉच का इस्तेमाल करें"</string>
<string name="biometric_settings_use_face_or_watch_preference_summary" msgid="4969685200340861744">"चेहरे या स्मार्टवॉच का इस्तेमाल करें"</string>
<string name="biometric_settings_use_fingerprint_or_watch_preference_summary" msgid="2425628094194828407">"फ़िंगरप्रिंट या स्मार्टवॉच का इस्तेमाल करें"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0a8f42c..b2c517b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -72,7 +72,7 @@
<string name="bluetooth_pair_other_ear_dialog_left_ear_message" msgid="5711642363615781647">"La tua protesi uditiva sinistra è connessa.\n\nPer accoppiare quella destra, assicurati che sia accesa e pronta per l\'accoppiamento."</string>
<string name="bluetooth_pair_other_ear_dialog_right_ear_message" msgid="631521133525979967">"La tua protesi uditiva destra è connessa.\n\nPer accoppiare quella sinistra, assicurati che sia accesa e pronta per l\'accoppiamento."</string>
<string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Accoppia orecchio destro"</string>
- <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Accoppia orecchio destro"</string>
+ <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Accoppia orecchio sx"</string>
<string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Per tutte le protesi uditive disponibili"</string>
<string name="bluetooth_device_controls_title" msgid="659009912978022189">"Altre impostazioni delle protesi uditive"</string>
<string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Modifica le impostazioni cross-device, come scorciatoie e controlli telecoil"</string>
@@ -133,10 +133,10 @@
<string name="previous_connected_see_all" msgid="7759413145713251328">"Mostra tutti"</string>
<string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"Mostra tutti"</string>
<string name="stylus_device_details_title" msgid="7618295136015480864">"Stilo"</string>
- <string name="stylus_default_notes_app" msgid="4165657465911764628">"Pressione del pulsante dello stilo"</string>
+ <string name="stylus_default_notes_app" msgid="4165657465911764628">"Pressione del tasto sul dorso"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (Profilo di lavoro)"</string>
<string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Scrivi nei campi di testo"</string>
- <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignora tutti i pulsanti premuti con lo stilo"</string>
+ <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignora tutte le pressioni dei tasti dello stilo"</string>
<string name="stylus_connected_devices_title" msgid="2823967577941359812">"Stilo"</string>
<string name="audio_streams_empty" msgid="8803517701437394982">"Nessuno stream audio nelle vicinanze."</string>
<string name="date_and_time" msgid="1788358029823431692">"Data e ora"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 47838c0..c233ba8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -52,7 +52,7 @@
<string name="sleep_on_fold_title" msgid="7626123024330501411">"継続しない"</string>
<string name="sleep_on_fold_summary" msgid="7737992842459588846">"デバイスを折りたたむとフロント ディスプレイがロックされます"</string>
<string name="auto_rotate_settings_primary_switch_title" msgid="3440951924928594520">"画面を自動で回転させる"</string>
- <string name="smart_rotate_text_headline" msgid="5878008933992951904">"顔検出は、前面カメラを使用して自動回転の精度を高めます。画像が Google に保存されたり送信されたりすることはありません。"</string>
+ <string name="smart_rotate_text_headline" msgid="5878008933992951904">"顔検出は、前面カメラを使用して自動回転の精度を高めます。画像が保存されたり Google に送信されたりすることはありません。"</string>
<string name="bluetooth" msgid="8898478620943459654">"Bluetooth"</string>
<string name="bluetooth_is_discoverable" msgid="4798961627677790935">"周辺のすべてのBluetoothデバイスに表示（<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>）"</string>
<string name="bluetooth_is_discoverable_always" msgid="8122823110652921674">"周辺のすべてのBluetoothデバイスに表示"</string>
@@ -3790,7 +3790,7 @@
<string name="filter_instant_apps" msgid="2292108467020380068">"Instant Apps"</string>
<string name="filter_notif_blocked_apps" msgid="1065653868850012325">"通知 OFF"</string>
<string name="advanced_apps" msgid="7643010673326578815">"詳細設定"</string>
- <string name="app_permissions" msgid="8666537659217653626">"権限マネージャー"</string>
+ <string name="app_permissions" msgid="8666537659217653626">"権限マネージャ"</string>
<string name="app_data_sharing_updates_title" msgid="1694297952320402788">"位置情報を共有する方法の更新"</string>
<string name="app_data_sharing_updates_summary" msgid="4465929918457739443">"ユーザーの位置情報を共有する方法が変更されたアプリを確認"</string>
<string name="tap_to_wake" msgid="3313433536261440068">"タップして復帰"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index d9d802e..7c20f86 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1795,7 +1795,7 @@
<string name="app_disable_dlg_text" msgid="2449382902751908916">"ನೀವು ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ, Android ಮತ್ತು ಇತರ ಆ್ಯಪ್ಗಳು ಇನ್ನು ಮುಂದೆ ಉದ್ದೇಶಿಸಿದ ಹಾಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು. ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಪೂರ್ವ-ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿರುವುದರಿಂದ, ನೀವು ಅದನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ. ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಆ್ಯಪ್ ಅನ್ನು ನೀವು ಆಫ್ ಮಾಡಬಹುದು ಮತ್ತು ಅದನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮರೆ ಮಾಡಬಹುದು."</string>
<string name="app_install_details_group_title" msgid="1172114479073704677">"ಸ್ಟೋರ್"</string>
<string name="app_install_details_title" msgid="7783556181897142187">"ಅಪ್ಲಿಕೇಶನ್ ವಿವರಗಳು"</string>
- <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
+ <string name="app_install_details_summary" msgid="2013043219249992373">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಿಂದ ಆ್ಯಪ್ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="instant_app_details_summary" msgid="417197491598208216">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಲ್ಲಿ ಹೆಚ್ಚಿನ ಮಾಹಿತಿ"</string>
<string name="app_ops_running" msgid="6127474473137428721">"ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
<string name="app_ops_never_used" msgid="9038133162371204506">"(ಎಂದಿಗೂ ಬಳಸಿಲ್ಲ)"</string>
@@ -2647,7 +2647,7 @@
<string name="user_credentials_summary" msgid="686471637627271856">"ಸಂಗ್ರಹಿಸಲಾದ ರುಜುವಾತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಮಾರ್ಪಡಿಸಿ"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"ಸುಧಾರಿತ"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"ಈ ಬಳಕೆದಾರರಿಗೆ ರುಜುವಾತುಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
- <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗಾಗಿ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
+ <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ಮತ್ತು ಆ್ಯಪ್ಗಳಿಗಾಗಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="credential_for_wifi" msgid="2286560570630763556">"ವೈ-ಫೈಗಾಗಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="credential_for_wifi_in_use" msgid="7276290656840986618">"ವೈ-ಫೈಗಾಗಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ (ಬಳಕೆಯಲ್ಲಿದೆ)"</string>
<string name="credentials_reset_hint" msgid="4054601857203464867">"ಎಲ್ಲ ವಿಷಯಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
@@ -3956,7 +3956,7 @@
<string name="screen_zoom_make_larger_desc" msgid="7268794713428853139">"ದೊಡ್ಡದಾಗಿಸು"</string>
<string name="disconnected" msgid="3469373726996129247">"ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ"</string>
<string name="keyboard_disconnected" msgid="796053864561894531">"ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ"</string>
- <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
+ <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ಬಳಕೆಯಾಗಿರುವುದು - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ಲಭ್ಯವಿರುವುದು"</string>
<string name="display_dashboard_summary" msgid="1599453894989339454">"ಡಾರ್ಕ್ ಥೀಮ್, ಫಾಂಟ್ ಗಾತ್ರ, ಪ್ರಖರತೆ"</string>
<string name="memory_summary" msgid="8221954450951651735">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ಯಲ್ಲಿ ಸರಾಸರಿ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ಮೆಮೊರಿ ಬಳಸಲಾಗಿದೆ"</string>
@@ -4264,7 +4264,7 @@
<string name="enterprise_privacy_bug_reports" msgid="2635897583413134123">"ಅತ್ಯಂತ ಇತ್ತೀಚಿನ ಬಗ್ ವರದಿ"</string>
<string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"ಅತ್ಯಂತ ಇತ್ತೀಚಿನ ಭದ್ರತಾ ಲಾಗ್"</string>
<string name="enterprise_privacy_none" msgid="6026527690979756431">"ಯಾವುದೂ ಅಲ್ಲ"</string>
- <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
+ <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"ಅಪ್ಲಿಕೇಶನ್ಗಳ ಸಂಖ್ಯೆ ಅಂದಾಜು ಮಾತ್ರ. Play ಸ್ಟೋರ್ನಲ್ಲಿರುವುದನ್ನು ಹೊರತುಪಡಿಸಿ ಸ್ಥಾಪಿಸಿರುವ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಇದರಲ್ಲಿ ಒಳಗೊಂಡಿಲ್ಲದೇ ಇರಬಹುದು."</string>
<string name="enterprise_privacy_number_packages_lower_bound" msgid="5317634640873658149">"{count,plural, =1{ಕನಿಷ್ಠ # ಆ್ಯಪ್}one{ಕನಿಷ್ಠ # ಆ್ಯಪ್ಗಳು}other{ಕನಿಷ್ಠ # ಆ್ಯಪ್ಗಳು}}"</string>
<string name="enterprise_privacy_location_access" msgid="8023838718108456971">"ಸ್ಥಳದ ಅನುಮತಿಗಳು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 578b1b8..4be1b7c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -133,9 +133,9 @@
<string name="previous_connected_see_all" msgid="7759413145713251328">"전체 보기"</string>
<string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"모두 보기"</string>
<string name="stylus_device_details_title" msgid="7618295136015480864">"스타일러스"</string>
- <string name="stylus_default_notes_app" msgid="4165657465911764628">"테일 버튼 누르기"</string>
+ <string name="stylus_default_notes_app" msgid="4165657465911764628">"뒤쪽 버튼 누르기"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g>(직장 프로필)"</string>
- <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"텍스트 입력란에 작성"</string>
+ <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"텍스트 입력란에 쓰기"</string>
<string name="stylus_ignore_button" msgid="7734540973145241391">"스타일러스 버튼 누름 모두 무시"</string>
<string name="stylus_connected_devices_title" msgid="2823967577941359812">"스타일러스"</string>
<string name="audio_streams_empty" msgid="8803517701437394982">"주변 오디오 스트림이 없습니다."</string>
@@ -1879,7 +1879,7 @@
<string name="sticky_keys" msgid="7317317044898161747">"고정키"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"단축키를 사용할 때 키를 함께 누르지 않고 한 번에 하나씩 누릅니다"</string>
<string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"단축키"</string>
- <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"단축키 목록을 표시합니다."</string>
+ <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"단축키 목록 표시"</string>
<string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"직장 프로필 키보드 및 도구"</string>
<string name="virtual_keyboards_for_work_title" msgid="786459157034008675">"업무용 터치 키보드"</string>
<string name="keyboard_default_layout" msgid="5377811770620422301">"기본"</string>
@@ -2254,15 +2254,15 @@
<string name="accessibility_hearing_device_connected_title" msgid="3785140037249487287">"청각 보조 기기"</string>
<string name="accessibility_hearing_device_saved_title" msgid="7573926212664909296">"저장된 기기"</string>
<string name="accessibility_hearing_device_control" msgid="2661965917013100611">"보청기 제어"</string>
- <string name="accessibility_hearing_device_shortcut_title" msgid="7645100199603031360">"보청기 단축키"</string>
+ <string name="accessibility_hearing_device_shortcut_title" msgid="7645100199603031360">"청각 보조 기기 단축키"</string>
<string name="accessibility_hac_mode_title" msgid="2037950424429555652">"보청기 호환성"</string>
<string name="accessibility_hac_mode_summary" msgid="5198760061256669067">"텔레코일과의 호환성을 개선하고 원치 않는 소음을 줄이세요."</string>
<string name="accessibility_hearing_device_about_title" msgid="7883758309646288250">"보청기 정보"</string>
<string name="accessibility_hearing_device_footer_summary" msgid="256061045064940818">"보청기용 오디오 스트리밍 또는 LE 오디오에서 지원되지 않는 다른 청각 보조 기기를 찾으려면 "<b>"새 기기와 페어링"</b>" > "<b>"기기 더보기"</b>"를 탭하세요"</string>
<string name="accessibility_hearing_device_pairing_page_title" msgid="6608901091770850295">"보청기 페어링"</string>
<string name="accessibility_hearing_device_pairing_intro" msgid="7022201665808166517">"이 페이지에서 보청기용 오디오 스트리밍 및 LE 오디오 청각 보조 기기를 페어링할 수 있습니다. 청각 보조 기기의 전원이 켜져 있으며 페어링할 준비가 되어 있는지 확인하세요"</string>
- <string name="accessibility_found_hearing_devices" msgid="637407580358386553">"사응 가능한 보청기"</string>
- <string name="accessibility_found_all_devices" msgid="7817834722148556520">"보청기가 표시되지 않나요?"</string>
+ <string name="accessibility_found_hearing_devices" msgid="637407580358386553">"사응 가능한 청각 보조 기기"</string>
+ <string name="accessibility_found_all_devices" msgid="7817834722148556520">"청각 보조 기기가 표시되지 않나요?"</string>
<string name="accessibility_list_all_devices_title" msgid="161495343959211216">"기기 더보기"</string>
<string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"오디오 조정"</string>
<string name="accessibility_toggle_audio_description_preference_title" msgid="8916473886256061220">"오디오 설명"</string>
@@ -2526,7 +2526,7 @@
<string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"절전 모드 예약"</string>
<string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"배터리 수명 연장"</string>
<string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"충전 완료 시 사용 중지"</string>
- <string name="battery_saver_sticky_title_percentage" msgid="1178162022087559148">"<xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>에 전원 끄기"</string>
+ <string name="battery_saver_sticky_title_percentage" msgid="1178162022087559148">"<xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>에 절전 모드 끄기"</string>
<string name="battery_saver_sticky_description_new" msgid="6472610662679038342">"배터리가 <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>에 도달하면 절전 모드가 꺼집니다."</string>
<!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
<skip />
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b1a266d..9e57bbf 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -589,7 +589,7 @@
<string name="private_space_setup_title" msgid="2272968244329821450">"Privātā telpa"</string>
<string name="private_space_hide_apps_summary" msgid="4418722947376042418">"Varat paslēpt vai bloķēt privātās lietotnes atsevišķā vietā. Papildu drošībai varat izmantot atsevišķu Google kontu."</string>
<string name="private_space_setup_sub_header" msgid="5454598292017819146">"Iestatiet privāto telpu"</string>
- <string name="private_space_separate_account_text" msgid="4492251315012955548"><b>"Google konta izvēle privātajai telpai"</b>\n"Ja izmantojat īpašu kontu, tas palīdz gādāt, lai sinhronizētie faili, fotoattēli un e-pasta ziņojumi netiktu rādīti ārpus privātās telpas."</string>
+ <string name="private_space_separate_account_text" msgid="4492251315012955548"><b>"Google konta izvēle privātajai telpai"</b>\n"Ja izmantojat atsevišķu kontu, tas palīdz gādāt, lai sinhronizētie faili, fotoattēli un e-pasta ziņojumi netiktu rādīti ārpus privātās telpas."</string>
<string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Bloķēšanas iestatīšana"</b>\n"Varat bloķēt privāto telpu, lai citi nevarētu to atvērt."</string>
<string name="private_space_install_apps_text" msgid="5693139160766464498"><b>"Lietotņu instalēšana"</b>\n"Privātajā telpā ir atsevišķa piekļuve Play veikalam, tāpēc varat ērti instalēt lietotnes."</string>
<string name="private_space_apps_permission_text" msgid="7030946025253366172">"Kamēr privātā telpa būs bloķēta, tajā ievietotās lietotnes netiks rādītas atļauju pārvaldniekā, konfidencialitātes informācijas panelī un citos iestatījumos.\n\nPrivāto telpu nevar pārvietot uz citu ierīci. Ja vēlēsieties to izmantot citā ierīcē, privātā telpa būs jāiestata vēlreiz.\n\nIkviena persona, kas pievienos jūsu ierīci datoram vai instalēs ierīcē kaitīgas lietotnes, iespējams, varēs piekļūt jūsu privātajai telpai."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index bc22769..fee487f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -2001,7 +2001,7 @@
<string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Хелен, Адам"</string>
<string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Пред 2 дена"</string>
<string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Ќе проверите?"</string>
- <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Извештај за бизнис патувањето"</string>
+ <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Извештај за бизнис-патување"</string>
<string name="color_contrast_preview_email_body" msgid="4139331665325624199">"За дополнителна помош, контактирајте со \nмене или Хелен. Извештајов ќе биде"</string>
<string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Трошоци на клиентот"</string>
<string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затемнете го екранот"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4cabf8c..44a5bd4 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1922,7 +1922,7 @@
<string name="trackpad_switch_apps_title" msgid="7342032935377284039">"Bytt app"</string>
<string name="trackpad_switch_apps_summary" msgid="9193942041912927440">"Sveip til venstre eller høyre med fire fingre"</string>
<string name="modifier_keys_settings" msgid="2537108435032034683">"Modifikatortaster"</string>
- <string name="modifier_keys_settings_summary" msgid="6933143361657444436">"Endre atferden til nøkler"</string>
+ <string name="modifier_keys_settings_summary" msgid="6933143361657444436">"Endre tastenes funksjonalitet"</string>
<string name="modifier_keys_reset_title" msgid="948294258402761066">"Tilbakestill alle"</string>
<string name="modifier_keys_default_summary" msgid="8701640508670973258">"Standard"</string>
<string name="modifier_keys_reset_message" msgid="5236994817619936058">"Er du sikker på at du vil tilbakestille alle modifikatortastene til standard?"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e8f6ac9..dd1d39c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3716,7 +3716,7 @@
<string name="screen_pinning_switch_off_text" msgid="5032105155623003875">"Uit"</string>
<string name="screen_pinning_title" msgid="6927227272780208966">"App vastzetten"</string>
<string name="app_pinning_intro" msgid="6409063008733004245">"Als je een app vastzet, kun je de huidige app in beeld houden totdat je deze losmaakt. Je kunt deze functie bijvoorbeeld gebruiken om een vriend die je vertrouwt, een specifieke game te laten spelen."</string>
- <string name="screen_pinning_description" msgid="5822120806426139396">"Als je een app hebt vastgezet, kan de vastgezette app mogelijk andere apps openen en zijn er misschien persoonsgegevens toegankelijk. \n\nZo gebruik je de functie voor app vastzetten: \n{0,number,integer}. Zet App vastzetten aan \n{1,number,integer}. Open het overzicht \n{2,number,integer}. Tik bovenaan het scherm op het app-icoon en daarna op Vastzetten"</string>
+ <string name="screen_pinning_description" msgid="5822120806426139396">"Als je een app hebt vastgezet, kan de vastgezette app mogelijk andere apps openen en zijn er misschien persoonsgegevens toegankelijk. \n\nAls je je apparaat veilig met iemand wilt delen, gebruik dan een gastgebruiker. \n\nZo gebruik je de functie voor app vastzetten: \n{0,number,integer}. Zet App vastzetten aan BREAK_5{1,number,integer}. Open het overzicht BREAK_6{2,number,integer}. Tik bovenaan het scherm op het app-icoon en daarna op Vastzetten"</string>
<string name="screen_pinning_guest_user_description" msgid="2307270321127139579">"Als je een app hebt vastgezet, kan de vastgezette app mogelijk andere apps openen en zijn er misschien persoonsgegevens toegankelijk. \n\nAls je je apparaat beveiligd met iemand wilt delen, probeer je een gastgebruiker. \n\nZo gebruik je de functie voor app vastzetten: \n{0,number,integer}. Zet App vastzetten aan \n{1,number,integer}. Open het overzicht \n{2,number,integer}. Tik bovenaan het scherm op het app-icoon en daarna op Vastzetten"</string>
<string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Als een app is vastgezet: \n\n• Persoonsgegevens kunnen toegankelijk zijn (zoals contacten en e-mails).\n \n• De vastgezette app kan mogelijk andere apps openen. \n\nGebruik deze functie alleen met mensen die je vertrouwt."</string>
<string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Vraag om ontgrendelingspatroon voor losmaken"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 36dd82e..7983dc8 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1208,7 +1208,7 @@
<string name="night_display_start_time_title" msgid="2611541851596977786">"ਸ਼ੁਰੂੂਆਤ ਦਾ ਸਮਾਂ"</string>
<string name="night_display_end_time_title" msgid="5243112480391192111">"ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ"</string>
<string name="night_display_temperature_title" msgid="857248782470764263">"ਤੀਬਰਤਾ"</string>
- <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਕਦੇ ਵੀ ਚਾਲੂ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
+ <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਚਾਲੂ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
<string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ"</string>
<string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"ਸੂਰਜ ਡੁੱਬਣ ਸਮੇਂ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ"</string>
<string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 319716b..b63627e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -133,10 +133,10 @@
<string name="previous_connected_see_all" msgid="7759413145713251328">"Ver todos"</string>
<string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"Veja tudo"</string>
<string name="stylus_device_details_title" msgid="7618295136015480864">"Caneta stylus"</string>
- <string name="stylus_default_notes_app" msgid="4165657465911764628">"Botão da caneta stylus premido"</string>
+ <string name="stylus_default_notes_app" msgid="4165657465911764628">"Premir botão traseiro"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (perfil de trabalho)"</string>
<string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Escrever em campos de texto"</string>
- <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorar todos os botões premidos com a caneta stylus"</string>
+ <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorar pressões do botão da caneta stylus"</string>
<string name="stylus_connected_devices_title" msgid="2823967577941359812">"Caneta stylus"</string>
<string name="audio_streams_empty" msgid="8803517701437394982">"Nenhuma stream de áudio próxima."</string>
<string name="date_and_time" msgid="1788358029823431692">"Data e hora"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 713143c..50d5ed8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -290,7 +290,7 @@
<string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Недоступно"</string>
<string name="security_status_title" msgid="6958004275337618656">"Статус защиты"</string>
<string name="security_dashboard_summary" msgid="7571035662779425918">"Блокировка экрана, сервис \"Найти устройство\", безопасность приложений"</string>
- <string name="safety_center_title" msgid="7732397372178774777">"Защита и конфиденциальность"</string>
+ <string name="safety_center_title" msgid="7732397372178774777">"Безопасность и конфиденциальность"</string>
<string name="safety_center_summary" msgid="3554867379951053869">"Безопасность приложений, блокировка устройства и разрешения"</string>
<string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Модель лица добавлена"</string>
<string name="security_settings_face_preference_summary_none" msgid="523320857738436024">"Требуется настройка"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index ea5d9b8..c3be431 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2141,7 +2141,7 @@
<string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst me kontrast të lartë"</string>
<string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Ndrysho ngjyrën e tekstit në të zezë ose në të bardhë. Maksimizon kontrastin me sfondin."</string>
<string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimizo kontrastin e tekstit"</string>
- <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Ndrysho ngjyrën e tekstit në të zezë ose të bardhë për të rritur kontrstin me sfondin."</string>
+ <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Ndrysho ngjyrën e tekstit në të zezë ose në të bardhë për të rritur kontrastin me sfondin."</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Përditëso auto. zmadhimin e ekranit"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Përditëso zmadhimin e ekranit në kalimet e apl."</string>
<string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butoni i energjisë mbyll telefonatën"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bf5d10f..60a254f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -133,7 +133,7 @@
<string name="previous_connected_see_all" msgid="7759413145713251328">"Se alla"</string>
<string name="connected_device_fast_pair_device_see_all" msgid="4898279230458128620">"Se alla"</string>
<string name="stylus_device_details_title" msgid="7618295136015480864">"E-penna"</string>
- <string name="stylus_default_notes_app" msgid="4165657465911764628">"Vid tryck på knappen för e-penna"</string>
+ <string name="stylus_default_notes_app" msgid="4165657465911764628">"Vid tryck på e-pennans knapp"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (jobbprofil)"</string>
<string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Skriv i textfälten"</string>
<string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorera alla knapptryckningar på e-pennan"</string>
@@ -2241,7 +2241,7 @@
<string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Fortsätt"</string>
<string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Hörhjälpmedel"</string>
<string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Konfigurera och hantera ASHA- eller LE Audio-hörapparater, cochleaimplantat och andra ljudförstärkande enheter"</string>
- <string name="accessibility_hearingaid_not_connected_summary" msgid="7438018718889849521">"Inga hörhjälpmedel har anslutits"</string>
+ <string name="accessibility_hearingaid_not_connected_summary" msgid="7438018718889849521">"Inga hörapparater har anslutits"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"Lägg till hörapparater"</string>
<string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"Parkoppla hörapparater"</string>
<string name="accessibility_hearingaid_pair_instructions_message" msgid="581652489109350119">"Tryck på dina hörapparater på nästa skärm. Du kan behöva parkoppla vänster och höger öra var för sig.\n\nKontrollera att hörapparaterna är på och i parkopplingsläge."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 718ffb3..2df9a36 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -549,7 +549,7 @@
<string name="private_space_biometric_title" msgid="3934339826674553174">"Yüz Tanıma Kilidi ve Parmak İziyle Kilit Açma"</string>
<string name="private_space_fingerprint_title" msgid="5989254643211889931">"Parmak İzi Kilidi"</string>
<string name="private_space_face_title" msgid="3290402865367663079">"Yüz Tanıma Kilidi"</string>
- <string name="private_space_biometric_summary" msgid="4403837276018724581">"Kurmak için dokunun"</string>
+ <string name="private_space_biometric_summary" msgid="4403837276018724581">"Ayarlamak için dokunun"</string>
<string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"Özel alan için Parmak İzi Kilidi"</string>
<string name="private_space_face_unlock_title" msgid="462248384776453613">"Özel alan için Yüz Tanıma Kilidi"</string>
<string name="private_space_category_ways_to_unlock" msgid="4356631225316950046">"Kilidi açma yöntemleri"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4beac47..045de1e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1245,7 +1245,7 @@
<string name="screen_timeout_summary" msgid="5558778019594643427">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
<string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"Не вказано"</string>
<string name="wallpaper_settings_title" msgid="5635129851136006383">"Фоновий малюнок"</string>
- <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Оформлення і стиль"</string>
+ <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Оформлення й стиль"</string>
<string name="wallpaper_dashboard_summary" msgid="2324472863981057118">"Головний екран, заблокований екран"</string>
<string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Змініть фоновий малюнок"</string>
<string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Налаштувати екран"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f9eedab..c01d01a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -625,7 +625,7 @@
<string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Ảnh, tệp, email, danh bạ, sự kiện trên lịch và các dữ liệu khác đã đồng bộ hoá"</string>
<string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Nhật ký ứng dụng đã tải xuống và các đề xuất"</string>
<string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Nhật ký duyệt web, dấu trang và mật khẩu đã lưu"</string>
- <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Nội dung đề xuất liên quan đến hoạt động của bạn ở các ứng dụng trong không gian riêng tư"</string>
+ <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Nội dung đề xuất liên quan đến hoạt động của bạn tại các ứng dụng trên không gian riêng tư"</string>
<string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Tôi hiểu"</string>
<string name="fingerprint_add_max" msgid="8639321019299347447">"Bạn có thể thêm tối đa <xliff:g id="COUNT">%d</xliff:g> vân tay"</string>
<string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Bạn đã thêm số vân tay tối đa"</string>
@@ -1994,9 +1994,9 @@
<string name="display_category_title" msgid="6638191682294461408">"Màn hình"</string>
<string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Màu sắc và chuyển động"</string>
<string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Độ tương phản màu"</string>
- <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Độ tương phản càng cao thì càng giúp làm nổi bật văn bản, nút và biểu tượng. Hãy chọn độ tương phản phù hợp nhất với bạn."</string>
+ <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Độ tương phản càng cao thì văn bản, nút và biểu tượng càng nổi bật. Hãy chọn độ tương phản phù hợp nhất với bạn."</string>
<string name="color_contrast_note" msgid="7592686603372566198">"Một số ứng dụng có thể không hỗ trợ hết tất cả các chế độ cài đặt độ tương phản màu và văn bản"</string>
- <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Điều chỉnh cách hiển thị màu và văn bản dựa vào màu nền của màn hình"</string>
+ <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Điều chỉnh cách hiển thị màu và văn bản sao cho tương phản với màu nền của màn hình"</string>
<string name="color_contrast_preview" msgid="6791430227535363883">"Xem trước"</string>
<string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
<string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ngày trước"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 83e822e..d4531ec 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1319,7 +1319,7 @@
<string name="battery_info" msgid="7873528123969546728">"电池信息"</string>
<string name="device_info_not_available" msgid="4804474466616712326">"无法获取"</string>
<string name="storage_settings" msgid="7472188817781592677">"存储"</string>
- <string name="storage_settings_for_app" msgid="229425418984637483">"存储和缓存"</string>
+ <string name="storage_settings_for_app" msgid="229425418984637483">"存储空间和缓存"</string>
<string name="storage_settings_title" msgid="486118156723194815">"存储设置"</string>
<string name="status_eid" msgid="7532406028683438634">"EID"</string>
<string name="eid_multi_sim" msgid="9087924808336397804">"EID（SIM 卡插槽 <xliff:g id="EID_SLOT_ID">%1$d</xliff:g>）"</string>
@@ -1871,7 +1871,7 @@
<string name="keyboard_a11y_category" msgid="8230758278046841469">"无障碍功能"</string>
<string name="physical_keyboard_title" msgid="3328134097512350958">"实体键盘"</string>
<string name="show_ime" msgid="4334255501724746849">"使用屏幕键盘"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"开启后，连接到实体键盘时，它会一直显示在屏幕上"</string>
+ <string name="show_ime_summary" msgid="7293345791727205975">"连接到实体键盘时，在屏幕上显示一个虚拟键盘"</string>
<string name="bounce_keys" msgid="7419450970351743904">"返回键"</string>
<string name="bounce_keys_summary" msgid="7347050868868080302">"键盘会忽略 <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> 毫秒内快速重复按同一键的操作"</string>
<string name="slow_keys" msgid="2891452895499690837">"慢速键"</string>
@@ -1901,7 +1901,7 @@
<string name="gesture_summary_go_home" msgid="6409031586904205741">"在触控板上的任意位置用三根手指向上滑动"</string>
<string name="gesture_title_go_back" msgid="6619462058488419802">"返回"</string>
<string name="gesture_summary_go_back" msgid="4981604277892236888">"用三根手指从左或从右滑动"</string>
- <string name="gesture_title_recent_apps" msgid="6082688963233208761">"查看最近运行过的应用"</string>
+ <string name="gesture_title_recent_apps" msgid="6082688963233208761">"查看最近用过的应用"</string>
<string name="gesture_summary_recent_apps" msgid="6643179135202417509">"用三根手指向上滑动并按住，然后释放"</string>
<string name="gesture_title_notifications" msgid="791717222472350194">"查看通知和快捷设置"</string>
<string name="gesture_summary_notifications" msgid="8419514601638387255">"在主屏幕上用三根手指向下滑动"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8d98afb..cf528e8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1571,7 +1571,7 @@
<string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置時區偵測已停用"</string>
<string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"不支援位置時區偵測"</string>
<string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"不允許變更位置時區偵測"</string>
- <string name="location_time_zone_detection_auto_is_on" msgid="8797434659844659323">"您可以使用位置資訊設定時區"</string>
+ <string name="location_time_zone_detection_auto_is_on" msgid="8797434659844659323">"設定時區時可使用位置資訊"</string>
<string name="about_settings_summary" msgid="4831942939227432513">"查看法律資訊、狀態、軟體版本"</string>
<string name="legal_information" msgid="7509900979811934843">"法律資訊"</string>
<string name="manual" msgid="3651593989906084868">"說明書"</string>
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
index fdf66c3..6b5ccc7 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt
@@ -23,6 +23,7 @@
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import com.android.settings.deviceinfo.regulatory.RegulatoryInfo.getRegulatoryInfo
+import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
/**
* [Activity] that displays regulatory information for the "Regulatory information"
@@ -53,8 +54,8 @@
return
}
- val regulatoryText = resources.getText(R.string.regulatory_info_text)
- if (regulatoryText.isNotEmpty()) {
+ val regulatoryText = getRegulatoryText()
+ if (!regulatoryText.isNullOrEmpty()) {
builder.setMessage(regulatoryText)
val dialog = builder.show()
// we have to show the dialog first, or the setGravity() call will throw a NPE
@@ -64,4 +65,10 @@
finish()
}
}
+
+ private fun getRegulatoryText(): CharSequence? {
+ val regulatoryInfoText = resources.getText(R.string.regulatory_info_text)
+ if (regulatoryInfoText.isNotBlank()) return regulatoryInfoText
+ return featureFactory.hardwareInfoFeatureProvider?.countryIfOriginLabel
+ }
}
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
index 400ece9..e9866d7 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt
@@ -23,4 +23,9 @@
* Returns the manufactured year
*/
val manufacturedYear: String?
-}
\ No newline at end of file
+
+ /**
+ * The country of origin label.
+ */
+ val countryIfOriginLabel: String
+}
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProviderImpl.kt b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProviderImpl.kt
deleted file mode 100644
index 54a112b..0000000
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProviderImpl.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.deviceinfo.hardwareinfo
-
-/**
- * Feature provider for hardware info
- */
-object HardwareInfoFeatureProviderImpl : HardwareInfoFeatureProvider {
- override val manufacturedYear: String?
- get() = null
-}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/ManufacturedYearPreferenceController.kt b/src/com/android/settings/deviceinfo/hardwareinfo/ManufacturedYearPreferenceController.kt
index 92d7733..9d1a826 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/ManufacturedYearPreferenceController.kt
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/ManufacturedYearPreferenceController.kt
@@ -22,7 +22,8 @@
/** Preference controller for Manufactured Year. */
class ManufacturedYearPreferenceController(context: Context, preferenceKey: String) :
BasePreferenceController(context, preferenceKey) {
- private val year: String? = featureFactory.hardwareInfoFeatureProvider.manufacturedYear
+
+ private val year: String? = featureFactory.hardwareInfoFeatureProvider?.manufacturedYear
override fun getAvailabilityStatus(): Int =
if (!year.isNullOrEmpty()) AVAILABLE else UNSUPPORTED_ON_DEVICE
diff --git a/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt b/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt
index e26e061..2982e47 100644
--- a/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt
+++ b/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfo.kt
@@ -23,8 +23,7 @@
import androidx.annotation.DrawableRes
import androidx.annotation.VisibleForTesting
import com.android.settings.R
-
-
+import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
/** To load Regulatory Info from device. */
object RegulatoryInfo {
@@ -38,10 +37,10 @@
/** Gets the regulatory drawable. */
fun Context.getRegulatoryInfo(): Drawable? {
- val sku = getSku()
+ val sku = getSku().lowercase()
if (sku.isNotBlank()) {
// When hardware coo property exists, use regulatory_info_<sku>_<coo> resource if valid.
- val coo = getCoo()
+ val coo = getCoo().lowercase()
if (coo.isNotBlank()) {
getRegulatoryInfo("${REGULATORY_INFO_RESOURCE}_${sku}_$coo")?.let { return it }
}
@@ -51,9 +50,9 @@
return getRegulatoryInfo(REGULATORY_INFO_RESOURCE)
}
- private fun getCoo(): String = SystemProperties.get(KEY_COO).lowercase()
+ fun getCoo(): String = SystemProperties.get(KEY_COO)
- private fun getSku(): String = SystemProperties.get(KEY_SKU).lowercase()
+ fun getSku(): String = SystemProperties.get(KEY_SKU)
private fun Context.getRegulatoryInfo(fileName: String): Drawable? {
val overlayPackageName =
diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt
index 2c4a295..53ad8ba 100644
--- a/src/com/android/settings/overlay/FeatureFactory.kt
+++ b/src/com/android/settings/overlay/FeatureFactory.kt
@@ -68,7 +68,7 @@
/**
* Retrieves implementation for Hardware Info feature.
*/
- abstract val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider
+ open val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider? = null
/** Implementation for [SupportFeatureProvider]. */
open val supportFeatureProvider: SupportFeatureProvider? = null
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
index e1519b3..1770209 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
@@ -45,8 +45,6 @@
import com.android.settings.dashboard.DashboardFeatureProviderImpl
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl
-import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider
-import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProviderImpl
import com.android.settings.display.DisplayFeatureProvider
import com.android.settings.display.DisplayFeatureProviderImpl
import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl
@@ -81,9 +79,6 @@
ContextualCardFeatureProviderImpl(appContext)
}
- override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider =
- HardwareInfoFeatureProviderImpl
-
override val metricsFeatureProvider by lazy { SettingsMetricsFeatureProvider() }
override val powerUsageFeatureProvider by lazy { PowerUsageFeatureProviderImpl(appContext) }
diff --git a/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
index f49cc68..38683d0 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
@@ -32,8 +32,6 @@
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
-import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider;
-import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProviderImpl;
import com.android.settings.display.DisplayFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
@@ -299,11 +297,6 @@
}
@Override
- public HardwareInfoFeatureProvider getHardwareInfoFeatureProvider() {
- return HardwareInfoFeatureProviderImpl.INSTANCE;
- }
-
- @Override
public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
return mAdvancedVpnFeatureProvider;
}
diff --git a/tests/spa_unit/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfoTest.kt b/tests/spa_unit/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfoTest.kt
index f1e18fc..7486e78 100644
--- a/tests/spa_unit/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfoTest.kt
+++ b/tests/spa_unit/src/com/android/settings/deviceinfo/regulatory/RegulatoryInfoTest.kt
@@ -35,14 +35,12 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.MockitoSession
-import org.mockito.Spy
import org.mockito.quality.Strictness
@RunWith(AndroidJUnit4::class)
class RegulatoryInfoTest {
private lateinit var mockSession: MockitoSession
- @Spy
private val context: Context = ApplicationProvider.getApplicationContext()
@Before
@@ -98,8 +96,31 @@
assertDrawableSameAs(regulatoryInfo, R.drawable.regulatory_info_sku)
}
+ @Test
+ fun getCoo() {
+ doReturn(COO).`when` { SystemProperties.get(KEY_COO) }
+
+ val coo = RegulatoryInfo.getCoo()
+
+ assertThat(coo).isEqualTo(COO)
+ }
+
+ @Test
+ fun getSku() {
+ doReturn(SKU).`when` { SystemProperties.get(KEY_SKU) }
+
+ val coo = RegulatoryInfo.getSku()
+
+ assertThat(coo).isEqualTo(SKU)
+ }
+
private fun assertDrawableSameAs(drawable: Drawable?, @DrawableRes resId: Int) {
val expected = context.getDrawable(resId)!!.toBitmap()
assertThat(drawable!!.toBitmap().sameAs(expected)).isTrue()
}
+
+ private companion object {
+ const val SKU = "ABC"
+ const val COO = "CN"
+ }
}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
index 4f17a3a..29758de 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -32,8 +32,6 @@
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
-import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider;
-import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProviderImpl;
import com.android.settings.display.DisplayFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
@@ -300,11 +298,6 @@
}
@Override
- public HardwareInfoFeatureProvider getHardwareInfoFeatureProvider() {
- return HardwareInfoFeatureProviderImpl.INSTANCE;
- }
-
- @Override
public AdvancedVpnFeatureProvider getAdvancedVpnFeatureProvider() {
return mAdvancedVpnFeatureProvider;
}