Merge "Update fingerprint removal dialog strings" into tm-dev

commit: 1c45e9ad721b20430d046954b0c1a25e703a3642 [log] [tgz]
author: TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 10 20:09:03 2022 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Fri Jun 10 20:09:03 2022 +0000
tree: 487a094a2273ecd5d65f3e0fdfb01b83539f50db
parent: fc45c25296cc10b0957e64056278b1312d0a2b7f [diff]
parent: 74f7988ced18df9a06c5bf9ce7bd40505b8e6030 [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 13cfedd..2d7f6b7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -852,7 +852,7 @@
     <string name="bluetooth_preference_no_found_devices" msgid="1331122763066030155">"Geen toestelle beskikbaar nie"</string>
     <string name="bluetooth_device_context_connect" msgid="4913860372216815855">"Koppel"</string>
     <string name="bluetooth_device_context_disconnect" msgid="4464167389972513232">"Ontkoppel"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"Saambind en koppel"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"Bind saam en koppel"</string>
     <string name="bluetooth_device_context_unpair" msgid="7525735305244087162">"Ontsaambind"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="2001359431289794561">"Ontkoppel en ontsaambind"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="934657460643490773">"Opsies…"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 06f7203..3356340 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -3639,7 +3639,7 @@
     <string name="keywords_profile_challenge" msgid="5135555521652143612">"የስራ ፈተና፣ ስራ፣ መገለጫ"</string>
     <string name="keywords_unification" msgid="2677472004971453468">"የሥራ መገለጫ፣ የሚተዳደር መገለጫ፣ አዋህድ፣ ውህደት፣ ሥራ፣ መገለጫ"</string>
     <string name="keywords_gesture" msgid="3456930847450080520">"የጣት ምልክቶች"</string>
-    <string name="keywords_wallet" msgid="3757421969956996972">"የኪስ ቦርሳ"</string>
+    <string name="keywords_wallet" msgid="3757421969956996972">"Wallet"</string>
     <string name="keywords_payment_settings" msgid="6268791289277000043">"ይክፈሉ፣ መታ ያድርጉ፣ ክፍያዎች"</string>
     <string name="keywords_backup" msgid="707735920706667685">"ምትኬ"</string>
     <string name="keywords_assist_gesture_launch" msgid="7710762655355161924">"የጣት ምልክት"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c7b6aca..e06d56b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -229,7 +229,7 @@
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"الإعداد التلقائي للنظام"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"لا تتوفَّر إمكانية اختيار لغة لهذا التطبيق من الإعدادات."</string>
     <string name="desc_app_locale_disclaimer" msgid="5295933110644789052">"قد تختلف اللغة عن اللغات المتوفّرة في التطبيق. قد لا تدعم بعض التطبيقات هذا الإعداد."</string>
-    <string name="desc_app_locale_selection_supported" msgid="6149467826636295127">"تظهر هنا التطبيقات التي تدعم اختيار اللغة فقط."</string>
+    <string name="desc_app_locale_selection_supported" msgid="6149467826636295127">"تظهر هنا فقط التطبيقات التي تتيح اختيار اللغة."</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
       <item quantity="zero">هل تريد إزالة اللغة المحددة؟</item>
       <item quantity="two">هل تريد إزالة اللغتين المحددتين؟</item>
@@ -604,7 +604,7 @@
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"التالي"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"بالإضافة إلى فتح قفل هاتفك، يمكنك أيضًا استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"خيار قفل الشاشة غير مفعَّل. لمزيد من المعلومات، يمكنك التواصُل مع المشرف داخل مؤسستك."</string>
-    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"لا يزال بإمكانك استخدام بصمة إصبعك للسماح بعمليات الشراء ومنح تطبيق الإذن بالوصول."</string>
+    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"لا يزال بإمكانك استخدام بصمة إصبعك للسماح بعمليات الشراء ومنح التطبيقات أذونات الوصول."</string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"ارفع إصبعك ثم المس زر الاستشعار مرة أخرى."</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"لا يمكن استخدام أداة استشعار بصمة الإصبع. يُرجى التواصل مع مقدِّم خدمات إصلاح."</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"المزيد من إعدادات الأمان"</string>
@@ -3898,7 +3898,7 @@
     <string name="live_caption_title" msgid="8617086825712756983">"النسخ النصي التلقائي"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"شرح تلقائي للوسائط"</string>
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"مكبّر صوت الهاتف"</string>
-    <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"سماعات رأس سلكية"</string>
+    <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"سماعات الرأس السلكية"</string>
     <string name="spatial_audio_text" msgid="8201387855375146000">"الصوت الصادر من الوسائط المتوافقة أصبح أكثر وضوحًا."</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"غير مفعّل"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"مفعّلة / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
@@ -4210,7 +4210,7 @@
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"هل تسمح بوصول خدمة <xliff:g id="SERVICE">%1$s</xliff:g> إلى الإشعارات؟"</string>
     <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"‏تم إبدال الإشعارات التكيُّفية لنظام التشغيل Android في الإصدار 12 منه بالإشعارات المحسّنة. تعرض هذه الميزة إجراءات وردودًا مقترحة وتنظِّم الإشعارات. \n\nيمكن للإشعارات المحسّنة الوصول إلى محتوى الإشعارات، بما في ذلك المعلومات الشخصية، مثلاً أسماء جهات الاتصال والرسائل. يمكن لهذه الميزة أيضًا إغلاق الإشعارات أو الاستجابة لها، مثلاً الردّ على مكالمات الهاتف والتحكّم في ميزة \"عدم الإزعاج\"."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"هل تسمح بوصول خدمة <xliff:g id="SERVICE">%1$s</xliff:g> إلى الإشعارات؟"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4317764112725749020">"سيكون بإمكان \"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>\" قراءة جميع الإشعارات، بما في ذلك المعلومات الشخصية، مثلاً أسماء جهات الاتصال والصور ونصوص الرسائل التي تتلقّاها. وسيتمكن هذا التطبيق أيضًا من تأجيل الإشعارات أو إغلاقها أو اتخاذ إجراءات من خلال الأزرار في الإشعارات بما في ذلك الردّ على المكالمات الهاتفية. \n\nستتيح هذه الميزة أيضًا للتطبيق إمكانية تفعيل ميزة \"عدم الإزعاج\" أو إيقافها وتغيير الإعدادات ذات الصلة."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4317764112725749020">"سيكون بإمكان \"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>\" قراءة جميع الإشعارات، بما في ذلك المعلومات الشخصية، مثلاً أسماء جهات الاتصال ونصوص الرسائل التي تتلقّاها. وسيتمكّن أيضًا من إغلاق الإشعارات أو اتخاذ إجراءات من خلال الأزرار في الإشعارات بما في ذلك الردّ على المكالمات الهاتفية. \n\nستتيح هذه الميزة أيضًا للتطبيق إمكانية تفعيل ميزة \"عدم الإزعاج\" أو إيقافها وتغيير الإعدادات ذات الصلة."</string>
     <string name="nls_warning_prompt" msgid="9143226910825830619">"سيكون بإمكان \"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>\" تنفيذ ما يلي:"</string>
     <string name="nls_feature_read_title" msgid="7629713268744220437">"قراءة الإشعارات"</string>
     <string name="nls_feature_read_summary" msgid="1064698238110273593">"يمكنه قراءة الإشعارات، بما في ذلك المعلومات الشخصية، مثلاً جهات الاتصال والرسائل والصور."</string>
@@ -6106,7 +6106,7 @@
     <string name="dream_preview_button_title" msgid="6637456541851795952">"معاينة"</string>
     <string name="dream_picker_category" msgid="7726447836872744867">"اختيار شاشة استراحة"</string>
     <string name="dream_complications_toggle_title" msgid="4273232303027449163">"إظهار معلومات إضافية"</string>
-    <string name="dream_complications_toggle_summary" msgid="4742579722349951711">"‏يمكنك من خلال شاشة التوقف عرض تفاصيل حول الوقت والتاريخ وحالة الطقس وجودة الهواء وCast."</string>
+    <string name="dream_complications_toggle_summary" msgid="4742579722349951711">"‏يمكنك من خلال شاشة الاستراحة عرض تفاصيل حول الوقت والتاريخ وحالة الطقس وجودة الهواء وCast."</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"إعدادات إضافية"</string>
     <string name="dream_setup_title" msgid="2458303874255396142">"اختيار شاشة التوقف"</string>
     <string name="dream_setup_description" msgid="7508547154038580296">"اختَر ما يظهر لك على شاشتك عندما يكون جهازك اللوحي في حالة إرساء. قد يستهلك جهازك قدرًا أكبر من الطاقة عند استخدام شاشة توقّف."</string>
@@ -6116,7 +6116,7 @@
     <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"إعادة التشغيل الآن"</string>
     <string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"إعادة التشغيل لاحقًا"</string>
     <string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"الصوت المكاني"</string>
-    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"الصوت الصادر من الوسائط المتوافقة أصبح أكثر وضوحًا."</string>
+    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"الصوت الصادر من الوسائط المتوافقة يصبح أكثر وضوحًا."</string>
     <string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"تتبُّع حركة الرأس"</string>
     <string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"يتغيّر الصوت بينما تُحرك رأسك ليبدو طبيعيًا جدًا."</string>
     <string name="ingress_rate_limit_title" msgid="2106694002836274350">"الحد الأقصى لمعدّل تنزيل الشبكة"</string>

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 586b887..e993803 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml

@@ -588,7 +588,7 @@
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"পৰৱৰ্তী"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"আপুনি ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি ফ\'নটো আনলক কৰাৰ উপৰি ক্ৰয় আৰু এপ্ প্ৰৱেশৰ অনুমতি দিব পাৰিব। "<annotation id="url">"অধিক জানক"</annotation></string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"স্ক্ৰীন লকৰ বিকল্পটো অক্ষম কৰা আছে। অধিক জানিবলৈ আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"আপুনি তথাপি ক্ৰয় আৰু এপৰ এক্সেছৰ অনুমোদন জনাবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি পাৰে।"</string>
+    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"আপুনি তথাপি ক্ৰয় আৰু এপৰ এক্সেছৰ অনুমোদন জনাবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে।"</string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"আঙুলিটো আঁতৰাওক আৰু ছেন্সৰটো আকৌ স্পৰ্শ কৰক"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰ ব্যৱহাৰ কৰিব নোৱাৰি। মেৰামতি সেৱা প্ৰদানকাৰী কোনো প্ৰতিষ্ঠানলৈ যাওক"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"সুৰক্ষা সম্পৰ্কীয় অধিক ছেটিং"</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index a0f795e..64b32bb 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -5787,7 +5787,7 @@
     <string name="perm_toggle_description" msgid="5754629581767319022">"Za aplikacije i usluge"</string>
     <string name="mic_toggle_description" msgid="484139688645092237">"Za aplikacije i usluge. Ako je ovo podešavanje isključeno, podaci mikrofona mogu i dalje da se dele kada pozovete broj za hitne slučajeve."</string>
     <string name="previous_page_content_description" msgid="6438292457923282991">"Prethodna"</string>
-    <string name="next_page_content_description" msgid="1641835099813416294">"Sledeća"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Dalje"</string>
     <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pregled boje"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Zahtev za pristup SIM kartici"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Uređaj želi da pristupa SIM kartici. Dodirnite za detalje."</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fb75179..3e076f0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -589,7 +589,7 @@
     <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Добавяне на друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Освен за отключване на телефона си можете да използвате отпечатъка си и за упълномощаване на покупки и достъп до приложения. "<annotation id="url">"Научете повече"</annotation></string>
-    <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"Опцията за заключване на екрана е деактивирана. За да научите повече, свържете се с администратора на организацията си."</string>
+    <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"Опцията за заключване на екрана е деактивирана. За да научите повече, се свържете с администратора на организацията си."</string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"Все още можете да използвате отпечатъка си, за да оторизирате плащания и да отключвате приложения."</string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Вдигнете пръста, след което докоснете сензора отново"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"Сензорът за отпечатъци не може да се използва. Посетете оторизиран сервиз."</string>
@@ -933,7 +933,7 @@
     <string name="nfc_quick_toggle_title" msgid="3607620705230351666">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"Разрешаване на обмен на данни, когато таблетът се докосва до устройство с NFC"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"Разрешаване на обмен на данни, когато телефонът се докосва до устройство с NFC"</string>
-    <string name="nfc_disclaimer_title" msgid="3696580694485048039">"Включване на КБП"</string>
+    <string name="nfc_disclaimer_title" msgid="3696580694485048039">"Включване на NFC"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"Чрез КБП се обменят данни между това устройство и други в близост или целеви такива, като например терминали за плащане, четци за достъп и интерактивни реклами или маркери."</string>
     <string name="nfc_secure_settings_title" msgid="4906958426927741485">"Изискване за отключване на устройството за NFC"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="407654335737959071">"Разрешаване на използването на NFC само при отключен екран"</string>

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 03bddc4..c0fb42e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -639,8 +639,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite rezervni način zaključavanja ekrana"</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"Ako zaboravite lozinku za zaključavanje ekrana, vaš IT administrator je neće moći poništiti."</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"Postavite zasebno zaključavanje za posao"</string>
+    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"Ako zaboravite radnju za zaključavanje ekrana, vaš IT administrator je neće moći poništiti."</string>
+    <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"Postavite zasebno zaključavanje za poslovne aplikacije"</string>
     <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"Ako zaboravite ovo zaključavanje, tražite od IT administratora da ga poništi"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja ekrana"</string>
@@ -752,7 +752,7 @@
       <item quantity="few">Mora sadržavati najmanje <xliff:g id="COUNT_1">%d</xliff:g> znaka</item>
       <item quantity="other">Mora sadržavati najmanje <xliff:g id="COUNT_1">%d</xliff:g> znakova</item>
     </plurals>
-    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Ako koristite samo brojeve, mora postojati najmanje 1 cifra}one{Ako koristite samo brojeve, mora postojati najmanje # cifra}few{Ako koristite samo brojeve, moraju postojati najmanje # cifre}other{Ako koristite samo brojeve, mora postojati najmanje # cifara}}"</string>
+    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Ako koristite samo brojeve, mora imati najmanje 1 cifru}one{Ako koristite samo brojeve, mora imati najmanje # cifru}few{Ako koristite samo brojeve, mora imati najmanje # cifre}other{Ako koristite samo brojeve, mora imati najmanje # cifara}}"</string>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="one">PIN mora sadržavati najmanje <xliff:g id="COUNT_1">%d</xliff:g> cifru</item>
       <item quantity="few">PIN mora sadržavati najmanje <xliff:g id="COUNT_1">%d</xliff:g> cifre</item>
@@ -3774,7 +3774,7 @@
     <string name="spatial_summary_off" msgid="8272678804629774378">"Isključeno"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"Uključeno / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"Uključeno / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> i <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"Možete uključiti i prostorni zvuk za Bluetooth uređaje."</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"Možete uključiti prostorni zvuk i za Bluetooth uređaje."</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"Postavke povezanih uređaja"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nema}=1{Postavljen je 1 raspored}one{Postavljen je # raspored}few{Postavljena su # rasporeda}other{Postavljeno je # rasporeda}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne ometaj"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1feaecd..e4a8e25 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -2535,7 +2535,7 @@
     <string name="accessibility_summary_state_disabled" msgid="9173234532752799694">"Aus"</string>
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"Fehler. Tippen, um weitere Informationen zu erhalten."</string>
     <string name="accessibility_description_state_stopped" msgid="5364752492861199133">"Dieser Dienst funktioniert nicht."</string>
-    <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"Bedienungshilfenverknüpfungen"</string>
+    <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"Kurzbefehle für Bedienungshilfen"</string>
     <string name="enable_quick_setting" msgid="6648073323202243604">"In Schnelleinstellungen anzeigen"</string>
     <string name="daltonizer_mode_deuteranomaly_title" msgid="4210949400493358650">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6392456967103014723">"Rot-Grün-Sehschwäche"</string>
@@ -4121,7 +4121,7 @@
     <string name="notification_content_block_title" msgid="6689085826061361351">"Benachrichtigungen anzeigen"</string>
     <string name="notification_content_block_summary" msgid="329171999992248925">"Benachrichtigungen nie in der Leiste oder auf Peripheriegeräten anzeigen"</string>
     <string name="notification_badge_title" msgid="6854537463548411313">"App-Benachrichtigungspunkt erlauben"</string>
-    <string name="notification_channel_badge_title" msgid="6505542437385640049">"App-Benachrichtigungs00ADpunkt anzeigen"</string>
+    <string name="notification_channel_badge_title" msgid="6505542437385640049">"App-Benachrichtigungspunkt anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"„Bitte nicht stören“ ignorieren"</string>
     <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn „Bitte nicht stören“ aktiviert ist"</string>
     <string name="app_notification_visibility_override_title" msgid="7778628150022065920">"Sperrbildschirm"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6137729..7e65be2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -590,7 +590,7 @@
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Siguiente"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Además de desbloquear el teléfono, también puedes utilizar tu huella dactilar para autorizar compras y el acceso a aplicaciones. "<annotation id="url">"Más información"</annotation></string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"La opción de bloqueo de pantalla está inhabilitada. Para obtener más información, comunícate con el administrador de la organización."</string>
-    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"Todavía puedes usar tu huella dactilar para autorizar compras y acceder a apps."</string>
+    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"Puedes seguir usando tu huella dactilar para autorizar compras y acceder a apps."</string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levanta el dedo y vuelve a tocar el sensor"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"No se puede usar el sensor de huellas dactilares. Consulta a un proveedor de reparaciones."</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"Más parámetros de seguridad"</string>
@@ -2573,8 +2573,8 @@
       <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Configuración"</string>
-    <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Activado"</string>
-    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Desactivado"</string>
+    <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Activada"</string>
+    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Desactivada"</string>
     <string name="captioning_preview_title" msgid="2888561631323180535">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Opciones estándar"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Idioma"</string>
@@ -3580,7 +3580,7 @@
     <string name="connected_devices_dashboard_android_auto_no_nfc_summary" msgid="2532811870469405527">"Bluetooth, Android Auto, modo en automóvil"</string>
     <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"Bluetooth, Android Auto, NFC"</string>
     <string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode" msgid="1672426693308438634">"Bluetooth, Android Auto"</string>
-    <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"No disponible porque la NFC está desactivada"</string>
+    <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"No disponible porque NFC está desactivada"</string>
     <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Para usar esta opción, debes instalar una app de pagos"</string>
     <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"Apps y notificaciones"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Apps recientes y predeterminadas"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 13ce048..7d360a4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -2302,7 +2302,7 @@
     <string name="experimental_category_title" msgid="898904396646344152">"Experimental"</string>
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"Flags de funciones"</string>
     <string name="talkback_title" msgid="8756080454514251327">"TalkBack"</string>
-    <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla destinado principalmente a personas ciegas y con poca visión"</string>
+    <string name="talkback_summary" msgid="5820927220378864281">"Lector de pantalla destinado principalmente a personas ciegas y con baja visión"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Toca cualquier elemento de la pantalla para escucharlo"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias de subtítulos"</string>
     <string name="accessibility_captioning_about_title" msgid="3542171637334191563">"Acerca de las preferencias de subtítulos"</string>
@@ -2525,7 +2525,7 @@
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ajuste de audio"</string>
     <string name="accessibility_toggle_audio_description_preference_title" msgid="8916473886256061220">"Audiodescripción"</string>
     <string name="accessibility_audio_description_summary" msgid="2554789094873781056">"Escucha una descripción de lo que está pasando en pantalla en películas y series compatibles"</string>
-    <string name="keywords_audio_description" msgid="6202816411593281252">"audiodescripción, audio, descripción, visión reducida,"</string>
+    <string name="keywords_audio_description" msgid="6202816411593281252">"audiodescripción, audio, descripción, baja visión,"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Acceso directo activado"</string>
     <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Desactivado"</string>
     <string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Activado"</string>
@@ -2624,14 +2624,14 @@
     <string name="settings_button" msgid="2195468788019730377">"Ajustes"</string>
     <string name="keywords_reduce_bright_colors" msgid="1683190961013139183">"fotosensibilidad, fotofobia, tema oscuro, migraña, dolor de cabeza, modo lectura, modo noche, reducir brillo, punto blanco"</string>
     <string name="keywords_accessibility" msgid="4263443239404659143">"facilidad de uso, facilidad de acceso, asistencia, ayuda"</string>
-    <string name="keywords_magnification" msgid="3908145308269840862">"lupa, zoom, ampliación, visión reducida, ampliar, agrandar, hacer más grande"</string>
+    <string name="keywords_magnification" msgid="3908145308269840862">"lupa, zoom, ampliación, baja visión, ampliar, agrandar, hacer más grande"</string>
     <string name="keywords_talkback" msgid="2816435437095102527"></string>
     <string name="keywords_live_caption" msgid="1667203998080567556">"subtítulos, Transcripción instantánea, deficiencia auditiva, pérdida de audición, transcripción en tiempo real, transcripción de voz"</string>
     <string name="keywords_live_transcribe" msgid="3226990195174890997"></string>
     <string name="keywords_sound_notifications" msgid="8183107485754075413"></string>
     <string name="keywords_sound_amplifier" msgid="939404835256246663"></string>
     <string name="keywords_display_size" msgid="5286419615221231518">"tamaño de pantalla, pantalla grande"</string>
-    <string name="keywords_bold_text" msgid="6257418169207099589">"contraste alto, visión reducida, fuente en negrita, negrita"</string>
+    <string name="keywords_bold_text" msgid="6257418169207099589">"contraste alto, baja visión, fuente en negrita, negrita"</string>
     <string name="keywords_select_to_speak" msgid="2872704811610888719"></string>
     <string name="keywords_color_correction" msgid="8540442886990423681">"ajustar color"</string>
     <string name="keywords_color_inversion" msgid="4291058365873221962">"oscurecer pantalla, aclarar pantalla, pantalla oscura, pantalla clara"</string>
@@ -3684,7 +3684,7 @@
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, llamadas avanzadas, llamadas 4g"</string>
     <string name="keywords_nr_advanced_calling" msgid="4157823099610141014">"vo5g, vonr, llamadas avanzadas, llamadas 5g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"añadir idioma, añadir un idioma, añadir lengua, añadir una lengua"</string>
-    <string name="keywords_font_size" msgid="1643198841815006447">"tamaño del texto, letras grandes, fuente grande, texto grande, visión reducida, hacer el texto más grande, agrandar texto, ampliar texto, ampliador de fuente, ampliación de la fuente"</string>
+    <string name="keywords_font_size" msgid="1643198841815006447">"tamaño del texto, letras grandes, fuente grande, texto grande, baja visión, hacer el texto más grande, agrandar texto, ampliar texto, ampliador de fuente, ampliación de la fuente"</string>
     <string name="keywords_always_show_time_info" msgid="9120590185763264666">"pantalla siempre activa"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"El volumen del tono de llamada y de las notificaciones está al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
@@ -3733,7 +3733,7 @@
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"Activado / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> y <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
     <string name="spatial_audio_footer_title" msgid="8775010547623606088">"También puedes activar el audio espacial para dispositivos Bluetooth."</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"Ajustes de dispositivos conectados"</string>
-    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguno}=1{1 programación creada}other{# programaciones creadas}}"</string>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguna}=1{1 programación creada}other{# programaciones creadas}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No molestar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recibe notificaciones solo de personas y aplicaciones importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupciones"</string>
@@ -4859,7 +4859,7 @@
     <string name="special_access_more" msgid="132919514147475846">"Ver más"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Restablecer límite de frecuencia de ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Se ha restablecido el límite de frecuencia de ShortcutManager"</string>
-    <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar los datos que aparecen en la pantalla de bloqueo"</string>
+    <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar qué aparece en la pantalla de bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Mostrar u ocultar contenido de las notificaciones"</string>
     <string name="page_tab_title_summary" msgid="7188875610123234454">"Todo"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"Ayuda y consejos"</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c9f0acd..437e62e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -5569,7 +5569,7 @@
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Utzi cacheko aplikazioak exekutatzeari"</string>
     <string name="blob_never_expires_text" msgid="7293376386620106623">"Ez da inoiz iraungiko."</string>
     <string name="accessor_never_expires_text" msgid="4647624492147788340">"Ez da inoiz iraungiko lagapena."</string>
-    <string name="overlay_settings_title" msgid="1032863083496396365">"Eman pantailetan gainjartzeko baimena ezarpenetan"</string>
+    <string name="overlay_settings_title" msgid="1032863083496396365">"Eman ezarpenen pantailetan gainjartzeko baimena"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Eman ezarpenen pantailetan gainjartzeko baimena aplikazioen gainean bistara daitezkeen aplikazioei"</string>
     <string name="allow_mock_modem" msgid="3832264806530479214">"Eman probarako modem bat erabiltzeko baimena"</string>
     <string name="allow_mock_modem_summary" msgid="9097416612748005374">"Eman probarako modemaren zerbitzua exekutatzeko baimena gailu honi, instrumentazio-probak egiteko. Ez ezazu gaitu telefonoa ohiko moduan erabili bitartean."</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 3f21960..a2de168 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -635,9 +635,9 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این دستگاه استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این تلفن استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"روش پشتیبان قفل صفحه را انتخاب کنید"</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"اگر قفل صفحه را فراموش کنید، سرپرست سیستم نمی‌تواند آن را بازنشانی کند."</string>
+    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"اگر قفل صفحه را فراموش کنید، سرپرست فناوری اطلاعات نمی‌تواند آن را بازنشانی کند."</string>
     <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"قفل کاری مجزایی تنظیم کنید"</string>
-    <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"اگر این قفل را فراموش کردید، از سرپرست سیستم بخواهید آن را بازنشانی کند"</string>
+    <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"اگر این قفل را فراموش کردید، از سرپرست فناوری اطلاعات بخواهید آن را بازنشانی کند"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"گزینه‌های قفل صفحه"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"گزینه‌های قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"قفل صفحه"</string>
@@ -2304,7 +2304,7 @@
     <string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
     <string name="talkback_summary" msgid="5820927220378864281">"صفحه‌خوان در وهله اول برای افراد نابینا و کم‌بینا در نظر گرفته شده است"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"روی موارد موجود در صفحه‌تان ضربه بزنید تا بلند خوانده شوند"</string>
-    <string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویت‌های زیرنویس"</string>
+    <string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویت‌های زیرنویس ناشنوایان"</string>
     <string name="accessibility_captioning_about_title" msgid="3542171637334191563">"درباره اولویت‌های زیرنویس ناشنوایان"</string>
     <string name="accessibility_captioning_footer_learn_more_content_description" msgid="5730040700677017706">"درباره اولویت‌های زیرنویس ناشنوایان بیشتر بدانید"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"بزرگ‌نمایی"</string>
@@ -2508,7 +2508,7 @@
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"کلیدهای میزان صدا را نگه‌دارید"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"سه ضربه روی صفحه بزنید"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"ادامه"</string>
-    <string name="accessibility_hearingaid_title" msgid="427173678199203191">"سمعک‌ها"</string>
+    <string name="accessibility_hearingaid_title" msgid="427173678199203191">"سمعک"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"هیچ سمعکی متصل نشده است"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"افزودن سمعک‌ها"</string>
     <string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"مرتبط کردن سمعک"</string>
@@ -4070,7 +4070,7 @@
     <string name="interact_across_profiles_switch_enabled" msgid="7294719120282287495">"متصل"</string>
     <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"متصل کردن این برنامه‌ها"</string>
     <string name="interact_across_profiles_summary_1" msgid="6093976896137600231">"برنامه‌های متصل از اجازه‌های مشترکی استفاده می‌کنند و می‌توانند به داده‌های یکدیگر دسترسی پیدا کنند."</string>
-    <string name="interact_across_profiles_summary_2" msgid="505748305453633885">"برای اینکه داده‌های شخصی با مدیر فناوری اطلاعات هم‌رسانی نشود، تنها درصورتی برنامه‌ها را متصل کنید که به آن‌ها اعتماد داشته باشید."</string>
+    <string name="interact_across_profiles_summary_2" msgid="505748305453633885">"برای اینکه داده‌های شخصی با سرپرست فناوری اطلاعات هم‌رسانی نشود، تنها درصورتی برنامه‌ها را متصل کنید که به آن‌ها اعتماد داشته باشید."</string>
     <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"هرزمان خواستید می‌توانید اتصال برنامه‌ها را در تنظیمات حریم‌خصوصی دستگاه قطع کنید."</string>
     <string name="interact_across_profiles_consent_dialog_title" msgid="8530621211216508681">"به برنامه کاری <xliff:g id="NAME">%1$s</xliff:g> برای دسترسی به داده‌های شخصی‌تان اعتماد دارید؟"</string>
     <string name="interact_across_profiles_consent_dialog_summary" msgid="3949870271562055048">"تنها درصورتی برنامه‌ها را متصل کنید که به آن‌ها اعتماد دارید که داده‌های شخصی را با سرپرست فناوری اطلاعاتتان هم‌رسانی نمی‌کنند."</string>
@@ -4513,7 +4513,7 @@
     <string name="share_remote_bugreport_dialog_title" msgid="1575283098565582433">"گزارش اشکال به اشتراک گذاشته شود؟"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"سرپرست فناوری اطلاعات شما برای کمک به عیب‌یابی این دستگاه، گزارش اشکال درخواست کرده است. ممکن است برنامه‌ها و داده‌ها به اشتراک گذاشته شوند."</string>
     <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"سرپرست فناوری اطلاعات شما برای کمک به عیب‌یابی این دستگاه، درخواست گزارش اشکال کرده است. ممکن است برنامه‌ها و داده‌ها به اشتراک گذاشته شوند و سرعت دستگاهتان به‌طور موقت کاهش یابد."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"این گزارش اشکال با سرپرست فناوری شما هم‌رسانی می‌شود. برای جزئیات بیشتر با او تماس بگیرید."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"این گزارش اشکال با سرپرست فناوری اطلاعات هم‌رسانی می‌شود. برای جزئیات بیشتر با او تماس بگیرید."</string>
     <string name="share_remote_bugreport_action" msgid="7173093464692893276">"اشتراک‌گذاری"</string>
     <string name="decline_remote_bugreport_action" msgid="1276509879613158895">"نپذیرفتن"</string>
     <string name="usb_use_charging_only" msgid="1743303747327057947">"بدون انتقال داده"</string>
@@ -4669,7 +4669,7 @@
     <string name="backup_disabled" msgid="4503062265560959320">"پشتیبان‌گیری غیرفعال است"</string>
     <string name="android_version_summary" msgid="7818952662015042768">"‏به‌روزرسانی‌شده به Android نسخه <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="5404532347171027730">"به‌روزرسانی در دسترس است"</string>
-    <string name="disabled_by_policy_title" msgid="3635622338687810583">"سرپرست سیستم آن را مسدود کرده است"</string>
+    <string name="disabled_by_policy_title" msgid="3635622338687810583">"سرپرست فناوری اطلاعات آن را مسدود کرده است"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="1669689058213728099">"نمی‌توان بلندی صدا را تغییر داد"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="400089720689494562">"امکان برقراری تماس وجود ندارد"</string>
     <string name="disabled_by_policy_title_sms" msgid="8951840850778406831">"امکان ارسال پیامک وجود ندارد"</string>
@@ -4885,7 +4885,7 @@
     <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"حسگرها خاموش است"</string>
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"تنظیمات نمایه کاری"</string>
     <string name="managed_profile_contact_search_title" msgid="6562061740814513737">"جستجوی مخاطبین فهرست کار در برنامه‌های شخصی"</string>
-    <string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"ممکن است سرپرست سیستم بتواند جستجوها و تماس‌های ورودی‌تان را ببیند"</string>
+    <string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"ممکن است سرپرست فناوری اطلاعات بتواند جستجوها و تماس‌های ورودی‌تان را ببیند"</string>
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"تقویم بین‌‌نمایه‌ای"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"نمایش رویدادهای کاری در تقویم شخصی"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
@@ -4915,7 +4915,7 @@
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"باز کردن سریع دوربین"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"برای باز کردن سریع دوربین، دکمه روشن/خاموش را دو بار فشار دهید. در همه صفحه‌ها کار می‌کند."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="4299496243418753571">"باز کردن سریع دوربین"</string>
-    <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"خودگرفت با چرخش دوربین"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"خودگرفت با چرخاندن دوربین"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"سریع‌تر گرفتن خودگرفت"</string>
     <string name="system_navigation_title" msgid="1698862900901417194">"پیمایش سیستمی"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 844f44e..e8b2553 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -2571,8 +2571,8 @@
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> secondes</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Paramètres"</string>
-    <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Activé"</string>
-    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Désactivé"</string>
+    <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Activée"</string>
+    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Désactivée"</string>
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aperçu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Options standards"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Langue"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9887605..b81b5d1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -1411,11 +1411,11 @@
     <string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"S\'active à l\'heure choisie"</string>
     <string name="dark_ui_auto_mode_custom_bedtime" msgid="8465023741946439266">"S\'active à l\'heure du coucher"</string>
     <string name="dark_ui_status_title" msgid="3505119141437774329">"État"</string>
-    <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'active jamais automatiquement"</string>
+    <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'activera jamais automatiquement"</string>
     <string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"S\'active automatiquement au coucher du soleil"</string>
     <string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"S\'active automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_off_auto_mode_custom_bedtime" msgid="7759826673214624622">"S\'active automatiquement à l\'heure du coucher"</string>
-    <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne jamais désactiver automatiquement"</string>
+    <string name="dark_ui_summary_on_auto_mode_never" msgid="2468597062391435521">"Ne se désactivera jamais automatiquement"</string>
     <string name="dark_ui_summary_on_auto_mode_auto" msgid="5553376115092648636">"Désactiver automatiquement au lever du soleil"</string>
     <string name="dark_ui_summary_on_auto_mode_custom" msgid="2526935680241734784">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="dark_ui_summary_on_auto_mode_custom_bedtime" msgid="1976993025762551246">"Se désactive automatiquement après l\'heure du coucher"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0fb84bc..e3ae2fc 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -494,7 +494,7 @@
     <string name="skip_anyway_button_label" msgid="3442274117023270068">"हां छोड़ें"</string>
     <string name="go_back_button_label" msgid="6139455414099035594">"वापस जाएं"</string>
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"सेट अप न करें"</string>
-    <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"अभी नहीं"</string>
+    <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"रद्द करें"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"सेंसर को छुएं"</string>
     <string name="security_settings_udfps_enroll_find_sensor_title" msgid="8077484429913330179">"फ़िंगरप्रिंट सेट अप करने का तरीका"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"यह आपके फ़ोन के पीछे दिया गया है. अपने अंगूठे के पास की उंगली का उपयोग करें."</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b96d684..fe79f9d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -578,7 +578,7 @@
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Preskočiti postavljanje zaporke?"</string>
     <string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Preskočiti postavljanje zaporke i lica?"</string>
     <string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Preskočiti postavljanje zaporke i otiska prsta?"</string>
-    <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Preskočiti postav. zaporke, lica i otiska prsta?"</string>
+    <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Preskočiti postavljanje zaporke, lica i otiska prsta?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Preskočiti postavljanje uzorka?"</string>
     <string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Preskočiti postavljanje uzorka i lica?"</string>
     <string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Preskočiti postavljanje uzorka i otiska prsta?"</string>
@@ -5058,7 +5058,7 @@
     <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Upravlja aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"Najmanje pet puta brzo pritisnite tipku za uključivanje/isključivanje da biste pokrenuli radnje u nastavku"</string>
     <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Reprodukcija alarma odbrojavanja"</string>
-    <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"Reproduciraj glasni zvuk pri pokretanju SOS poziva"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"Reproduciraj glasan zvuk pri pokretanju SOS poziva"</string>
     <string name="emergency_gesture_category_call_for_help_title" msgid="1680040129478289510">"Traženje pomoći"</string>
     <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Poziv upomoć"</string>
     <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Telefonski broj za pomoć"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a282487..152582e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -3727,7 +3727,7 @@
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatikus feliratozás"</string>
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"Telefon hangszórója"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Vezetékes fejhallgató"</string>
-    <string name="spatial_audio_text" msgid="8201387855375146000">"A kompatibilis médiatartalmak hangja térhatású"</string>
+    <string name="spatial_audio_text" msgid="8201387855375146000">"A kompatibilis médiatartalmak hangja még inkább magával ragadó lesz"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"Ki"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"Bekapcsolva / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"Bekapcsolva / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> és <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index a6acda5..a62bbde 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -601,7 +601,7 @@
     <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>
-    <string name="fingerprint_delete_title" msgid="1469865327307917858">"Ջնջել «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>»-ը"</string>
+    <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>
@@ -635,8 +635,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Կանխեք այս սարքի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Կանխեք այս հեռախոսի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Ընտրեք էկրանի կողպման լրացուցիչ եղանակը"</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"Եթե մոռանաք էկրանի կողպումը, ՏՏ ադմինիստրատորը չի կարողանա փոխել այն։"</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"Ավելացրեք աշխատանքային հավելվածների կողպում"</string>
+    <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"Եթե մոռանաք էկրանի ապակողպման եղանակը, ՏՏ ադմինիստրատորը չի կարողանա փոխել այն։"</string>
+    <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"Առանձին կողպում դրեք աշխատանքային պրոֆիլի համար"</string>
     <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"Եթե մոռանաք կողպման այս եղանակը, ՏՏ ադմինիստրատորը կզրոյացնի այն"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Էկրանի կողպման տարբերակներ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Էկրանի կողպման տարբերակներ"</string>
@@ -3726,8 +3726,8 @@
     <string name="live_caption_title" msgid="8617086825712756983">"Կենդանի ենթագրեր"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ավտոմատ ավելացնել ենթագրեր"</string>
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"Հեռախոսի բարձրախոս"</string>
-    <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Լարով ականջակալներ"</string>
-    <string name="spatial_audio_text" msgid="8201387855375146000">"Համատեղելի մեդիա սարքերի ձայնը դառնում է ավելի իրական"</string>
+    <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Լարով ականջակալ"</string>
+    <string name="spatial_audio_text" msgid="8201387855375146000">"Համատեղելի մեդիա սարքերի ձայնը դառնում է ավելի արտահայտիչ"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"Անջատված է"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"Միացված է/<xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"Միացված է/<xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> և <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
@@ -5768,7 +5768,7 @@
     <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Վերաբեռնել հիմա"</string>
     <string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Վերաբեռնել ավելի ուշ"</string>
     <string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Տարածական հնչողություն"</string>
-    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"Համատեղելի մեդիա սարքերի ձայնը դառնում է ավելի իրական"</string>
+    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"Համատեղելի մեդիա սարքերի ձայնը դառնում է ավելի արտահայտիչ"</string>
     <string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"Գլխի շարժումների հետագծում"</string>
     <string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"Երբ դուք շարժում եք ձեր գլուխը, ձայնը դառնում է ավելի բնական"</string>
     <string name="ingress_rate_limit_title" msgid="2106694002836274350">"Մուտքային թրաֆիկի սահմանաչափ"</string>

diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index de50015..18178f8 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml

@@ -428,7 +428,7 @@
     <item msgid="1666628329913333563">"Besar"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="6621806338070912611">"PPTP VPN"</item>
+    <item msgid="6621806338070912611">"VPN PPTP"</item>
     <item msgid="2552427673212085780">"L2TP/IPSec VPN dengan kunci pra-bagi"</item>
     <item msgid="7378096704485168082">"L2TP/IPSec VPN dengan sertifikat"</item>
     <item msgid="3792393562235791509">"IPSec VPN dengan kunci pra-bagi dan autentikasi Xauth"</item>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 4ed979f..abc3d90 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -2337,7 +2337,7 @@
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Stækka með flýtilykli og með því að ýta þrisvar"</string>
     <string name="accessibility_introduction_title" msgid="8834950581512452348">"Um þjónustuna „<xliff:g id="SERVICE">%1$s</xliff:g>“"</string>
     <string name="accessibility_text_reading_options_title" msgid="3224648909213325563">"Skjástærð og texti"</string>
-    <string name="accessibility_text_reading_options_suggestion_title" msgid="2492155642665312733">"Breyta því hvernig texti birtist á skjánum"</string>
+    <string name="accessibility_text_reading_options_suggestion_title" msgid="2492155642665312733">"Breyta hvernig texti birtist"</string>
     <string name="accessibility_text_reading_preview_mail_subject" msgid="4597374768612733616">"Efni: Hönnun loftbelgja"</string>
     <string name="accessibility_text_reading_preview_mail_from" msgid="1797499780365288020">"Frá: Bjarna"</string>
     <string name="accessibility_text_reading_preview_mail_content" msgid="8078152365771951802">"Góðan daginn!\n\nÉg vildi bara athuga hvernig gengur með hönnunina. Verður allt tilbúið áður en við byrjum að búa til nýju blöðrurnar?"</string>
@@ -4979,7 +4979,7 @@
     <string name="emergency_gesture_switchbar_title" msgid="7421353963329899514">"Nota neyðartilkynningu"</string>
     <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Stýrt af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"Ýttu hratt á aflrofann 5 sinnum eða oftar til að virkja aðgerðirnar hér að neðan"</string>
-    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Spila niðurtalningarviðvörun"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Spila niðurtalningarviðvörun"</string>
     <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"Spila hátt hljóð þegar neyðartilkynning hefst"</string>
     <string name="emergency_gesture_category_call_for_help_title" msgid="1680040129478289510">"Biðja um hjálp"</string>
     <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Hringja á hjálp"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0bdffd2..ad3a0b0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -3030,7 +3030,7 @@
     <string name="vpn_settings_single_insecure_multiple_total" msgid="6107225844641301139">"安全ではない VPN: <xliff:g id="VPN_COUNT">%d</xliff:g> 件"</string>
     <string name="vpn_settings_multiple_insecure_multiple_total" msgid="1706236062478680488">"安全ではない VPN: <xliff:g id="VPN_COUNT">%d</xliff:g> 件"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"接続の自動調整"</string>
-    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ネットワーク接続を自動的に管理することで、バッテリーが長持ちし、デバイスのパフォーマンスが改善します"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ネットワーク接続を自動的に管理することで、電池が長持ちし、デバイスのパフォーマンスが改善します"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"ON"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"OFF"</string>
     <string name="credentials_title" msgid="7535942196886123656">"認証情報ストレージ"</string>
@@ -3727,7 +3727,7 @@
     <string name="live_caption_summary" msgid="2898451867595161809">"メディアの自動字幕起こし"</string>
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"スマートフォンのスピーカー"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"有線ヘッドフォン"</string>
-    <string name="spatial_audio_text" msgid="8201387855375146000">"対応するメディアのより臨場感あふれる音声をお楽しみいただけます"</string>
+    <string name="spatial_audio_text" msgid="8201387855375146000">"対応するメディアを臨場感あふれる音声でお楽しみいただけます"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"OFF"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"ON / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"ON / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g>、<xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
@@ -5542,7 +5542,7 @@
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"電源ボタンと緊急通報のメニュー:\n電源ボタンと音量大ボタンを同時に押してください。"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"着信音のミュート:\n音量メニューでショートカットを利用できます。"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"長押しの長さ"</string>
-    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"電源ボタンを長押しする長さを調節します"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"長さを選択して感度を調整し、電源ボタンを長押しします。"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"短い"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"長い"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ウォレットを表示"</string>
@@ -5768,7 +5768,7 @@
     <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"今すぐ再起動する"</string>
     <string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"後で再起動する"</string>
     <string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"空間オーディオ"</string>
-    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"対応するメディアのより臨場感あふれる音声をお楽しみいただけます"</string>
+    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"対応するメディアを臨場感あふれる音声でお楽しみいただけます"</string>
     <string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"ヘッド トラッキング"</string>
     <string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"より自然なサウンドになるよう頭の動きに合わせて音声が変化します"</string>
     <string name="ingress_rate_limit_title" msgid="2106694002836274350">"ネットワーク ダウンロード速度制限"</string>

diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 90132d3..553f95f 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -3728,7 +3728,7 @@
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"ტელეფონის დინამიკი"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"სადენიანი ყურსასმენი"</string>
     <string name="spatial_audio_text" msgid="8201387855375146000">"თავსებადი მედიის ხმა უფრო იმერსიული ხდება"</string>
-    <string name="spatial_summary_off" msgid="8272678804629774378">"გამორთვა"</string>
+    <string name="spatial_summary_off" msgid="8272678804629774378">"გამორთული"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"ჩართულია / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"ჩართულია / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> და <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
     <string name="spatial_audio_footer_title" msgid="8775010547623606088">"ასევე, შეგიძლიათ, ჩაურთოთ Bluetooth მოწყობილობებს სივრცითი აუდიო."</string>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index df1c04f..ac0aa4d 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -933,7 +933,7 @@
     <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"Телефонды NFC құрылғысына жақындатқанда, дерек алмасуға рұқсат беру"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"NFC желісін қосу"</string>
     <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC арқылы бұл құрылғы басқа маңайдағы құрылғылармен не нысандармен, соның ішінде төлем терминалдарымен, кіру деректерін оқу құралдармен және интеративті жарнамалармен немесе тэгтермен деректер алмасады."</string>
-    <string name="nfc_secure_settings_title" msgid="4906958426927741485">"NFC үшін құрылғы құлпын ашуды сұрау"</string>
+    <string name="nfc_secure_settings_title" msgid="4906958426927741485">"NFC үшін құрылғы құлпын ашуды талап ету"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="407654335737959071">"Экранның құлпы ашылғанда ғана NFC пайдалануға рұқсат беру"</string>
     <string name="android_beam_settings_title" msgid="2797963824490671295">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="6067720758437490896">"Қолданба мазмұнын NFC арқылы жіберуге әзір"</string>
@@ -5666,7 +5666,7 @@
     <string name="do_not_disturb_main_switch_title_on" msgid="6965566556539821313">"Қазір өшіру"</string>
     <string name="do_not_disturb_main_switch_title_off" msgid="7088088515823752545">"Қазір қосу"</string>
     <string name="night_light_main_switch_title" msgid="3428298022467805219">"Түнгі жарықты пайдалану"</string>
-    <string name="nfc_main_switch_title" msgid="6295839988954817432">"NFC-ді пайдалану"</string>
+    <string name="nfc_main_switch_title" msgid="6295839988954817432">"NFC функциясын пайдалану"</string>
     <string name="adaptive_battery_main_switch_title" msgid="3127477920505485813">"Батарея шығынын бейімдеу функциясын пайдалану"</string>
     <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"Жарықтықты бейімдеу функциясын пайдалану"</string>
     <string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"Wi-Fi қоңырауларын пайдалану"</string>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 8aaabc7..861bab5 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -4979,7 +4979,7 @@
     <string name="emergency_gesture_switchbar_title" msgid="7421353963329899514">"Кырсыктаганда чалуу функциясын колдонуу"</string>
     <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> башкарат"</string>
     <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"Төмөндөгү аракеттерди аткарып баштоо үчүн кубат баскычын 5 же андан көп жолу тез басыңыз"</string>
-    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Убакыттын тескери эсебинин сигналын ойнотуу"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Тескери эсептелген убакыт сигналын коюу"</string>
     <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"Кырсыктаганда чалуу функциясы иштетилгенде катуу сигнал чыгат"</string>
     <string name="emergency_gesture_category_call_for_help_title" msgid="1680040129478289510">"Жардам суроо"</string>
     <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Жардам сурап чалуу"</string>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 87466a7..dcf136a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -749,7 +749,7 @@
       <item quantity="one">Мора да содржи барем <xliff:g id="COUNT_1">%d</xliff:g> знак</item>
       <item quantity="other">Мора да содржи барем <xliff:g id="COUNT_1">%d</xliff:g> знаци</item>
     </plurals>
-    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Ако користите само бројки, мора да се долги барем 1 цифра}one{Ако користите само бројки, мора да се долги барем # цифра}other{Ако користите само бројки, мора да се долги барем # цифри}}"</string>
+    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Ако користите само бројки, мора да има барем 1 цифра}one{Ако користите само бројки, мора да има барем # цифра}other{Ако користите само бројки, мора да има барем # цифри}}"</string>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="one">PIN-кодот мора да содржи барем <xliff:g id="COUNT_1">%d</xliff:g> цифра</item>
       <item quantity="other">PIN-кодот мора да содржи барем <xliff:g id="COUNT_1">%d</xliff:g> цифри</item>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index adbc49a..61bac51 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -4204,7 +4204,7 @@
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"എല്ലാ കോളുകളും നിങ്ങൾക്ക് ലഭിക്കും"</string>
     <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു കോൺടാക്റ്റ്}other{# കോൺ‍ടാക്റ്റുകൾ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ആർക്കും വിളിക്കാം"</string>
-    <string name="zen_mode_from_contacts" msgid="2989933306317064818">"കോൺടാക്റ്റുകൾ"</string>
+    <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"നക്ഷത്രചിഹ്നമിട്ടവ"</string>
     <string name="zen_mode_from_some" msgid="3708450042225044524">"ചില ആളുകളോ സംഭാഷണങ്ങളോ"</string>
     <string name="zen_calls_summary_starred_repeat" msgid="8078759939219244001">"നക്ഷത്രമിട്ടിട്ടുള്ള കോൺടാക്‌റ്റുകളിൽ നിന്നും ആവർത്തിച്ച് വിളിക്കുന്നവരിൽ നിന്നും"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 88ae5b6..5a6cbdf 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -4943,7 +4943,7 @@
     <string name="left_edge" msgid="1513576842959071849">"Bahagian tepi sebelah kiri"</string>
     <string name="right_edge" msgid="1505309103265829121">"Bahagian tepi sebelah kanan"</string>
     <string name="back_sensitivity_dialog_message" msgid="6638367716784103306">"Kepekaan yang lebih tinggi mungkin mempengaruhi fungsi gerak isyarat apl di tepi skrin."</string>
-    <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"Kepekaan Belakang"</string>
+    <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"Kepekaan Navigasi Kembali"</string>
     <string name="gesture_settings_activity_title" msgid="2025828425762595733">"Kepekaan Navigasi Gerak Isyarat"</string>
     <string name="button_navigation_settings_activity_title" msgid="7335636045504461813">"Navigasi butang"</string>
     <string name="keywords_gesture_navigation_settings" msgid="667561222717238931">"navigasi gerak isyarat, kepekaan ke belakang, gerak isyarat ke belakang"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 34faa30..2c4a5e0 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -747,7 +747,7 @@
       <item quantity="other">အနည်းဆုံး အက္ခရာ <xliff:g id="COUNT_1">%d</xliff:g> လုံး ပါရမည်</item>
       <item quantity="one">အနည်းဆုံး အက္ခရာ <xliff:g id="COUNT_0">%d</xliff:g> လုံး ပါရမည်</item>
     </plurals>
-    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{နံပါတ်များသီးသန့်သုံးပါက အနည်းဆုံး ဂဏန်း 1 လုံးရှိရမည်}other{နံပါတ်များသီးသန့်သုံးပါက အနည်းဆုံး ဂဏန်း # လုံးရှိရမည်}}"</string>
+    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{နံပါတ်ကိုသာ သုံးပါက အနည်းဆုံး ဂဏန်း ၁ လုံးရှိရမည်}other{နံပါတ်ကိုသာ သုံးပါက အနည်းဆုံး ဂဏန်း # လုံးရှိရမည်}}"</string>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="other">ပင်နံပါတ်တွင် အနည်းဆုံး ဂဏန်း <xliff:g id="COUNT_1">%d</xliff:g> လုံး ပါရမည်</item>
       <item quantity="one">ပင်နံပါတ်တွင် အနည်းဆုံး ဂဏန်း <xliff:g id="COUNT_0">%d</xliff:g> လုံး ပါရမည်</item>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index cebe609..fa14f92 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -3731,7 +3731,7 @@
     <string name="spatial_summary_off" msgid="8272678804629774378">"अफ छ"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"अन छ / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"अन छ / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> र <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"तपाईं ब्लुटुथ डिभाइसहरूका लागि स्पाटियल अडियो अन गर्न पनि सक्नुहुन्छ।"</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"तपाईं ब्लुटुथ डिभाइसहरूका लागि स्पेशियल अडियो अन गर्न पनि सक्नुहुन्छ।"</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"कनेक्ट गरिएका डिभाइसका सेटिङ"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{कुनै पनि समयतालिका बनाइएको छैन}=1{एउटा समयतालिका बनाइएको छ}other{# वटा समयतालिका बनाइएको छ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"बाधा नपुऱ्याउनुहोस्"</string>
@@ -4980,7 +4980,7 @@
     <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले व्यवस्थापन गरेको"</string>
     <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"तल दिइएका कारबाहीहरू सुरु गर्न पावर बटन फटाफट ५ वा सोभन्दा बढी पटक थिच्नुहोस्"</string>
     <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"काउन्टडाउन अलार्म बजाइयोस्"</string>
-    <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"आपत्कालीन सेवा प्रदान गर्ने निकायमा कल गर्दै गर्दा ठुलो आवाजमा कुनै ध्वनि बजाइयोस्"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"आपत्कालीन सेवा प्रदान गर्ने निकायमा कल गर्दै गर्दा ठुलो आवाजमा कुनै साउन्ड बजाइयोस्"</string>
     <string name="emergency_gesture_category_call_for_help_title" msgid="1680040129478289510">"मद्दत प्राप्त गर्न सूचित गर्नुहोस्"</string>
     <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"मद्दत प्राप्त गर्न कल गरियोस्"</string>
     <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"आपत्‌कालीन अवस्थामा मद्दत प्राप्त गर्न कल गर्नु पर्ने नम्बर"</string>

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 5eff7e0..5507cb3 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml

@@ -3727,11 +3727,11 @@
     <string name="live_caption_summary" msgid="2898451867595161809">"ସ୍ବଚାଳିତ କ୍ୟାପ୍ସନ୍ ମିଡିଆ"</string>
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"ଫୋନ ସ୍ପିକର"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"ତାରଯୁକ୍ତ ହେଡଫୋନଗୁଡ଼ିକ"</string>
-    <string name="spatial_audio_text" msgid="8201387855375146000">"କମ୍ପାଟିବଲ ମିଡିଆରୁ ଆସିଥିବା ଅଡିଓ ଅଧିକ ଇମରସିଭ ହୋଇଥାଏ"</string>
+    <string name="spatial_audio_text" msgid="8201387855375146000">"କମ୍ପାଟିବଲ ମିଡିଆରୁ ଆସିଥିବା ଅଡିଓ ଅଧିକ ଇମର୍ସିଭ ହୋଇଥାଏ"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"ବନ୍ଦ ଅଛି"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"ଚାଲୁ ଅଛି / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"ଚାଲୁ ଅଛି / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> ଏବଂ <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"ଆପଣ ମଧ୍ୟ ବ୍ଲୁଟୁଥ ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ସ୍ପାସିଅଲ ଅଡିଓକୁ ଚାଲୁ କରିପାରିବେ।"</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"ଆପଣ ବ୍ଲୁଟୁଥ ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ମଧ୍ୟ ସ୍ପେସିଆଲ ଅଡିଓକୁ ଚାଲୁ କରିପାରିବେ।"</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସଗୁଡ଼ିକର ସେଟିଂସ"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}other{#ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string>
@@ -5768,7 +5768,7 @@
     <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ବର୍ତ୍ତମାନ ରିବୁଟ କରନ୍ତୁ"</string>
     <string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"ପରେ ରିବୁଟ କରନ୍ତୁ"</string>
     <string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"ସ୍ପେସିଆଲ ଅଡିଓ"</string>
-    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"କମ୍ପାଟିବଲ ମିଡିଆରୁ ଆସିଥିବା ଅଡିଓ ଅଧିକ ଇମରସିଭ ହୋଇଥାଏ"</string>
+    <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"କମ୍ପାଟିବଲ ମିଡିଆରୁ ଆସିଥିବା ଅଡିଓ ଅଧିକ ଇମର୍ସିଭ ହୋଇଥାଏ"</string>
     <string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"ହେଡ ଟ୍ରାକିଂ"</string>
     <string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"ସାଉଣ୍ଡକୁ ଅଧିକ ସ୍ୱାଭାବିକ କରିବା ପାଇଁ ଆପଣ ଆପଣଙ୍କ ମୁଣ୍ଡକୁ ମୁଭ କରିବା ସମୟରେ ଅଡିଓ ପରିବର୍ତ୍ତନ ହୁଏ"</string>
     <string name="ingress_rate_limit_title" msgid="2106694002836274350">"ନେଟୱାର୍କ ଡାଉନଲୋଡ ରେଟ ସୀମା"</string>

diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 48f001a..55a86d1 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml

@@ -372,7 +372,7 @@
   </string-array>
   <string-array name="long_press_timeout_selector_list_titles">
     <item msgid="8908021508913038488">"ਘੱਟ ਸਮੇਂ ਲਈ"</item>
-    <item msgid="7397961711906421599">"ਔਸਤ"</item>
+    <item msgid="7397961711906421599">"ਦਰਮਿਆਨੇ ਸਮੇਂ ਲਈ"</item>
     <item msgid="4079132024502041928">"ਲੰਬੇ ਸਮੇਂ ਲਈ"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 34e2a80..bdc1993 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml

@@ -4853,7 +4853,7 @@
     <string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"corte de tela, entalhe"</string>
     <string name="overlay_option_device_default" msgid="7986355499809313848">"Padrão do dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Falha ao aplicar sobreposição"</string>
-    <string name="special_access" msgid="1767980727423395147">"Acesso especial a apps"</string>
+    <string name="special_access" msgid="1767980727423395147">"Acesso especial para apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados ilimitados</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados ilimitados</item>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8f5a716..317d1ee 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -5219,7 +5219,7 @@
     <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Permitir  controlar o Wi-Fi"</string>
     <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Permitir a esta aplicação ativar ou desativar o Wi-Fi, procurar e estabelecer ligação a redes Wi-Fi, adicionar ou remover redes, assim como iniciar uma zona Wi-Fi apenas local."</string>
     <string name="media_output_title" msgid="8283629315159510680">"Reproduzir multimédia:"</string>
-    <string name="media_output_label_title" msgid="4139048973886819148">"Reproduzir <xliff:g id="LABEL">%s</xliff:g> em"</string>
+    <string name="media_output_label_title" msgid="4139048973886819148">"Abrir <xliff:g id="LABEL">%s</xliff:g> em"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"Este dispositivo"</string>
     <string name="media_output_summary" product="default" msgid="4760338801715262899">"Telemóvel"</string>
     <string name="media_output_summary" product="tablet" msgid="5138101426462250247">"Tablet"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 34e2a80..bdc1993 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -4853,7 +4853,7 @@
     <string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"corte de tela, entalhe"</string>
     <string name="overlay_option_device_default" msgid="7986355499809313848">"Padrão do dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Falha ao aplicar sobreposição"</string>
-    <string name="special_access" msgid="1767980727423395147">"Acesso especial a apps"</string>
+    <string name="special_access" msgid="1767980727423395147">"Acesso especial para apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados ilimitados</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados ilimitados</item>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ad8fa88..8b484a0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -757,7 +757,7 @@
       <item quantity="many">Пароль должен состоять не менее чем из <xliff:g id="COUNT_1">%d</xliff:g> символов.</item>
       <item quantity="other">Пароль должен состоять не менее чем из <xliff:g id="COUNT_1">%d</xliff:g> символа.</item>
     </plurals>
-    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Если пароль состоит целиком из чисел, его длина должна быть не менее 1 символа.}one{Если пароль состоит целиком из чисел, его длина должна быть не менее # символа.}few{Если пароль состоит целиком из чисел, его длина должна быть не менее # символов.}many{Если пароль состоит целиком из чисел, его длина должна быть не менее # символов.}other{Если пароль состоит целиком из чисел, его длина должна быть не менее # символа.}}"</string>
+    <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Если пароль состоит целиком из цифр, его длина должна быть не менее 1 символа.}one{Если пароль состоит целиком из цифр, его длина должна быть не менее # символа.}few{Если пароль состоит целиком из цифр, его длина должна быть не менее # символов.}many{Если пароль состоит целиком из цифр, его длина должна быть не менее # символов.}other{Если пароль состоит целиком из цифр, его длина должна быть не менее # символа.}}"</string>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="one">PIN-код должен состоять не менее чем из <xliff:g id="COUNT_1">%d</xliff:g> цифры.</item>
       <item quantity="few">PIN-код должен состоять не менее чем из <xliff:g id="COUNT_1">%d</xliff:g> цифр.</item>
@@ -1472,7 +1472,7 @@
     <string name="wallpaper_dashboard_summary" msgid="2324472863981057118">"Главный экран, заблокированный экран"</string>
     <string name="wallpaper_settings_summary_default" msgid="7569803705735001813">"По умолчанию"</string>
     <string name="wallpaper_settings_summary_custom" msgid="3174561317688848729">"Пользовательские"</string>
-    <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Сменить обои"</string>
+    <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Обои"</string>
     <string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Выберите обои для экрана"</string>
     <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"Установка обоев"</string>
     <string name="style_suggestion_title" msgid="1213747484782364775">"Настройка телефона"</string>
@@ -2385,7 +2385,7 @@
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Увеличение с помощью кнопки и по тройному нажатию"</string>
     <string name="accessibility_introduction_title" msgid="8834950581512452348">"О функции \"<xliff:g id="SERVICE">%1$s</xliff:g>\""</string>
     <string name="accessibility_text_reading_options_title" msgid="3224648909213325563">"Масштаб экрана и текст"</string>
-    <string name="accessibility_text_reading_options_suggestion_title" msgid="2492155642665312733">"Настройки отображения текста"</string>
+    <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>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c4a70e0..d665c7e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -3819,7 +3819,7 @@
     <string name="spatial_summary_off" msgid="8272678804629774378">"Vypnuté"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"Zapnuté / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"Zapnuté / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> a <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"Pre zariadenia s rozhraním Bluetooth môžete zapnúť aj priestorový zvuk."</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"Priestorový zvuk  môžete zapnúť aj pre zariadenia s rozhraním Bluetooth."</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"Nastavenia pripojených zariadení"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Žiadne}=1{Bol nastavený 1 plán}few{Boli nastavené # plány}many{# schedules set}other{Bolo nastavených # plánov}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Režim bez vyrušení"</string>
@@ -5389,7 +5389,7 @@
     <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Povoliť aplikácii ovládať Wi-Fi"</string>
     <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Toto povolenie umožňuje tejto aplikácii zapínať a vypínať Wi-Fi, hľadať siete Wi-Fi a pripájať sa k nim, pridávať a odstraňovať siete alebo vytvárať miestny hotspot"</string>
     <string name="media_output_title" msgid="8283629315159510680">"Prehrať média v zariadení"</string>
-    <string name="media_output_label_title" msgid="4139048973886819148">"Prehrať <xliff:g id="LABEL">%s</xliff:g> cez"</string>
+    <string name="media_output_label_title" msgid="4139048973886819148">"Pustiť <xliff:g id="LABEL">%s</xliff:g> cez"</string>
     <string name="media_output_default_summary" msgid="4200343059396412376">"Toto zariadenie"</string>
     <string name="media_output_summary" product="default" msgid="4760338801715262899">"Telefón"</string>
     <string name="media_output_summary" product="tablet" msgid="5138101426462250247">"Tablet"</string>

diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 920d62a..5fbac80 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml

@@ -210,7 +210,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3444648373391629840">"Hapësira ruajtëse e USB-së e lidhur është vetëm për lexim."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4338796260718910164">"Karta SD e lidhur vetëm për lexim."</string>
     <string name="skip_label" msgid="6380034601349015895">"Kapërce"</string>
-    <string name="next_label" msgid="1248293387735652187">"Përpara"</string>
+    <string name="next_label" msgid="1248293387735652187">"Para"</string>
     <string name="language_picker_title" msgid="4271307478263345133">"Gjuhët"</string>
     <string name="locale_remove_menu" msgid="3521546263421387474">"Hiqe"</string>
     <string name="add_a_language" msgid="2126220398077503271">"Shto gjuhë"</string>
@@ -585,7 +585,7 @@
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="5479647886550695766">"U arrit kufiri kohor për regjistrimin e gjurmës së gishtit. Provo përsëri."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"Regjistrimi i gjurmës së gishtit nuk funksionoi. Provo përsëri ose përdor një gisht tjetër."</string>
     <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Shto një tjetër"</string>
-    <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Përpara"</string>
+    <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Para"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Përveç shkyçjes së telefonit, gjurmën e gishtit mund ta përdorësh edhe për të autorizuar blerjet dhe qasjen në aplikacione. "<annotation id="url">"Mëso më shumë"</annotation></string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"Opsioni i kyçjes së ekranit është çaktivizuar. Për të mësuar më shumë, kontakto me administratorin e organizatës sate."</string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"Mund të vazhdosh ta përdorësh gjurmën tënde të gishtit për të autorizuar blerjet dhe qasjen në aplikacione."</string>
@@ -801,7 +801,7 @@
     <string name="lockpassword_clear_label" msgid="311359833434539894">"Pastro"</string>
     <string name="lockpassword_credential_changed" msgid="5934778179732392028">"Kyçja e ekranit është ndryshuar tashmë. Provo përsëri me kyçjen e re të ekranit."</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="775215267818384016">"Anulo"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="1329049481210689408">"Përpara"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="1329049481210689408">"Para"</string>
     <string name="lock_setup" msgid="4622999020926280737">"Konfigurimi përfundoi."</string>
     <string name="manage_device_admin" msgid="1044620606203916275">"Apl. e admin. të pajisjes"</string>
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Asnjë aplikacion aktiv"</string>
@@ -3515,7 +3515,7 @@
     <string name="restriction_location_enable_title" msgid="4872281754836538066">"Vendndodhja"</string>
     <string name="restriction_location_enable_summary" msgid="7139292323897390221">"Lejo aplikacionet të përdorin informacionin e vendndodhjes tënde"</string>
     <string name="wizard_back" msgid="8257697435061870191">"Prapa"</string>
-    <string name="wizard_next" msgid="3884832431439072471">"Përpara"</string>
+    <string name="wizard_next" msgid="3884832431439072471">"Para"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Përfundo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kartat SIM"</string>
@@ -3573,7 +3573,7 @@
     <string name="connected_devices_dashboard_summary" msgid="6927727617078296491">"Bluetooth, modaliteti \"me makinë\", NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="8424794257586524040">"Bluetooth, modaliteti \"me makinë\""</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="7155882619333726331">"Bluetooth, NFC"</string>
-    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="1175254057213044560">"Bluetooth"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="1175254057213044560">"Bluetooth-i"</string>
     <string name="connected_devices_dashboard_android_auto_summary" msgid="8179090809275818804">"Bluetooth, Android Auto, modaliteti \"me makinë\", NFC"</string>
     <string name="connected_devices_dashboard_android_auto_no_nfc_summary" msgid="2532811870469405527">"Bluetooth, Android Auto, modaliteti \"me makinë\""</string>
     <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"Bluetooth, Android Auto, NFC"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d16ed6c..fbade23 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -5787,7 +5787,7 @@
     <string name="perm_toggle_description" msgid="5754629581767319022">"За апликације и услуге"</string>
     <string name="mic_toggle_description" msgid="484139688645092237">"За апликације и услуге. Ако је ово подешавање искључено, подаци микрофона могу и даље да се деле када позовете број за хитне случајеве."</string>
     <string name="previous_page_content_description" msgid="6438292457923282991">"Претходна"</string>
-    <string name="next_page_content_description" msgid="1641835099813416294">"Следећа"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Даље"</string>
     <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Преглед боје"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Захтев за приступ SIM картици"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Уређај жели да приступа SIM картици. Додирните за детаље."</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6a08553..4392c1d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -587,7 +587,7 @@
     <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Lägg till ännu ett"</string>
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Nästa"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Förutom att låsa upp mobilen kan du använda fingeravtrycket för att godkänna köp och åtkomst för appar. "<annotation id="url">"Läs mer"</annotation></string>
-    <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"Skärmlåsalternativet är inaktiverat. Om du vill ha mer information kontaktar du din organisations administratör."</string>
+    <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"Skärmlåsalternativet är inaktiverat. Kontakta din organisations administratör för mer information."</string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"Du kan fortfarande använda fingeravtryck för att auktorisera köp och appåtkomster."</string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lyft fingret och tryck sedan på sensorn igen"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"Det går inte att använda fingeravtryckssensorn. Besök ett reparationsställe"</string>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3aa42ac..a421e1c 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -3731,7 +3731,7 @@
     <string name="spatial_summary_off" msgid="8272678804629774378">"ஆஃப்"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"ஆன் / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"ஆன் / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> மற்றும் <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"புளூடூத் சாதனங்களுக்கு, சுற்றிலும் கேட்கும் ஆடியோவையும் நீங்கள் இயக்கலாம்."</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"புளூடூத் சாதனங்களுக்கும் சுற்றிலும் கேட்கும் ஆடியோவை நீங்கள் இயக்கலாம்."</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"இணைக்கப்பட்டுள்ள சாதனங்களின் அமைப்புகள்"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{எதுவுமில்லை}=1{1 திட்டமிடல் அமைக்கப்பட்டுள்ளது}other{# திட்டமிடல்கள் அமைக்கப்பட்டுள்ளன}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"தொந்தரவு செய்யாதே"</string>
@@ -5572,7 +5572,7 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"அமைப்புகளில் திரை மேலடுக்கை அனுமதித்தல்"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"அமைப்புகள் திரைகளுக்கு மேலாகக் காட்டுவதற்கு மற்ற ஆப்ஸில் டிஸ்ப்ளே செய்யப்படக்கூடிய ஆப்ஸை அனுமதிக்கும்"</string>
     <string name="allow_mock_modem" msgid="3832264806530479214">"மாதிரி மோடத்தை அனுமதித்தல்"</string>
-    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"கருவியியல் பரிசோதனைக்காக மாதிரி மோடம் சேவையை இயக்க இந்தச் சாதனத்தை அனுமதிக்கவும். மொபைலைச் சாதாரணமாகப் பயன்படுத்தும்போது இதை இயக்க வேண்டாம்"</string>
+    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"கருவியியல் பரிசோதனைக்காக மாதிரி மோடம் சேவையை இயக்க இந்தச் சாதனத்தை அனுமதிக்கும். மொபைலைச் சாதாரணமாகப் பயன்படுத்தும்போது இதை இயக்க வேண்டாம்"</string>
     <string name="media_controls_title" msgid="403271085636252597">"மீடியா"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"மீடியா பிளேயரைப் பின் செய்தல்"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"வீடியோவின் இயக்கத்தை விரைவாகத் தொடங்க, விரைவு அமைப்புகளில் மீடியா பிளேயரைத் திறந்து வைத்திருக்கும்"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 7059332..7822383 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -636,7 +636,7 @@
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
     <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"หากคุณลืมการล็อกหน้าจอ ผู้ดูแลระบบไอทีจะรีเซ็ตให้คุณไม่ได้"</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"โปรดตั้งค่าการล็อกสำหรับแอปงานแยกต่างหาก"</string>
+    <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"ตั้งค่าล็อกงานแยกต่างหาก"</string>
     <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"หากคุณจำการล็อกนี้ไม่ได้ โปรดขอให้ผู้ดูแลระบบไอทีรีเซ็ตการล็อก"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ตัวเลือกการล็อกหน้าจอ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ตัวเลือกการล็อกหน้าจอ"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0db67f1..a0d3221 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -3731,7 +3731,7 @@
     <string name="spatial_summary_off" msgid="8272678804629774378">"Kapalı"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"Açık/<xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"Açık/<xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> ve <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"Bluetooth cihazlar için üç boyutlu sesi de açabilirsiniz."</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"Bluetooth cihazlar için de üç boyutlu sesi açabilirsiniz."</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"Bağlı cihaz ayarları"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Yok}=1{1 program ayarlandı}other{# program ayarlandı}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Rahatsız Etmeyin"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8de222c..8bce70e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -632,7 +632,7 @@
     <string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="1040265358906410746"></string>
     <string name="lock_settings_picker_title" msgid="9219376327364915334">"Блокування екрана"</string>
     <string name="lock_settings_picker_new_lock_title" msgid="3113042086804290919">"Виберіть спосіб розблокування екрана"</string>
-    <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Виберіть новий спосіб розблокування екрана"</string>
+    <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Виберіть спосіб блокування екрана"</string>
     <string name="lock_settings_picker_new_profile_lock_title" msgid="2270462215256413800">"Виберіть спосіб розблокування робочих додатків"</string>
     <string name="lock_settings_picker_update_profile_lock_title" msgid="5929068163516308927">"Виберіть новий робочий спосіб розблокування"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="1276283007274778191">"Захистіть свій планшет"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3c02c29..7455cfa 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -225,7 +225,7 @@
     <string name="preference_of_system_locale_summary" msgid="5612241394431188535">"Theo chế độ mặc định của hệ thống"</string>
     <string name="desc_no_available_supported_locale" msgid="7883271726226947273">"Bạn chưa thể chọn ngôn ngữ cho ứng dụng này trong phần Cài đặt."</string>
     <string name="desc_app_locale_disclaimer" msgid="5295933110644789052">"Ngôn ngữ có thể khác với ngôn ngữ có sẵn trong ứng dụng. Một số ứng dụng có thể không hỗ trợ cài đặt này."</string>
-    <string name="desc_app_locale_selection_supported" msgid="6149467826636295127">"Chỉ những ứng dụng hỗ trợ lựa chọn ngôn ngữ mới được hiển thị."</string>
+    <string name="desc_app_locale_selection_supported" msgid="6149467826636295127">"Chỉ những ứng dụng cho phép lựa chọn ngôn ngữ mới xuất hiện ở đây."</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
       <item quantity="other">Xóa các ngôn ngữ đã chọn?</item>
       <item quantity="one">Xóa ngôn ngữ đã chọn?</item>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0adac8f..ec7a50c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -3727,11 +3727,11 @@
     <string name="live_caption_summary" msgid="2898451867595161809">"自动生成媒体字幕"</string>
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"手机扬声器"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"有线头戴式耳机"</string>
-    <string name="spatial_audio_text" msgid="8201387855375146000">"播放兼容的媒体时，音频更具沉浸感"</string>
+    <string name="spatial_audio_text" msgid="8201387855375146000">"播放兼容的媒体内容时，音频更具沉浸感"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"关闭"</string>
     <string name="spatial_summary_on_one" msgid="6239933399496282994">"开启/<xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"开启/<xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g>和<xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"您还可以针对蓝牙设备开启空间音频功能。"</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"您还可以为蓝牙设备开启空间音频功能。"</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"已连接设备的设置"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{无}=1{已设置 1 个时间表}other{已设置 # 个时间表}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"勿扰模式"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ff80b0c..8f7c1c2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -1152,11 +1152,11 @@
     <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
     <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (tablet) [CHAR LIMIT=NONE] -->
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet">Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet">Fingerprint Unlock improves the more you use it to unlock your tablet or verify it\u2019s you in apps</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (device) [CHAR LIMIT=NONE] -->
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device">Now you can use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device">Fingerprint Unlock improves the more you use it to unlock your device or verify it\u2019s you in apps</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (default) [CHAR LIMIT=NONE] -->
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default">Now you can use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default">Fingerprint Unlock improves the more you use it to unlock your phone or verify it\u2019s you in apps</string>
     <!-- Button text to skip enrollment of fingerprint [CHAR LIMIT=40] -->
     <string name="security_settings_fingerprint_enroll_enrolling_skip">Do it later</string>
     <!-- Accessibility message for fingerprint enrollment asking the user to place the tip of their finger on the fingerprint sensor [CHAR LIMIT=NONE] -->

diff --git a/res/xml/location_services.xml b/res/xml/location_services.xml
index 04eff23..917ef1d 100644
--- a/res/xml/location_services.xml
+++ b/res/xml/location_services.xml

@@ -16,21 +16,20 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:title="@string/location_services_preference_title">
-
-        <PreferenceCategory
-            android:key="location_services"
-            android:layout="@layout/preference_category_no_label"
-            settings:controller="com.android.settings.location.LocationInjectedServicesPreferenceController"/>
+                  android:key="location_services"
+                  android:title="@string/location_services_preference_title"
+                  settings:controller="com.android.settings.location.LocationInjectedServicesPreferenceController">
 
         <com.android.settingslib.RestrictedPreference
             android:fragment="com.android.settings.location.WifiScanningFragment"
+            android:order="1000"
             android:key="location_services_wifi_scanning"
             android:title="@string/location_scanning_wifi_always_scanning_title"
             settings:controller="com.android.settings.location.LocationServicesWifiScanningPreferenceController"/>
 
         <com.android.settingslib.RestrictedPreference
             android:fragment="com.android.settings.location.BluetoothScanningFragment"
+            android:order="1001"
             android:key="location_services_bluetooth_scanning"
             android:title="@string/location_scanning_bluetooth_always_scanning_title"
             settings:controller="com.android.settings.location.LocationServicesBluetoothScanningPreferenceController"/>

diff --git a/res/xml/location_services_workprofile.xml b/res/xml/location_services_workprofile.xml
index 6db2083..a130838 100644
--- a/res/xml/location_services_workprofile.xml
+++ b/res/xml/location_services_workprofile.xml

@@ -16,12 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:title="@string/location_services_screen_title">
-
-        <PreferenceCategory
-            android:title="@string/managed_profile_location_services"
-            android:layout="@layout/preference_category_no_label"
-            android:key="location_services_managed_profile"
-            settings:controller="com.android.settings.location.LocationInjectedServicesForWorkPreferenceController"/>
-
+                  android:title="@string/location_services_screen_title"
+                  android:key="location_services_managed_profile"
+                  settings:controller="com.android.settings.location.LocationInjectedServicesForWorkPreferenceController">
 </PreferenceScreen>

diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index 60faab9..7003eed 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java

@@ -180,10 +180,11 @@
                                 | AuthenticatorException e) {
                             // handled below
                             Log.w(TAG, "Remove account error: " + e);
-                            RemoveAccountFailureDialog.show(getTargetFragment());
                         }
                         Log.i(TAG, "failed: " + failed);
-                        if (!failed) {
+                        if (failed) {
+                            RemoveAccountFailureDialog.show(getTargetFragment());
+                        } else {
                             targetActivity.finish();
                         }
                     }, null, mUserHandle);

diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index a9ac286..c118a43 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java

@@ -22,6 +22,7 @@
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.DeviceConfig;
@@ -49,7 +50,6 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
-import java.util.IllegalFormatException;
 import java.util.List;
 
 public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment {
@@ -136,7 +136,6 @@
         use(BlockingSlicePrefController.class).setSliceUri(sliceEnabled
                 ? featureProvider.getBluetoothDeviceSettingsUri(mCachedDevice.getDevice())
                 : null);
-        updateExtraControlUri(/* viewWidth */ 0);
     }
 
     private void updateExtraControlUri(int viewWidth) {
@@ -148,13 +147,14 @@
         String uri = featureProvider.getBluetoothDeviceControlUri(mCachedDevice.getDevice());
         if (!TextUtils.isEmpty(uri)) {
             try {
-                controlUri = Uri.parse(String.format(uri, viewWidth));
-            } catch (IllegalFormatException | NullPointerException exception) {
+                controlUri = Uri.parse(uri + viewWidth);
+            } catch (NullPointerException exception) {
                 Log.d(TAG, "unable to parse uri");
                 controlUri = null;
             }
         }
         use(SlicePreferenceController.class).setSliceUri(sliceEnabled ? controlUri : null);
+        use(SlicePreferenceController.class).onStart();
     }
 
     private final ViewTreeObserver.OnGlobalLayoutListener mOnGlobalLayoutListener =
@@ -165,7 +165,10 @@
                     if (view == null) {
                         return;
                     }
-                    updateExtraControlUri(view.getWidth());
+                    if (view.getWidth() <= 0) {
+                        return;
+                    }
+                    updateExtraControlUri(view.getWidth() - getPaddingSize());
                     view.getViewTreeObserver().removeOnGlobalLayoutListener(
                             mOnGlobalLayoutListener);
                 }
@@ -251,4 +254,17 @@
         }
         return controllers;
     }
+
+    private int getPaddingSize() {
+        TypedArray resolvedAttributes =
+                getContext().obtainStyledAttributes(
+                        new int[]{
+                                android.R.attr.listPreferredItemPaddingStart,
+                                android.R.attr.listPreferredItemPaddingEnd
+                        });
+        int width = resolvedAttributes.getDimensionPixelSize(0, 0)
+                + resolvedAttributes.getDimensionPixelSize(1, 0);
+        resolvedAttributes.recycle();
+        return width;
+    }
 }

diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index 30b971c..9be2177 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java

@@ -99,6 +99,8 @@
 
     private ViewGroup mContentView;
 
+    private ViewPager2 mViewPager;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
@@ -111,12 +113,21 @@
         final int selectedTab = getTabId(activity, getArguments());
 
         final View tabContainer = mContentView.findViewById(R.id.tab_container);
-        final ViewPager2 viewPager = tabContainer.findViewById(R.id.view_pager);
-        viewPager.setAdapter(new ProfileSelectFragment.ViewPagerAdapter(this));
+        mViewPager = tabContainer.findViewById(R.id.view_pager);
+        mViewPager.setAdapter(new ProfileSelectFragment.ViewPagerAdapter(this));
         final TabLayout tabs = tabContainer.findViewById(R.id.tabs);
-        new TabLayoutMediator(tabs, viewPager,
+        new TabLayoutMediator(tabs, mViewPager,
                 (tab, position) -> tab.setText(getPageTitle(position))
         ).attach();
+        mViewPager.registerOnPageChangeCallback(
+                new ViewPager2.OnPageChangeCallback() {
+                    @Override
+                    public void onPageSelected(int position) {
+                        super.onPageSelected(position);
+                        updateHeight(position);
+                    }
+                }
+        );
         tabContainer.setVisibility(View.VISIBLE);
         final TabLayout.Tab tab = tabs.getTabAt(selectedTab);
         tab.select();
@@ -133,6 +144,36 @@
         return mContentView;
     }
 
+    protected boolean forceUpdateHeight() {
+        return false;
+    }
+
+    private void updateHeight(int position) {
+        if (!forceUpdateHeight()) {
+            return;
+        }
+        ViewPagerAdapter adapter = (ViewPagerAdapter) mViewPager.getAdapter();
+        if (adapter == null || adapter.getItemCount() <= position) {
+            return;
+        }
+
+        Fragment fragment = adapter.createFragment(position);
+        View newPage = fragment.getView();
+        if (newPage != null) {
+            int viewWidth = View.MeasureSpec.makeMeasureSpec(newPage.getWidth(),
+                    View.MeasureSpec.EXACTLY);
+            int viewHeight = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+            newPage.measure(viewWidth, viewHeight);
+            int currentHeight = mViewPager.getLayoutParams().height;
+            int newHeight = newPage.getMeasuredHeight();
+            if (newHeight != 0 && currentHeight != newHeight) {
+                ViewGroup.LayoutParams layoutParams = mViewPager.getLayoutParams();
+                layoutParams.height = newHeight;
+                mViewPager.setLayoutParams(layoutParams);
+            }
+        }
+    }
+
     @Override
     public int getMetricsCategory() {
         return METRICS_CATEGORY_UNKNOWN;

diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
index 5f25f59..111e4ce 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java

@@ -50,4 +50,9 @@
     protected int getPreferenceScreenResId() {
         return R.xml.location_services_header;
     }
+
+    @Override
+    protected boolean forceUpdateHeight() {
+        return true;
+    }
 }

diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index 171f426..2d549fc 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java

@@ -141,6 +141,7 @@
         mContentResolver.registerContentObserver(BRIGHTNESS_ADJ_URI, false, mBrightnessObserver);
         mDisplayManager.registerDisplayListener(mDisplayListener, mHandler,
                 DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS);
+        updatedSummary(mPreference);
     }
 
     @Override

diff --git a/src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java b/src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java
index b7e6cf2..a8a13b3 100644
--- a/src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java
+++ b/src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java

@@ -20,7 +20,6 @@
 import android.os.UserHandle;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.widget.RestrictedAppPreference;
@@ -41,8 +40,6 @@
 
     @Override
     protected void injectLocationServices(PreferenceScreen screen) {
-        final PreferenceCategory categoryLocationServices =
-                screen.findPreference(getPreferenceKey());
         final Map<Integer, List<Preference>> prefs = getLocationServices();
         for (Map.Entry<Integer, List<Preference>> entry : prefs.entrySet()) {
             for (Preference pref : entry.getValue()) {
@@ -51,7 +48,7 @@
                 }
             }
             if (entry.getKey() != UserHandle.myUserId()) {
-                LocationSettings.addPreferencesSorted(entry.getValue(), categoryLocationServices);
+                LocationSettings.addPreferencesSorted(entry.getValue(), screen);
             }
         }
     }

diff --git a/src/com/android/settings/location/LocationInjectedServicesPreferenceController.java b/src/com/android/settings/location/LocationInjectedServicesPreferenceController.java
index d623bae..356716d 100644
--- a/src/com/android/settings/location/LocationInjectedServicesPreferenceController.java
+++ b/src/com/android/settings/location/LocationInjectedServicesPreferenceController.java

@@ -19,7 +19,6 @@
 import android.os.UserHandle;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.widget.RestrictedAppPreference;
@@ -41,8 +40,6 @@
 
     @Override
     protected void injectLocationServices(PreferenceScreen screen) {
-        final PreferenceCategory categoryLocationServices =
-                screen.findPreference(getPreferenceKey());
         final Map<Integer, List<Preference>> prefs = getLocationServices();
         for (Map.Entry<Integer, List<Preference>> entry : prefs.entrySet()) {
             for (Preference pref : entry.getValue()) {
@@ -51,10 +48,7 @@
                 }
             }
             if (entry.getKey() == UserHandle.myUserId()) {
-                if (categoryLocationServices != null) {
-                    LocationSettings.addPreferencesSorted(entry.getValue(),
-                            categoryLocationServices);
-                }
+                LocationSettings.addPreferencesSorted(entry.getValue(), screen);
             }
         }
     }

diff --git a/src/com/android/settings/location/LocationServices.java b/src/com/android/settings/location/LocationServices.java
index aceb9d5..52e958c 100644
--- a/src/com/android/settings/location/LocationServices.java
+++ b/src/com/android/settings/location/LocationServices.java

@@ -22,12 +22,8 @@
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A page that configures the Location Services settings including Wi-Fi scanning, Bluetooth
  * scanning, and injected location services.
@@ -52,34 +48,15 @@
     }
 
     @Override
-    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context);
-    }
-
-    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
 
         use(LocationInjectedServicesPreferenceController.class).init(this);
     }
 
-    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new WifiScanningPreferenceController(context));
-        controllers.add(new BluetoothScanningPreferenceController(context));
-        return controllers;
-    }
-
     /**
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_services) {
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(Context
-                        context) {
-                    return buildPreferenceControllers(context);
-                }
-            };
+            new BaseSearchIndexProvider(R.xml.location_services);
 }

diff --git a/src/com/android/settings/location/LocationServicesForWork.java b/src/com/android/settings/location/LocationServicesForWork.java
index 4b3124e..390be10 100644
--- a/src/com/android/settings/location/LocationServicesForWork.java
+++ b/src/com/android/settings/location/LocationServicesForWork.java

@@ -22,12 +22,8 @@
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A page that configures the Location Services settings for work profile.
  */
@@ -51,31 +47,14 @@
     }
 
     @Override
-    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context);
-    }
-
-    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         use(LocationInjectedServicesForWorkPreferenceController.class).init(this);
     }
 
-    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        return controllers;
-    }
-
     /**
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_services_workprofile) {
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(Context
-                        context) {
-                    return buildPreferenceControllers(context);
-                }
-            };
+            new BaseSearchIndexProvider(R.xml.location_services_workprofile);
 }

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 1ba0502..0bba86f 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java

@@ -479,7 +479,7 @@
                 .stream()
                 .filter(subInfo -> subInfo.getSubscriptionId() == subId)
                 .findFirst()
-                .get();
+                .orElse(null);
     }
 
     /**

diff --git a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
index 935e235..4eee605 100644
--- a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
+++ b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java

@@ -21,6 +21,8 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.UiccCardInfo;
+import android.telephony.UiccPortInfo;
+import android.telephony.UiccSlotInfo;
 import android.telephony.UiccSlotMapping;
 import android.telephony.euicc.EuiccManager;
 import android.util.Log;
@@ -28,6 +30,8 @@
 import com.android.settings.SidecarFragment;
 import com.android.settings.network.telephony.EuiccOperationSidecar;
 
+import com.google.common.collect.ImmutableList;
+
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -44,6 +48,7 @@
     private int mPort;
     private SubscriptionInfo mRemovedSubInfo;
     private boolean mIsDuringSimSlotMapping;
+    private List<SubscriptionInfo> mActiveSubInfos;
 
     /** Returns a SwitchToEuiccSubscriptionSidecar sidecar instance. */
     public static SwitchToEuiccSubscriptionSidecar get(FragmentManager fm) {
@@ -87,6 +92,10 @@
         setState(State.RUNNING, Substate.UNUSED);
         mCallbackIntent = createCallbackIntent();
         mSubId = subscriptionId;
+        SubscriptionManager subscriptionManager = getContext().getSystemService(
+                SubscriptionManager.class);
+        mActiveSubInfos = SubscriptionUtil.getActiveSubscriptions(subscriptionManager);
+
         int targetSlot = getTargetSlot();
         if (targetSlot < 0) {
             Log.d(TAG, "There is no esim, the TargetSlot is " + targetSlot);
@@ -99,15 +108,29 @@
         mPort = (port < 0) ? getTargetPortId(targetSlot, removedSubInfo) : port;
         mRemovedSubInfo = removedSubInfo;
         Log.d(TAG,
-                String.format("set esim into the SubId%d Slot%d:Port%d",
+                String.format("set esim into the SubId%d Physical Slot%d:Port%d",
                         mSubId, targetSlot, mPort));
-
-        if (mTelephonyManager.isMultiSimEnabled() && removedSubInfo != null
-                && removedSubInfo.isEmbedded()) {
-            // In DSDS mode+MEP, if the replaced esim is active, then it should be disabled esim
-            // profile before changing SimSlotMapping process.
-            // Use INVALID_SUBSCRIPTION_ID to disable the esim profile.
-            // The SimSlotMapping is ready, then to execute activate/inactivate esim.
+        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            // If the subId is INVALID_SUBSCRIPTION_ID, disable the esim (the default esim slot
+            // which is selected by the framework).
+            switchToSubscription();
+        } else if ((mTelephonyManager.isMultiSimEnabled() && removedSubInfo != null
+                && removedSubInfo.isEmbedded())
+                || isEsimEnabledAtTargetSlotPort(targetSlot, mPort)) {
+            // Case1: In DSDS mode+MEP, if the replaced esim is active, then the replaced esim
+            // should be disabled before changing SimSlotMapping process.
+            //
+            // Case2: If the user enables the esimA on the target slot:port and the target
+            // slot:port is active and there is an active esimB on target slot:port, then the
+            // settings disables the esimB before the settings enables the esimA on the
+            // target slot:port.
+            //
+            // Step:
+            // 1. disables the replaced esim.
+            // 2. switches the SimSlotMapping if the target slot port is not active.
+            // 3. enables the target esim.
+            // Note: Use INVALID_SUBSCRIPTION_ID to disable the esim profile.
+            Log.d(TAG, "disable the enabled esim before the settings enables the target esim");
             mIsDuringSimSlotMapping = true;
             mEuiccManager.switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, mPort,
                     mCallbackIntent);
@@ -117,8 +140,8 @@
     }
 
     private int getTargetPortId(int physicalEsimSlotIndex, SubscriptionInfo removedSubInfo) {
-        if (!isMultipleEnabledProfilesSupported()) {
-            Log.d(TAG, "The device is no MEP, port is 0");
+        if (!isMultipleEnabledProfilesSupported(physicalEsimSlotIndex)) {
+            Log.d(TAG, "The slotId" + physicalEsimSlotIndex + " is no MEP, port is 0");
             return 0;
         }
 
@@ -150,11 +173,12 @@
         // port is 0.
 
         int port = 0;
-        SubscriptionManager subscriptionManager = getContext().getSystemService(
-                SubscriptionManager.class);
+        if(mActiveSubInfos == null){
+            Log.d(TAG, "mActiveSubInfos is null.");
+            return port;
+        }
         List<SubscriptionInfo> activeEsimSubInfos =
-                SubscriptionUtil.getActiveSubscriptions(subscriptionManager)
-                        .stream()
+                mActiveSubInfos.stream()
                         .filter(i -> i.isEmbedded())
                         .sorted(Comparator.comparingInt(SubscriptionInfo::getPortIndex))
                         .collect(Collectors.toList());
@@ -167,7 +191,31 @@
     }
 
     private int getTargetSlot() {
-        return UiccSlotUtil.getEsimSlotId(getContext());
+        return UiccSlotUtil.getEsimSlotId(getContext(), mSubId);
+    }
+
+    private boolean isEsimEnabledAtTargetSlotPort(int physicalSlotIndex, int portIndex) {
+        int logicalSlotId = getLogicalSlotIndex(physicalSlotIndex, portIndex);
+        if (logicalSlotId == SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
+            return false;
+        }
+        return mActiveSubInfos != null
+                && mActiveSubInfos.stream()
+                .anyMatch(i -> i.isEmbedded() && i.getSimSlotIndex() == logicalSlotId);
+    }
+
+    private int getLogicalSlotIndex(int physicalSlotIndex, int portIndex) {
+        ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelephonyManager);
+        if (slotInfos != null && physicalSlotIndex >= 0 && physicalSlotIndex < slotInfos.size()
+                && slotInfos.get(physicalSlotIndex) != null) {
+            for (UiccPortInfo portInfo : slotInfos.get(physicalSlotIndex).getPorts()) {
+                if (portInfo.getPortIndex() == portIndex) {
+                    return portInfo.getLogicalSlotIndex();
+                }
+            }
+        }
+
+        return SubscriptionManager.INVALID_SIM_SLOT_INDEX;
     }
 
     private void onSwitchSlotSidecarStateChange() {
@@ -185,14 +233,15 @@
         }
     }
 
-    private boolean isMultipleEnabledProfilesSupported() {
+    private boolean isMultipleEnabledProfilesSupported(int physicalEsimSlotIndex) {
         List<UiccCardInfo> cardInfos = mTelephonyManager.getUiccCardsInfo();
         if (cardInfos == null) {
             Log.w(TAG, "UICC cards info list is empty.");
             return false;
         }
-        return cardInfos.stream().anyMatch(
-                cardInfo -> cardInfo.isMultipleEnabledProfilesSupported());
+        return cardInfos.stream()
+                .anyMatch(cardInfo -> cardInfo.getPhysicalSlotIndex() == physicalEsimSlotIndex
+                        && cardInfo.isMultipleEnabledProfilesSupported());
     }
 
     private void switchToSubscription() {

diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
index c9c52cb..7ba2e0f 100644
--- a/src/com/android/settings/network/UiccSlotUtil.java
+++ b/src/com/android/settings/network/UiccSlotUtil.java

@@ -22,11 +22,13 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
 import android.telephony.UiccSlotInfo;
 import android.telephony.UiccSlotMapping;
 import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.uicc.UiccController;
 import com.android.settingslib.utils.ThreadUtils;
 
 import com.google.common.collect.ImmutableList;
@@ -36,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -183,9 +186,27 @@
      * @param context the application context.
      * @return the esim slot. If the value is -1, there is not the esim.
      */
-    public static int getEsimSlotId(Context context) {
+    public static int getEsimSlotId(Context context, int subId) {
         TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+        List<UiccCardInfo> uiccCardInfos = telMgr.getUiccCardsInfo();
         ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(telMgr);
+        SubscriptionManager subscriptionManager = context.getSystemService(
+                SubscriptionManager.class);
+        SubscriptionInfo subInfo = SubscriptionUtil.getSubById(subscriptionManager, subId);
+
+        // checking whether this is the removable esim. If it is, then return the removable slot id.
+        if (subInfo != null && subInfo.isEmbedded()) {
+            for (UiccCardInfo uiccCardInfo : uiccCardInfos) {
+                if (uiccCardInfo.getCardId() == subInfo.getCardId()
+                        && uiccCardInfo.getCardId() > TelephonyManager.UNSUPPORTED_CARD_ID
+                        && uiccCardInfo.isEuicc()
+                        && uiccCardInfo.isRemovable()) {
+                    Log.d(TAG, "getEsimSlotId: This subInfo is removable esim.");
+                    return uiccCardInfo.getPhysicalSlotIndex();
+                }
+            }
+        }
+
         int firstEsimSlot = IntStream.range(0, slotInfos.size())
                 .filter(
                         index -> {

diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java
index 98939cf..08884d5 100644
--- a/src/com/android/settings/panel/VolumePanel.java
+++ b/src/com/android/settings/panel/VolumePanel.java

@@ -26,6 +26,7 @@
 import static com.android.settings.slices.CustomSliceRegistry.VOLUME_MEDIA_URI;
 import static com.android.settings.slices.CustomSliceRegistry.VOLUME_RINGER_URI;
 
+import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
@@ -49,7 +50,6 @@
 import com.android.settingslib.media.MediaOutputConstants;
 
 import java.util.ArrayList;
-import java.util.IllegalFormatException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
@@ -64,6 +64,7 @@
 
     private PanelContentCallback mCallback;
     private LocalBluetoothProfileManager mProfileManager;
+    private int mControlSliceWidth;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -80,6 +81,14 @@
 
     private VolumePanel(Context context) {
         mContext = context.getApplicationContext();
+        if (context instanceof Activity) {
+            int panelWidth =
+                    ((Activity) context).getWindowManager().getCurrentWindowMetrics().getBounds()
+                            .width();
+            // The control slice width = panel width - two left and right horizontal paddings
+            mControlSliceWidth = panelWidth - context.getResources().getDimensionPixelSize(
+                    R.dimen.panel_slice_Horizontal_padding) * 2;
+        }
 
         final FutureTask<LocalBluetoothManager> localBtManagerFutureTask = new FutureTask<>(
                 // Avoid StrictMode ThreadPolicy violation
@@ -102,8 +111,7 @@
     public void onResume() {
         final IntentFilter filter = new IntentFilter();
         filter.addAction(MediaOutputConstants.ACTION_CLOSE_PANEL);
-        mContext.registerReceiver(mReceiver, filter,
-                Context.RECEIVER_EXPORTED_UNAUDITED);
+        mContext.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED_UNAUDITED);
     }
 
     /** Invoked when the panel is paused. */
@@ -159,13 +167,11 @@
         Uri controlUri = null;
         final BluetoothDevice bluetoothDevice = findActiveDevice();
         if (bluetoothDevice != null) {
-            final int width = mContext.getResources().getDimensionPixelSize(
-                    R.dimen.settings_panel_width);
             final String uri = BluetoothUtils.getControlUriMetaData(bluetoothDevice);
             if (!TextUtils.isEmpty(uri)) {
                 try {
-                    controlUri = Uri.parse(String.format(uri, width));
-                } catch (IllegalFormatException | NullPointerException exception) {
+                    controlUri = Uri.parse(uri + mControlSliceWidth);
+                } catch (NullPointerException exception) {
                     Log.d(TAG, "unable to parse uri");
                     controlUri = null;
                 }

diff --git a/src/com/android/settings/sim/PreferredSimDialogFragment.java b/src/com/android/settings/sim/PreferredSimDialogFragment.java
index 6b5e2b5..806e04b 100644
--- a/src/com/android/settings/sim/PreferredSimDialogFragment.java
+++ b/src/com/android/settings/sim/PreferredSimDialogFragment.java

@@ -88,6 +88,11 @@
             return;
         }
 
+        if (dialog == null) {
+            Log.d(TAG, "Dialog is null.");
+            dismiss();
+        }
+
         final SubscriptionInfo info = getPreferredSubscription();
         if (info == null) {
             dismiss();

diff --git a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
index 1f84177..a989d52 100644
--- a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
+++ b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java

@@ -100,6 +100,11 @@
             return;
         }
 
+        if (dialog == null) {
+            Log.d(TAG, "Dialog is null.");
+            dismiss();
+        }
+
         SubscriptionInfo currentDataSubInfo = getDefaultDataSubInfo();
         SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(currentDataSubInfo);
 

diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
index c2a8611..82c6b70 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java

@@ -136,6 +136,21 @@
     }
 
     @Test
+    public void onStart_shouldSetSummary() {
+        BrightnessLevelPreferenceController controller =
+                new BrightnessLevelPreferenceController(mContext, null);
+        controller.displayPreference(mScreen);
+
+        controller.onStop();
+        when(mDisplay.getBrightnessInfo()).thenReturn(
+                new BrightnessInfo(0.5f, 0.0f, 1.0f, BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF,
+                        0.5f, BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE));
+        controller.onStart();
+
+        verify(mPreference).setSummary("87%");
+    }
+
+    @Test
     public void updateState_inVrMode_shouldSetSummaryToVrBrightness() {
         doReturn(true).when(mController).isInVrMode();
         System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, 0.6f);

diff --git a/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java b/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java
index 5aa73ea..526fc0c 100644
--- a/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java
+++ b/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java

@@ -25,7 +25,9 @@
 
 import android.content.Context;
 import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
 import android.telephony.UiccPortInfo;
 import android.telephony.UiccSlotInfo;
 import android.telephony.UiccSlotMapping;
@@ -53,16 +55,24 @@
     private Context mContext;
     @Mock
     private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
 
     private static final int ESIM_PHYSICAL_SLOT = 0;
     private static final int PSIM_PHYSICAL_SLOT = 1;
 
+    private List<SubscriptionInfo> mSubscriptionInfoList = new ArrayList<>();
+    private List<UiccCardInfo> mUiccCardInfo = new ArrayList<>();
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(ApplicationProvider.getApplicationContext());
         when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(mUiccCardInfo);
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mSubscriptionManager.getAllSubscriptionInfoList()).thenReturn(mSubscriptionInfoList);
     }
 
     @Test
@@ -88,15 +98,35 @@
     public void getEsimSlotId_twoSimSlotsDeviceAndEsimIsSlot0_returnTheCorrectEsimSlot() {
         when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(
                 twoSimSlotsDeviceActiveEsimActivePsim());
-        int testSlot = UiccSlotUtil.getEsimSlotId(mContext);
+        int testSlot = UiccSlotUtil.getEsimSlotId(mContext,0);
 
         assertThat(testSlot).isEqualTo(0);
     }
+
     @Test
-    public void getEsimSlotId_twoSimSlotsDeviceAndRemovableEsimIsSlot1_returnTheCorrectEsimSlot() {
+    public void getEsimSlotId_simIsRemovableEsimAndRemovableEsimIsSlot1_returnRemovableEsimSlot1() {
+        int subId = 0;
+        int cardId = 0;
+        mSubscriptionInfoList.add(createSubscriptionInfo(subId,-1, -1, true, cardId));
+        mUiccCardInfo.add(createUiccCardInfo(true, 3, 0, false, -1, -1));
+        mUiccCardInfo.add(createUiccCardInfo(true, cardId, 1, true, -1, -1));
+        when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(
+                twoSimSlotsDeviceActiveEsimActiveRemovableEsim());
+        int testSlot = UiccSlotUtil.getEsimSlotId(mContext, subId);
+
+        assertThat(testSlot).isEqualTo(1);
+    }
+
+    @Test
+    public void getEsimSlotId_simIsRemovableEsimAndTwoRemovableSlots_returnRemovableEsimSlot1() {
+        int subId = 0;
+        int cardId = 0;
+        mSubscriptionInfoList.add(createSubscriptionInfo(subId,-1, -1, true, cardId));
+        mUiccCardInfo.add(createUiccCardInfo(false, 4, 0, true, -1, -1));
+        mUiccCardInfo.add(createUiccCardInfo(true, cardId, 1, true, -1, -1));
         when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(
                 twoSimSlotsDeviceActivePsimActiveRemovableEsim());
-        int testSlot = UiccSlotUtil.getEsimSlotId(mContext);
+        int testSlot = UiccSlotUtil.getEsimSlotId(mContext, subId);
 
         assertThat(testSlot).isEqualTo(1);
     }
@@ -105,7 +135,7 @@
     public void getEsimSlotId_twoSimSlotsDeviceAndEsimIsSlot1_returnTheCorrectEsimSlot() {
         when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(
                 twoSimSlotsDeviceActivePsimActiveEsim());
-        int testSlot = UiccSlotUtil.getEsimSlotId(mContext);
+        int testSlot = UiccSlotUtil.getEsimSlotId(mContext,0);
 
         assertThat(testSlot).isEqualTo(1);
     }
@@ -114,7 +144,7 @@
     public void getEsimSlotId_noEimSlotDevice_returnTheCorrectEsimSlot() {
         when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(
                 oneSimSlotDeviceActivePsim());
-        int testSlot = UiccSlotUtil.getEsimSlotId(mContext);
+        int testSlot = UiccSlotUtil.getEsimSlotId(mContext,0);
 
         assertThat(testSlot).isEqualTo(-1);
     }
@@ -620,13 +650,38 @@
     }
 
     private SubscriptionInfo createSubscriptionInfo(int logicalSlotIndex, int portIndex) {
+        return createSubscriptionInfo(0, logicalSlotIndex, portIndex, true, 25);
+    }
+
+    private SubscriptionInfo createSubscriptionInfo(int subId, int logicalSlotIndex, int portIndex,
+            boolean isEmbedded, int cardId) {
         return new SubscriptionInfo(
-                0, "", logicalSlotIndex, "", "", 0, 0, "", 0, null, "", "", "",
-                true /* isEmbedded */,
-                null, "", 25,
+                subId, "",
+                logicalSlotIndex, "", "", 0, 0, "", 0, null, "", "", "",
+                isEmbedded /* isEmbedded */,
+                null, "",
+                cardId,
                 false, null, false, 0, 0, 0, null, null, true, portIndex);
     }
 
+    private UiccCardInfo createUiccCardInfo(boolean isEuicc, int cardId, int physicalSlotIndex,
+            boolean isRemovable, int logicalSlotIndex, int portIndex) {
+        return new UiccCardInfo(
+                isEuicc /* isEuicc */,
+                cardId /* cardId */,
+                null /* eid */,
+                physicalSlotIndex /* physicalSlotIndex */,
+                isRemovable /* isRemovable */,
+                false /* isMultipleEnabledProfileSupported */,
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890" /* iccId */,
+                                portIndex /* portIdx */,
+                                logicalSlotIndex /* logicalSlotIdx */,
+                                true /* isActive */)
+                ));
+    }
+
     private List<SubscriptionInfo> createActiveSubscriptionInfoListOneSim(int logicalSlotIndex,
             int portIndex) {
         List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
@@ -737,6 +792,12 @@
                 createUiccSlotInfo(true, false, 1, true)};
     }
 
+    private UiccSlotInfo[] twoSimSlotsDeviceActiveEsimActiveRemovableEsim() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfo(true, false, 0, true),
+                createUiccSlotInfo(true, true, 1, true)};
+    }
+
     private UiccSlotInfo[] twoSimSlotsDeviceActivePsimActiveRemovableEsim() {
         return new UiccSlotInfo[]{
                 createUiccSlotInfo(false, true, 0, true),
commit	1c45e9ad721b20430d046954b0c1a25e703a3642	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Fri Jun 10 20:09:03 2022 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Jun 10 20:09:03 2022 +0000
tree	487a094a2273ecd5d65f3e0fdfb01b83539f50db
parent	fc45c25296cc10b0957e64056278b1312d0a2b7f [diff]
parent	74f7988ced18df9a06c5bf9ce7bd40505b8e6030 [diff]