Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / apps / Settings / 6e4488515c8f55bc521c2ad226042647540382d3^1..6e4488515c8f55bc521c2ad226042647540382d3 / .
commit6e4488515c8f55bc521c2ad226042647540382d3[log] [tgz]
authorSteven Laver <lavers@google.com>Tue Aug 18 11:40:37 2020 -0700
committerSteven Laver <lavers@google.com>Tue Aug 18 11:40:37 2020 -0700
tree01f78327a1cb39b7e63d1a1e31f20dca115740d7
parenta07fda2acbf16c708c6b0871275f2350e12c60ad [diff]
parentc6d76ae410c1b0a6e0b6d00ff8f10011a8f80fab [diff]
Merge RP1A.200720.012
Change-Id: Icfcdf73ecc7e354ef7175b2a4ac34133d55bdc08

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 448b2f6..e476046 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -4936,12 +4936,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"Cast ማድረግ አቁም"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"VoLTE ይጥፋ?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"ይህ እንዲሁም የእርስዎን 5ጂ ግንኙነትዎን ያጠፋል።\nበድምጽ ጥሪ ጊዜ በይነመረብን መጠቀም አይችሉም እና አንዳንድ መተግበሪያዎች ላይሠሩ ይችላሉ።"</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"2 ሲሞችን በሚጠቀሙበት ጊዜ ይህ ስልክ በ4ጂ ይገደባል። "<annotation id="url">"የበለጠ ለመረዳት"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"2 ሲሞችን በሚጠቀሙበት ጊዜ ይህ ጡባዊ በ4ጂ ይገደባል። "<annotation id="url">"የበለጠ ለመረዳት"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"2 ሲሞችን በሚጠቀሙበት ጊዜ ይህ መሣሪያ በ4ጂ ይገደባል። "<annotation id="url">"የበለጠ ለመረዳት"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ለተሸጎጡ መተግበሪያዎች አፈጻጸምን አግድ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"በቅንብሮች ላይ የማያ ገጽ ተደራቢዎችን ይፍቀዱ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"የቅንብሮች ማያ ገጾችን ለመደራረብ በሌሎች መተግበሪያዎች ላይ የሚያሳዩ መተግበሪያዎችን ይፍቀዱ"</string>

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 474eb5c..9ffa47c 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml

@@ -4936,12 +4936,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"কাষ্ট কৰা বন্ধ কৰক"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"VoLTE অফ কৰিবনে?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"এইটোৱে লগতে আপোনাৰ 5G সংযোগ অফ কৰে।\nএটা ভইচ কল চলি থকাৰ সময়ত আপুনি ইণ্টাৰনেট ব্যৱহাৰ কৰিব নোৱাৰে আৰু কিছুমান এপে কাম নকৰিব পাৰে।"</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"২ খন ছিম ব্যৱহাৰ কৰাৰ সময়ত এই ফ’নটোৰ ব্যৱহাৰ 4Gত সীমিত হৈ পৰিব। "<annotation id="url">"অধিক জানক"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"২ খন ছিম ব্যৱহাৰ কৰাৰ সময়ত এই টেবলেটটোৰ ব্যৱহাৰ 4Gত সীমিত হৈ পৰিব। "<annotation id="url">"অধিক জানক"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"২ খন ছিম ব্যৱহাৰ কৰাৰ সময়ত এই ডিভাইচটোৰ ব্যৱহাৰ 4Gত সীমিত হৈ পৰিব। "<annotation id="url">"অধিক জানক"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"কেশ্ব কৰা এপ্‌সমূহৰ বাবে কাৰ্যকৰীকৰণ নিলম্বন কৰক"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"ছেটিংসমূহত স্ক্ৰীন অ’ভাৰলে’ৰ অনুমতি দিয়ে"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"এনে এপ্‌সমূহক অনুমতি দিয়ে যি ছেটিংসমূহৰ স্ক্ৰীনসমূহ অ’ভাৰলে’ কৰিবলৈ অন্য এপ্‌সমূহৰ ওপৰত প্ৰদৰ্শিত হ’ব পাৰে"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 064d3ad..f37daaf 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -2211,7 +2211,7 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибриране при известия"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибриране при звънене"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Обратна връзка при докосване"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Използване на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Използване на „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
     <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Отваряне на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Използване на корекция на цветовете"</string>
     <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Показване на надписите"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0fc849b..cf54383 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -759,7 +759,7 @@
     <string name="wifi_display_status_connected" msgid="2189925211258519539">"Verbunden"</string>
     <string name="wifi_display_status_in_use" msgid="5904009697167947449">"In Verwendung"</string>
     <string name="wifi_display_status_not_available" msgid="8463750208946968594">"Nicht verfügbar"</string>
-    <string name="wifi_display_details" msgid="2351632307998142920">"Display-Einstellungen"</string>
+    <string name="wifi_display_details" msgid="2351632307998142920">"Displayeinstellungen"</string>
     <string name="wifi_display_options_title" msgid="7584326966240865043">"Optionen für kabellose Übertragung (WiDi)"</string>
     <string name="wifi_display_options_forget" msgid="3140558691112356024">"Entfernen"</string>
     <string name="wifi_display_options_done" msgid="7608851767701954020">"Fertig"</string>
@@ -1728,7 +1728,7 @@
     <string name="assisted_gps" msgid="1714546606018821498">"Unterstütztes GPS verwenden"</string>
     <string name="assisted_gps_enabled" msgid="6220188450779319248">"Server zur Unterstützung von GPS verwenden (zur Verringerung der Netzwerkauslastung nicht auswählen)"</string>
     <string name="assisted_gps_disabled" msgid="1062496503892849">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
-    <string name="use_location_title" msgid="1345594777162897654">"Standort &amp; Google-Suche"</string>
+    <string name="use_location_title" msgid="1345594777162897654">"Standort &amp; Google Suche"</string>
     <string name="use_location_summary" msgid="377322574549729921">"Google darf Suchergebnisse und andere Dienste an meinen Standort anpassen"</string>
     <string name="location_access_title" msgid="4052667453826272040">"Zugriff auf meinen Standort"</string>
     <string name="location_access_summary" msgid="8634100005481578143">"Meine Standortdaten dürfen von Apps verwendet werden, die ich dazu berechtigt habe."</string>
@@ -4602,15 +4602,15 @@
     <string name="app_info_storage_title" msgid="4076977173803093808">"Belegter Speicherplatz"</string>
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deinstalliert)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deaktiviert)"</string>
-    <string name="autofill_app" msgid="7595308061826307921">"AutoFill-Dienst"</string>
+    <string name="autofill_app" msgid="7595308061826307921">"Dienst für automatisches Ausfüllen"</string>
     <string name="autofill_keywords" msgid="6260653325195017912">"automatisch, ausfüllen, füllen, autofill"</string>
-    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Nur für vertrauenswürdige Apps&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. AutoFill sollte daher nur für vertrauenswürdige Apps zugelassen werden."</string>
-    <string name="debug_autofill_category" msgid="5998163555428196185">"AutoFill"</string>
+    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Nur für vertrauenswürdige Apps&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatisches Ausfüllen von Google&gt;%1$s&lt;/xliff:g&gt; greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. Die Funktion sollte daher nur für vertrauenswürdige Apps zugelassen werden."</string>
+    <string name="debug_autofill_category" msgid="5998163555428196185">"Automatisches Ausfüllen"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Protokollierungsebene"</string>
     <string name="autofill_max_partitions" msgid="7342195529574406366">"Maximale Zahl von Anfragen pro Sitzung"</string>
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maximale Zahl sichtbarer Datensätze"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Auf Standardwerte zurücksetzen"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Die AutoFill-Optionen für Entwickler wurden zurückgesetzt"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Die Optionen für automatisches Ausfüllen für Entwickler wurden zurückgesetzt"</string>
     <string name="device_theme" msgid="5027604586494772471">"Gerätedesign"</string>
     <string name="default_theme" msgid="4815428567082263639">"Standard"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Netzwerkname"</string>
@@ -4937,12 +4937,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"Streamen beenden"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"VoLTE deaktivieren?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"Dadurch wird auch deine 5G-Verbindung deaktiviert.\nWährend eines Sprachanrufs kannst du das Internet nicht nutzen und manche Apps funktionieren möglicherweise nicht."</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"Wenn du zwei SIMs verwendest, kann dieses Smartphone sich nur mit 4G verbinden. "<annotation id="url">"Weitere Informationen"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"Wenn du zwei SIMs verwendest, kann dieses Tablet sich nur mit 4G verbinden. "<annotation id="url">"Weitere Informationen"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"Wenn du zwei SIMs verwendest, kann dieses Gerät sich nur mit 4G verbinden. "<annotation id="url">"Weitere Informationen"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Ausführung für Apps im Cache sperren"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Apps dürfen über Einstellungen angezeigt werden"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Apps, die über anderen Apps angezeigt werden dürfen, dürfen auch über den Einstellungen angezeigt werden"</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 6208ae8..e497bbd 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -81,7 +81,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailutik deskonektatuko da gailua."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"Deskonektatu"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"Ez daukazu Bluetooth-aren ezarpenak aldatzeko baimenik."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parekatu gailu batekin"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parekatu beste gailu batekin"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth-a"</string>
     <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"Bluetooth-aren ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"Telefonoa Bluetooth bidez konektatzeko helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -136,7 +136,7 @@
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" gisa dago ikusgai beste gailuetan"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"Aktibatu Bluetooth-a beste gailu batzuetara konektatzeko."</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"Zure gailuak"</string>
-    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Parekatu gailu batekin"</string>
+    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Parekatu beste gailu batekin"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"Baimendu tabletari inguruko Bluetooth bidezko gailuekin komunikatzea"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Eman gailuari inguruko Bluetooth bidezko gailuekin komunikatzeko baimena"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Baimendu telefonoari inguruko Bluetooth bidezko gailuekin komunikatzea"</string>
@@ -791,7 +791,7 @@
     <string name="android_beam_off_summary" msgid="5693961375631325042">"Desaktibatuta"</string>
     <string name="nfc_disabled_summary" msgid="8737797364522502351">"Ez dago erabilgarri NFC desaktibatuta dagoelako"</string>
     <string name="android_beam_label" msgid="7168565080321110094">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="5684416131846701256">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC gaitasuna duten beste gailu batzuekin, gailuak bata bestearengana hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu zure pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
+    <string name="android_beam_explained" msgid="5684416131846701256">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC gaitasuna duten beste gailu batzuekin, gailuak bata bestearengana hurbilduta. Besteak beste, web-orriak, YouTube-ko bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu zure pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifia"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifia"</string>
@@ -811,14 +811,14 @@
     <string name="wifi_wakeup_summary" msgid="5778059083790221465">"Gordetako kalitate handiko sare batetik (adibidez, etxeko saretik) gertu zaudenean aktibatuko da berriro wifi-konexioa"</string>
     <string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"Ez dago erabilgarri kokapena desaktibatuta dagoelako. Aktibatu "<annotation id="link">"kokapena"</annotation>"."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"Ez dago erabilgarri, Wifi-sareen bilaketa desaktibatuta dagoelako"</string>
-    <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"Erabiltzeko, hautatu sareen balorazioen hornitzaile bat"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"Erabiltzeko, hautatu sare-balorazioen hornitzaile bat"</string>
     <string name="wifi_poor_network_detection" msgid="8210035875160288422">"Saihestu konexio ahulak"</string>
     <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Ez erabili wifi-sareak ez badute Interneteko konexio onik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"Erabili Interneteko konexio ona duten sareak soilik"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"Konektatu sare publikoetara"</string>
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Konektatu automatikoki kalitate handiko sare publikoetara"</string>
-    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Erabiltzeko, hautatu sareen balorazioen hornitzaile bat"</string>
-    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Erabiltzeko, hautatu sareen balorazioen hornitzaile bateragarri bat"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Erabiltzeko, hautatu sare-balorazioen hornitzaile bat"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Erabiltzeko, hautatu sare-balorazioen hornitzaile bateragarri bat"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Instalatu ziurtagiriak"</string>
     <string name="wifi_scan_notify_text" msgid="2518097467707535013">"Kokapenaren zehaztasuna hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Besteak beste, kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke. Aukera hori aldatzeko, joan <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="6189528915806353667">"Kokapenaren zehaztasuna hobetzeko, aktibatu Wifi-sareen bilaketa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilatzeko ezarpenetan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -1686,7 +1686,7 @@
     <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"SMS mezuetarako aplikazioa aldatu?"</string>
     <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"<xliff:g id="NEW_APP">%1$s</xliff:g> aplikazioaren ordez, <xliff:g id="CURRENT_APP">%2$s</xliff:g> aplikazioa erabili SMS mezuetarako?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"Erabili <xliff:g id="NEW_APP">%s</xliff:g> SMS mezuetarako aplikazio gisa?"</string>
-    <string name="network_scorer_picker_title" msgid="2022922801936206195">"Sareen balorazioen hornitzailea"</string>
+    <string name="network_scorer_picker_title" msgid="2022922801936206195">"Sare-balorazioen hornitzailea"</string>
     <string name="network_scorer_picker_none_preference" msgid="8894034333043177807">"Bat ere ez"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"Wifi-laguntzailea aldatu nahi duzu?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Sareko konexioak kudeatzeko <xliff:g id="NEW_APP">%1$s</xliff:g> erabili nahi duzu, <xliff:g id="CURRENT_APP">%2$s</xliff:g> erabili beharrean?"</string>
@@ -3058,7 +3058,7 @@
     <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Ordaintzeko beste aplikazio bat irekita badago izan ezik"</string>
     <string name="nfc_payment_pay_with" msgid="3001320460566523453">"Kontakturik gabeko ordainketa-terminaletan, erabili hau ordainketak egiteko:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Terminalean ordaintzea"</string>
-    <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea ukipen gabeko sistemaren ikurra duen terminalaren aurrean."</string>
+    <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea kontakturik gabeko sistemaren ikurra duen terminalaren aurrean."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ados"</string>
     <string name="nfc_more_title" msgid="4202405349433865488">"Gehiago…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ezarri ordainketak egiteko aplikazio lehenetsia"</string>
@@ -3762,8 +3762,8 @@
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” arauan, blokeatuta dago deiak jasotzeko aukera. Lagunak, familia eta beste kontaktu batzuk zurekin harremanetan jartzeko aukera izan dezaten, aldatu ezarpenak."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontaktu izardunak"</string>
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Beste <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">Beste bat</item>
+      <item quantity="other">beste <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
+      <item quantity="one">beste bat</item>
     </plurals>
     <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Bat ere ez"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mezuak"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 2a5556a..d4520a5 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -81,7 +81,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"Votre appareil se déconnectera de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"Déconnecter"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Associer un appareil"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Associer un autre appareil"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"Lorsque le Bluetooth est activé, votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"Adresse Bluetooth du téléphone : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -136,7 +136,7 @@
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Visible comme « <xliff:g id="DEVICE_NAME">^1</xliff:g> » aux autres appareils"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"Activez le Bluetooth pour vous connecter à d\'autres appareils."</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"Vos appareils"</string>
-    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Associer un appareil"</string>
+    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Associer un autre appareil"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"Permettre à votre tablette de communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permettre à votre appareil de communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permettre à votre téléphone de communiquer avec les appareils Bluetooth à proximité"</string>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 48caf92..c04661b 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -81,7 +81,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"O dispositivo desconectarase de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"Desconect."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"Non tes permiso para cambiar a configuración de Bluetooth."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sincronizar dispositivo novo"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sincronizar novo dispositivo"</string>
     <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
     <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos próximos coa configuración de Bluetooth activada."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"Enderezo Bluetooth do teléfono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -136,7 +136,7 @@
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"Activa o Bluetooth para conectarte a outros dispositivos."</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"Os teus dispositivos"</string>
-    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Sincronizar dispositivo novo"</string>
+    <string name="bluetooth_pairing_page_title" msgid="3403981358823707692">"Sincronizar novo dispositivo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3506962706611366830">"Permite que a tableta se comunique cos dispositivos Bluetooth próximos"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"Permite que o dispositivo se comunique cos dispositivos Bluetooth próximos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Permite que o teléfono se comunique cos dispositivos Bluetooth próximos"</string>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index ea45bed..4a760af 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -34,7 +34,7 @@
     <string name="header_category_system" msgid="1665516346845259058">"સિસ્ટમ"</string>
     <string name="radioInfo_service_in" msgid="9088637745836646271">"સેવામાં"</string>
     <string name="radioInfo_service_out" msgid="1868347333892403287">"કાર્યરત્ નથી"</string>
-    <string name="radioInfo_service_emergency" msgid="6838935881091760942">"ફક્ત કટોકટીના કૉલ્સ"</string>
+    <string name="radioInfo_service_emergency" msgid="6838935881091760942">"ફક્ત ઇમર્જન્સી કૉલ"</string>
     <string name="radioInfo_service_off" msgid="6184928420860868571">"રેડિઓ બંધ છે"</string>
     <string name="radioInfo_roaming_in" msgid="8892550453644088692">"રોમિંગ"</string>
     <string name="radioInfo_roaming_not" msgid="3137594549464975054">"રોમિંગ નહીં"</string>
@@ -3657,9 +3657,9 @@
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ખલેલ પાડશો નહીંને મંજૂરી આપો"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
     <string name="loading_notification_apps" msgid="1458413761470945269">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
-    <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
-    <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
-    <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના ગ્રૂપને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="notification_channels" msgid="1502969522886493799">"કૅટેગરીઓ"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"અન્ય"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -4936,12 +4936,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"કાસ્ટ કરવાનું રોકો"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"VoLTE બંધ કરીએ?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"આમ કરવાથી તમારું 5G કનેક્શન પણ બંધ થઈ જશે.\nવૉઇસ કૉલ દરમ્યાન, તમે ઇન્ટરનેટનો ઉપયોગ કરી શકતાં નથી અને કેટલીક ઍપ કદાચ કામ ન પણ કરે."</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"2 સિમનો ઉપયોગ કરવાથી આ ફોનની મર્યાદા 4G થઈ જશે. "<annotation id="url">"વધુ જાણો"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"2 સિમનો ઉપયોગ કરવાથી આ ટૅબ્લેટની મર્યાદા 4G થઈ જશે. "<annotation id="url">"વધુ જાણો"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"2 સિમનો ઉપયોગ કરવાથી આ ડિવાઇસની મર્યાદા 4G થઈ જશે. "<annotation id="url">"વધુ જાણો"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"કૅશ મેમરીમાં સાચવેલી ઍપનો અમલ કરવાનું સસ્પેન્ડ કરો"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"સેટિંગ પર સ્ક્રીન ઓવરલે થવાની મંજૂરી આપો"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"સેટિંગ સ્ક્રીનને ઓવરલે કરવા માટે અન્ય ઍપની ટોચે પ્રદર્શિત થઈ શકે તેવી ઍપને મંજૂરી આપો"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8802a06..524692b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -2283,11 +2283,11 @@
     <string name="captioning_preset" msgid="4174276086501638524">"कैप्शन की शैली"</string>
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"आपके मुताबिक विकल्प"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"पृष्ठभूमि का रंग"</string>
-    <string name="captioning_background_opacity" msgid="6453738649182382614">"पृष्ठभूमि पारदर्शिता"</string>
+    <string name="captioning_background_opacity" msgid="6453738649182382614">"बैकग्राउंड की ओपैसिटी"</string>
     <string name="captioning_window_color" msgid="1406167274530183119">"कैप्शन विंडो का रंग"</string>
-    <string name="captioning_window_opacity" msgid="4031752812991199525">"कैप्शन विंडो पारदर्शिता"</string>
+    <string name="captioning_window_opacity" msgid="4031752812991199525">"कैप्शन विंडो की ओपैसिटी"</string>
     <string name="captioning_foreground_color" msgid="9057327228286129232">"लेख का रंग"</string>
-    <string name="captioning_foreground_opacity" msgid="1395843080697567189">"लेख पारदर्शिता"</string>
+    <string name="captioning_foreground_opacity" msgid="1395843080697567189">"टेक्स्ट की ओपैसिटी"</string>
     <string name="captioning_edge_color" msgid="6035818279902597518">"किनारे का रंग"</string>
     <string name="captioning_edge_type" msgid="5281259280060811506">"किनारे का प्रकार"</string>
     <string name="captioning_typeface" msgid="285325623518361407">"फ़ॉन्ट फ़ैमिली"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 13bed5d..b6fd2d0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -5118,9 +5118,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"עצירת העברה"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"‏לכבות את VoLTE?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"‏פעולה זו מכבה גם את החיבור לרשת 5G.\nבמהלך שיחה קולית, אי אפשר להשתמש באינטרנט וייתכן שאפליקציות מסוימות לא יפעלו."</string>
-    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"‏כשמשתמשים בשני כרטיסי SIM, טלפון זה יוגבל ל-4G. "<annotation id="url">"מידע נוסף"</annotation></string>
-    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"‏כשמשתמשים בשני כרטיסי SIM, טאבלט זה יוגבל ל-4G. "<annotation id="url">"מידע נוסף"</annotation></string>
-    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"‏כשמשתמשים בשני כרטיסי SIM, מכשיר זה יוגבל ל-4G. "<annotation id="url">"מידע נוסף"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"‏כשהטלפון מצויד בשני כרטיסי SIM, ניתן להשתמש בו רק ברשתות דור רביעי. "<annotation id="url">"מידע נוסף"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"‏כשהטאבלט מצויד בשני כרטיסי SIM, ניתן להשתמש בו רק ברשתות דור רביעי. "<annotation id="url">"מידע נוסף"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"‏כשהמכשיר מצויד בשני כרטיסי SIM, ניתן להשתמש בו רק ברשתות דור רביעי. "<annotation id="url">"מידע נוסף"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"השעיית הביצוע לאפליקציות שנשמרו במטמון"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"אפשרות של שכבות-על במסכי \'הגדרות\'"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"אפליקציות שיכולות להופיע מעל אפליקציות אחרות יוכלו ליצור שכבות-על במסכי ההגדרות"</string>

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

@@ -3351,7 +3351,7 @@
     <string name="zen_mode_settings_category" msgid="3794956668816783447">"音が出る割り込みの許可"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"視覚的な通知のブロック"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"視覚的な割り込みを許可"</string>
-    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"非表示の通知の表示オプション"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"通知の表示オプション"</string>
     <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"サイレント モードが ON のとき"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"通知音なし"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"画面に通知が表示されます"</string>

diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index ec29ef8..f998a62 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml

@@ -3657,7 +3657,7 @@
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"អនុញ្ញាតមុខងារកុំរំខាន"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
     <string name="loading_notification_apps" msgid="1458413761470945269">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
-    <string name="app_notifications_off_desc" msgid="6691342160980435901">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
+    <string name="app_notifications_off_desc" msgid="6691342160980435901">"តាមសំណើ​របស់អ្នក Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ប្រភេទនៃការជូនដំណឹង​​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ក្រុមនៃ​ការជូនដំណឹង​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="notification_channels" msgid="1502969522886493799">"ប្រភេទ"</string>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 2e97641..25d8664 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -925,7 +925,7 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi бул түзмөк менен бөлүшүлүүдө…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Туташууда…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Жалпы байланыш түйүнү"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Сиз экениңизди ырастаңыз"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Өзүңүздү ырастаңыз"</string>
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Байланыш түйүнүнүн сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Авто-туташуу"</string>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 406f2dc..cd580b7 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -4936,12 +4936,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"കാസ്റ്റ് ചെയ്യുന്നത് നിർത്തുക"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"VoLTE ഓഫാക്കണോ?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"ഇത് നിങ്ങളുടെ 5G കണക്ഷനും ഓഫാക്കും.\nവോയ്‌സ് കോൾ ചെയ്യുമ്പോൾ നിങ്ങൾക്ക് ഇന്റർനെറ്റ് ഉപയോഗിക്കാനാവില്ല, ചില ആപ്പുകളും പ്രവർത്തിച്ചേക്കില്ല."</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"2 സിമ്മുകൾ ഉപയോഗിക്കുമ്പോൾ ഈ ഫോണിൽ 4G മാത്രമേ ലഭിക്കൂ. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"2 സിമ്മുകൾ ഉപയോഗിക്കുമ്പോൾ ഈ ടാബ്‌ലെറ്റിൽ 4G മാത്രമേ ലഭിക്കൂ. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"2 സിമ്മുകൾ ഉപയോഗിക്കുമ്പോൾ ഈ ഉപകരണത്തിൽ 4G മാത്രമേ ലഭിക്കൂ. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"കാഷെ ചെയ്ത ആപ്പിനുള്ള നിർവഹണം തൽക്കാലം റദ്ദാക്കൽ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settings ആപ്പിൽ സ്‌ക്രീൻ ഓവർലേ അനുവദിക്കുക"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Settings സ്‌ക്രീനുകളിൽ ഓവർലേ ചെയ്യാൻ മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ കാണിക്കാനാകുന്ന ആപ്പുകളെ അനുവദിക്കുക"</string>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 8f69d31..ff0c72b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -1728,7 +1728,7 @@
     <string name="assisted_gps" msgid="1714546606018821498">"साहाय्यक GPS वापरा"</string>
     <string name="assisted_gps_enabled" msgid="6220188450779319248">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
     <string name="assisted_gps_disabled" msgid="1062496503892849">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (GPS कामगिरी सुधारण्यासाठी अनचेक करा)"</string>
-    <string name="use_location_title" msgid="1345594777162897654">"स्थान आणि Google शोध"</string>
+    <string name="use_location_title" msgid="1345594777162897654">"स्थान आणि Google Search"</string>
     <string name="use_location_summary" msgid="377322574549729921">"Google ला शोध परिणाम आणि अन्य सेवा सुधारण्यासाठी तुमचे स्थान वापरू द्या"</string>
     <string name="location_access_title" msgid="4052667453826272040">"माझी स्थाने अ‍ॅक्सेस करा"</string>
     <string name="location_access_summary" msgid="8634100005481578143">"तुमची परवानगी विचारणार्‍या ॲप्सना तुमची स्थान माहिती वापरु द्या"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 1d1a636..6f1b59d 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -4889,7 +4889,7 @@
     <string name="automatic_system_heap_dump_title" msgid="4093306504711109479">"စနစ်၏ လျှပ်တစ်ပြက် မှတ်ဉာဏ်ကို အလိုအလျောက် ဖမ်းယူပါ"</string>
     <string name="automatic_system_heap_dump_summary" msgid="4060846186592886986">"မှတ်ဉာဏ် အလွန်အသုံးပြုသည့်အခါ \'Android စနစ်\' အတွက် လျှပ်တစ်ပြက် မှတ်ဉာဏ် အလိုအလျောက် ဖမ်းယူပေးသည်"</string>
     <string name="wifi_disconnect_button_text" msgid="5698154296678571998">"ချိတ်ဆက်မှု ဖြုတ်ရန်"</string>
-    <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"အရေးပေါ် ဖုန်းခေါ်ခြင်းများ"</string>
+    <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"အရေးပေါ်ခေါ်ဆိုမှုများ"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"\'Wi‑Fi ခေါ်ဆိုခြင်း\' မှတစ်ဆင့် အရေးပေါ်ဖုန်းခေါ်ခြင်းများကို သင့်ဝန်ဆောင်မှုပေးသူက ပံ့ပိုးမထားပါ။\nအရေးပေါ်ဖုန်းခေါ်ခြင်း ပြုလုပ်ရန် စက်ပစ္စည်းသည် ဆယ်လူလာကွန်ရက်သို့ အလိုအလျောက် ပြောင်းသွားပါမည်။\nဆယ်လူလာကွန်ရက် ရရှိနိုင်သည့် နယ်မြေများတွင်သာ အရေးပေါ်ဖုန်းခေါ်ခြင်းများ ပြုလုပ်နိုင်ပါသည်။"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ဖုန်းခေါ်ဆိုမှုများ အရည်အသွေး ပိုမိုကောင်းမွန်စေရန် Wi‑Fi အသုံးပြုသည်"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS မက်ဆေ့ဂျ် အဝင်"</string>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b927172..4fe71ca 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -4936,12 +4936,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"casting रोक्नुहोस्"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"VoLTE निष्क्रिय पार्ने हो?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"यसले तपाईंको 5G जडान पनि निष्क्रिय पार्छ।\nभ्वाइस कल गर्दा तपाईं इन्टरनेट प्रयोग गर्न सक्नुहुन्न र केही एपहरूले काम नगर्न सक्छन्।"</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"२ वटा SIM प्रयोग गर्दा यो फोनमा 4G मात्र चलाउन मिल्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"२ वटा SIM प्रयोग गर्दा यो ट्याब्लेटमा 4G मात्र चलाउन मिल्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"२ वटा SIM प्रयोग गर्दा यो यन्त्रमा 4G मात्र चलाउन मिल्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"क्यास गरिएका एपहरूको क्रियाकलाप केही समयका लागि रोक्का गर्नुहोस्"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"सेटिङका स्क्रिनको माथिपट्टि देखिन दिनुहोस्"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"अन्य एपको माथिपट्टि देखिन सक्ने एपहरूलाई सेटिङका स्क्रिनको माथिपट्टि देखिन दिनुहोस्"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 041c144..4aa352b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -811,14 +811,14 @@
     <string name="wifi_wakeup_summary" msgid="5778059083790221465">"Wifi wordt opnieuw ingeschakeld in de buurt van opgeslagen netwerken van hoge kwaliteit, zoals je thuisnetwerk"</string>
     <string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"Niet beschikbaar omdat locatietoegang is uitgeschakeld. Schakel "<annotation id="link">"locatietoegang"</annotation>" in."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"Niet beschikbaar omdat wifi-scannen is uitgeschakeld"</string>
-    <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"Selecteer een netwerkbeoordelaar om deze optie te gebruiken"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"Selecteer een provider van netwerkbeoordelingen om deze optie te gebruiken"</string>
     <string name="wifi_poor_network_detection" msgid="8210035875160288422">"Slechte verbindingen vermijden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"Alleen netwerken gebruiken met een goede internetverbinding"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"Verbinden met openbare netwerken"</string>
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Automatisch verbinding maken met openbare netwerken van hoge kwaliteit"</string>
-    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Selecteer een netwerkbeoordelaar om deze optie te gebruiken"</string>
-    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Selecteer een geschikte netwerkbeoordelaar om deze optie te gebruiken"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Selecteer een provider van netwerkbeoordelingen om deze optie te gebruiken"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Selecteer een geschikte provider van netwerkbeoordelingen om deze optie te gebruiken"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Certificaten installeren"</string>
     <string name="wifi_scan_notify_text" msgid="2518097467707535013">"Apps en services kunnen gewoon wifi-netwerken detecteren, zelfs als wifi is uitgeschakeld, om de locatienauwkeurigheid te verbeteren. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren. Je kunt dit wijzigen in de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scaninstellingen<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="6189528915806353667">"Schakel wifi-scannen in via de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scaninstellingen<xliff:g id="LINK_END_1">LINK_END</xliff:g> om de locatienauwkeurigheid te verbeteren."</string>
@@ -1686,7 +1686,7 @@
     <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Sms-app wijzigen?"</string>
     <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Wil je <xliff:g id="NEW_APP">%1$s</xliff:g> als je sms-app gebruiken in plaats van <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"Wil je <xliff:g id="NEW_APP">%s</xliff:g> gebruiken als je sms-app?"</string>
-    <string name="network_scorer_picker_title" msgid="2022922801936206195">"Netwerkbeoordelaar"</string>
+    <string name="network_scorer_picker_title" msgid="2022922801936206195">"Provider van netwerkbeoordelingen"</string>
     <string name="network_scorer_picker_none_preference" msgid="8894034333043177807">"Geen"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"Wifi-assistent wijzigen?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"<xliff:g id="NEW_APP">%1$s</xliff:g> gebruiken in plaats van <xliff:g id="CURRENT_APP">%2$s</xliff:g> om je netwerkverbindingen te beheren?"</string>

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 8800f93..76ed276 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml

@@ -4936,12 +4936,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"କାଷ୍ଟ କରିବା ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"VoLTE ବନ୍ଦ କରିବେ?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"ଏହା ଆପଣଙ୍କର 5G ସଂଯୋଗକୁ ବନ୍ଦ କରିଥାଏ। \nଭଏସ୍ କଲ୍ ସମୟରେ, ଆପଣ ଇଣ୍ଟର୍ନେଟ୍ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ ଏବଂ କିଛି ଆପ୍ କାମ କରିନପାରେ।"</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"2ଟି ସିମ୍ ବ୍ୟବହାର କରାଯାଉଥିବା ସମୟରେ, ଏହି ଫୋନ୍ 4Gରେ ସୀମିତ ରହିବ। "<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"2ଟି ସିମ୍ ବ୍ୟବହାର କରାଯାଉଥିବା ସମୟରେ, ଏହି ଟାବଲେଟ୍ 4Gରେ ସୀମିତ ରହିବ। "<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"2ଟି ସିମ୍ ବ୍ୟବହାର କରାଯାଉଥିବା ସମୟରେ, ଏହି ଡିଭାଇସ୍ 4Gରେ ସୀମିତ ରହିବ। "<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"କ୍ୟାଶ୍ ହୋଇଥିବା ଆପ୍ସ ପାଇଁ ଏକଜିକ୍ୟୁସନ ସସପେଣ୍ଡ କରନ୍ତୁ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"ସେଟିଂସରେ ସ୍କ୍ରିନ୍ ଓଭରଲେକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ସେଟିଂସ୍ ସ୍କ୍ରିନଗୁଡ଼ିକୁ ଓଭରଲେ କରିବାକୁ ସେହି ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ ଯାହା ଅନ୍ୟ ଆପ୍ସ ଉପରେ ଡିସପ୍ଲେ ହୋଇପାରିବ"</string>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 11afff3..a0334d1 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -4936,12 +4936,9 @@
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"ਕਾਸਟ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"ਕੀ VoLTE ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="volte_5G_limited_text" msgid="7150583768725182345">"ਇਹ ਤੁਹਾਡਾ 5G ਕਨੈਕਸ਼ਨ ਵੀ ਬੰਦ ਕਰ ਦਿੰਦਾ ਹੈ।\nਵੌਇਸ ਕਾਲ ਦੌਰਾਨ, ਤੁਸੀਂ ਇੰਟਰਨੈੱਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਅਤੇ ਕੁਝ ਐਪਾਂ ਸ਼ਾਇਦ ਨਾ ਚੱਲਣ।"</string>
-    <!-- no translation found for no_5g_in_dsds_text (772747677303920132) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (4757328474425714624) -->
-    <skip />
-    <!-- no translation found for no_5g_in_dsds_text (6983783505032683314) -->
-    <skip />
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"2 ਸਿਮ ਵਰਤਣ ਵੇਲੇ, ਇਹ ਫ਼ੋਨ 4G ਤੱਕ ਸੀਮਤ ਰਹੇਗਾ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"2 ਸਿਮ ਵਰਤਣ ਵੇਲੇ, ਇਹ ਟੈਬਲੈੱਟ 4G ਤੱਕ ਸੀਮਤ ਰਹੇਗਾ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"2 ਸਿਮ ਵਰਤਣ ਵੇਲੇ, ਇਹ ਡੀਵਾਈਸ 4G ਤੱਕ ਸੀਮਤ ਰਹੇਗਾ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"ਕੈਸ਼ੇ ਕੀਤੀਆਂ ਐਪਾਂ ਦਾ ਚੱਲਣਾ ਮੁਅੱਤਲ ਕਰੋ"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'ਸੈਟਿੰਗਾਂ\' \'ਤੇ ਸਕ੍ਰੀਨ ਓਵਰਲੇ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ਉਹਨਾਂ ਐਪਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ ਜੋ \'ਸੈਟਿੰਗਾਂ\' ਸਕ੍ਰੀਨਾਂ ਨੂੰ ਓਵਰਲੇ ਕਰਨ ਲਈ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c33d49e..0347ab6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -3553,7 +3553,7 @@
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversas com prioridade"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Aparecem na parte superior da secção de conversas e surgem como balões flutuantes."</string>
-    <string name="important_conversations_summary" msgid="3184022761562676418">"Aparecem na parte superior da secção de conversas."</string>
+    <string name="important_conversations_summary" msgid="3184022761562676418">"Aparecer na parte superior da secção de conversas."</string>
     <string name="other_conversations" msgid="7218658664423361043">"Outras conversas"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas às quais efetuou alterações."</string>
     <string name="important_bubble" msgid="7911698275408390846">"Apresentar conversas com prioridade como balão"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 373a272..6ea6e0c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -1385,7 +1385,7 @@
     <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"Stav batérie, siete a ďalšie informácie"</string>
     <string name="device_status_summary" product="default" msgid="8132661857066128832">"Telefónne číslo, signál atď."</string>
     <string name="storage_settings" msgid="7472188817781592677">"Úložisko"</string>
-    <string name="storage_settings_for_app" msgid="229425418984637483">"Úložisko a vyrovnávacia pamäť"</string>
+    <string name="storage_settings_for_app" msgid="229425418984637483">"Ukladací priestor a vyrovnávacia pamäť"</string>
     <string name="storage_usb_settings" msgid="7058142934214211583">"Úložisko"</string>
     <string name="storage_settings_title" msgid="486118156723194815">"Nastavenia úložiska"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"Odpojiť ukladací priestor USB a zobraziť dostupný ukladací priestor"</string>
@@ -1936,7 +1936,7 @@
     <string name="install_text" msgid="4558333621516996473">"Inštalovať"</string>
     <string name="disable_text" msgid="5146002260857428005">"Deaktivovať"</string>
     <string name="enable_text" msgid="8570798764647110430">"Povoliť"</string>
-    <string name="clear_user_data_text" msgid="6773186434260397947">"Vymazať priestor"</string>
+    <string name="clear_user_data_text" msgid="6773186434260397947">"Vymazať obsah úložiska"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Odinštalovať aktualizácie"</string>
     <string name="auto_launch_enable_text" msgid="286244432074382294">"Pre niektoré akcie ste sa rozhodli spúšťať túto aplikáciu ako predvolenú."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Tejto aplikácii ste povolili vytváranie miniaplikácií a pristupovanie k ich údajom."</string>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index e11e093..d1250f5 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -459,8 +459,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"ٹیبلٹ کی مرموز کاری کریں"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"فون کی مرموز کاری کریں"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"مرموز کاری کردہ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"‏آپ اپنے اکاؤنٹس، ترتیبات، ڈاؤن لوڈ کردہ ایپس اور ان کا ڈیٹا، میڈیا اور دوسری فائلیں مرموز کر سکتے ہیں۔ اپنا ٹیبلیٹ مرموز کر لینے کے بعد، یہ فرض کرتے ہوئے کہ آپ نے ایک اسکرین لاک (یعنی پیٹرن یا عددی PIN یا پاس ورڈ) سیٹ کرلیا ہے، آپ کو ہر دفعہ ٹیبلیٹ کا پاور آن کرنے پر اسے غیر موموز کرنے کیلئے اسکرین کو غیر مقفل کرنا ہوگا۔ غیر مرموز کرنے کا دوسرا واحد طریقہ یہ ہے کہ اپنے سبھی ڈیٹا کو حذف کرتے ہوئے فیکٹری ڈیٹا کی دوبارہ ترتیب کو انجام دیا جائے۔\n\nمرموز کرنے میں ایک گھنٹہ یا زیادہ وقت لگتا ہے۔ آپ کو ایک چارج شدہ بیٹری سے شروعات کرنی ہوگی اور اس پوری کارروائی کے دوران اپنے ٹیبلیٹ کو پلگ ان رکھیں۔ اگر آپ اس میں خلل ڈالتے ہیں تو آپ اپنے کچھ یا سبھی ڈیٹا سے محروم ہو جائیں گے۔"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"‏آپ اپنے اکاؤنٹس، ترتیبات، ڈاؤن لوڈ کردہ ایپس اور ان کا ڈیٹا، میڈیا اور دوسری فائلیں مرموز کر سکتے ہیں۔ اپنا فون مرموز کر لینے کے بعد، یہ فرض کرتے ہوئے کہ آپ نے ایک اسکرین لاک (یعنی پیٹرن یا عددی PIN یا پاس ورڈ) سیٹ کرلیا ہے، آپ کو ہر دفعہ فون کا پاور آن کرنے پر اسے غیر موموز کرنے کیلئے اسکرین کو غیر مقفل کرنا ہوگا۔ غیر مرموز کرنے کا دوسرا واحد طریقہ یہ ہے کہ اپنے سبھی ڈیٹا کو حذف کرتے ہوئے فیکٹری ڈیٹا کی دوبارہ ترتیب کو انجام دیا جائے۔\n\nمرموز کرنے میں ایک گھنٹہ یا زیادہ وقت لگتا ہے۔ آپ کو ایک چارج شدہ بیٹری سے شروعات کرنی ہوگی اور اس پوری کارروائی کے دوران اپنے فون کو پلگ ان رکھیں۔ اگر آپ اس میں خلل ڈالتے ہیں تو آپ اپنے کچھ یا سبھی ڈیٹا سے محروم ہو جائیں گے۔"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"‏آپ اپنے اکاؤنٹس، ترتیبات، ڈاؤن لوڈ کردہ ایپس اور ان کا ڈیٹا، میڈیا اور دوسری فائلیں مرموز کر سکتے ہیں۔ اپنا ٹیبلیٹ مرموز کر لینے کے بعد، یہ فرض کرتے ہوئے کہ آپ نے ایک اسکرین لاک (یعنی پیٹرن یا عددی PIN یا پاس ورڈ) سیٹ کرلیا ہے، آپ کو ہر دفعہ ٹیبلیٹ کا پاور آن کرنے پر اسے غیر موموز کرنے کیلئے اسکرین کو غیر مقفل کرنا ہوگا۔ غیر مرموز کرنے کا دوسرا واحد طریقہ یہ ہے کہ اپنے سبھی ڈیٹا کو حذف کرتے ہوئے فیکٹری ڈیٹا ری سیٹ کو انجام دیا جائے۔\n\nمرموز کرنے میں ایک گھنٹہ یا زیادہ وقت لگتا ہے۔ آپ کو ایک چارج شدہ بیٹری سے شروعات کرنی ہوگی اور اس پوری کارروائی کے دوران اپنے ٹیبلیٹ کو پلگ ان رکھیں۔ اگر آپ اس میں خلل ڈالتے ہیں تو آپ اپنے کچھ یا سبھی ڈیٹا سے محروم ہو جائیں گے۔"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"‏آپ اپنے اکاؤنٹس، ترتیبات، ڈاؤن لوڈ کردہ ایپس اور ان کا ڈیٹا، میڈیا اور دوسری فائلیں مرموز کر سکتے ہیں۔ اپنا فون مرموز کر لینے کے بعد، یہ فرض کرتے ہوئے کہ آپ نے ایک اسکرین لاک (یعنی پیٹرن یا عددی PIN یا پاس ورڈ) سیٹ کرلیا ہے، آپ کو ہر دفعہ فون کا پاور آن کرنے پر اسے غیر موموز کرنے کیلئے اسکرین کو غیر مقفل کرنا ہوگا۔ غیر مرموز کرنے کا دوسرا واحد طریقہ یہ ہے کہ اپنے سبھی ڈیٹا کو حذف کرتے ہوئے فیکٹری ڈیٹا ری سیٹ کو انجام دیا جائے۔\n\nمرموز کرنے میں ایک گھنٹہ یا زیادہ وقت لگتا ہے۔ آپ کو ایک چارج شدہ بیٹری سے شروعات کرنی ہوگی اور اس پوری کارروائی کے دوران اپنے فون کو پلگ ان رکھیں۔ اگر آپ اس میں خلل ڈالتے ہیں تو آپ اپنے کچھ یا سبھی ڈیٹا سے محروم ہو جائیں گے۔"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"ٹیبلٹ کی مرموز کاری کریں"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"فون کی مرموز کاری کریں"</string>
     <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"اپنی بیٹری چارج کریں اور دوبارہ کوشش کریں۔"</string>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index c63e8f9..afd9baf 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -3585,7 +3585,7 @@
     <string name="notification_channel_summary_low_lock" msgid="4009247523075328235">"Muhimlik darajasi past bildirishnomalarning chiqishi. Doim tovushsiz."</string>
     <string name="notification_channel_summary_low_status_lock" msgid="3668028634045057230">"Muhimlik darajasi past bildirishnomalarning chiqishi. Doim tovushsiz."</string>
     <string name="notification_channel_summary_high" msgid="3411637309360617621">"Telefon qulfi yechilsa, bildirishnomalar ekranning yuqori qismida banner sifatida chiqsin"</string>
-    <string name="notification_switch_label" msgid="8029371325967501557">"Barcha “<xliff:g id="APP_NAME">%1$s</xliff:g>” bildirishnomalari"</string>
+    <string name="notification_switch_label" msgid="8029371325967501557">"Barcha <xliff:g id="APP_NAME">%1$s</xliff:g> bildirishnomalari"</string>
     <string name="notification_app_switch_label" msgid="4422902423925084193">"Barcha <xliff:g id="APP_NAME">%1$s</xliff:g> bildirishnomalari"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"Moslashuvchan bildirishnomalar"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
@@ -3657,7 +3657,7 @@
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Bezovta qilinmasin ruxsatini berish"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Hech qanday ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="1458413761470945269">"Ilovalar yuklanmoqda…"</string>
-    <string name="app_notifications_off_desc" msgid="6691342160980435901">"Talabingizga binoa, Android bu ilova bildirishnomalarini ekranga chiqarmaydi"</string>
+    <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android ushbu ilova bildirishnomalarini ekranga chiqarmaydi"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Talabingizga binoan, Android bu turkumdagi bildirishnomalarni bloklamoqda"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Talabingizga binoan, Android bunday bildirishnomalar guruhini bloklaydi"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Turkumlar"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 056c320..14fb964 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -2157,7 +2157,7 @@
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"輕觸螢幕底部的無障礙工具按鈕 <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g>。\n\n如要切換不同的功能，請輕觸並按住無障礙工具按鈕。"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"請用 2 指從螢幕底部向上滑動。\n\n如要切換不同的功能，請用 2 指向上滑動並按住。"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"請用 3 指從螢幕底部向上滑動。\n\n如要切換不同的功能，請用 3 指向上滑動並按住。"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"按住音量鍵"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"按住音量調高鍵和調低鍵"</string>
     <string name="accessibility_shortcut_hardware_keyword" msgid="3921915304537166064">"按住音量調高鍵和調低鍵"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"同時按住音量調高鍵和調低鍵"</string>
     <string name="accessibility_shortcut_edit_dialog_title_triple_tap" msgid="6672798007229795841">"輕觸螢幕三下"</string>
@@ -2415,9 +2415,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"延長平板電腦的電池續航力"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"延長裝置的電池續航力"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"開啟 Battery Manager"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"開啟節約耗電量模式"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"開啟省電模式"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"電池電力可能會比平常更快耗盡"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"節約耗電量模式已開啟"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"省電模式已開啟"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"部分功能可能受到限制"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"手機使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板電腦使用率比平常高"</string>
@@ -2455,9 +2455,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"這個應用程式將會在背景耗用電量。你的電池電力可能會比預期更快耗盡。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"移除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"取消"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的手機會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的平板電腦會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，裝置會提供相關操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的手機會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的平板電腦會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，裝置會提供相關操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"自動管理應用程式"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"針對不常使用的應用程式限制電池用量"</string>
@@ -2550,7 +2550,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"試著連線至其他藍牙裝置"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"應用程式用電量"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"停止或解除安裝應用程式"</string>
-    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"選取節約耗電量模式"</string>
+    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"選取省電模式"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"應用程式可能會提供省電的設定"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"使用者用電量"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"其他電源用量"</string>
@@ -2581,23 +2581,23 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"重新整理"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"應用程式最佳化"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"節約耗電量"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"省電模式"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"自動開啟"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"未設定時間表"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"根據你平常充電的時間"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"根據電量百分比"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"如果電池電量可能會在你下次的例行充電時間前耗盡，系統就會開啟「節約耗電量」模式"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"如果電池電量可能會在你下次的例行充電時間前耗盡，系統就會開啟「省電」模式"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"將在電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時開啟"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"設定時間表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延長電池續航力"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"開啟"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"使用節約耗電量模式"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"使用省電模式"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"永遠不要"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時"</string>
@@ -3283,8 +3283,8 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"觸覺回饋, 震動, 螢幕, 敏感度"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"觸動回饋, 震動, 手機, 通話, 敏感度, 響鈴"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"觸動回饋, 震動, 敏感度"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"節約耗電量, 固定式, 保留, 省電功能, 電池"</string>
-    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 節約耗電量, 節約電量, 電池, 自動, 百分比"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"省電, 固定式, 保留, 省電模式, 電池"</string>
+    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 省電, 節約電量, 電池, 自動, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 進階通話功能, 4G 通話功能"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"新增語言, 新增一種語言"</string>
     <string name="default_sound" msgid="6604374495015245195">"預設音效"</string>
@@ -4226,7 +4226,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"已開啟零打擾模式"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"手機已設為靜音"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"允許例外"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"節約耗電量模式已開啟"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"省電模式已開啟"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"只能使用部分功能"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"行動數據已關閉"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"只能透過 Wi-Fi 使用網際網路"</string>
@@ -4403,8 +4403,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"已連線到多個裝置"</string>
     <string name="demo_mode" msgid="6566167465451386728">"系統 UI 示範模式"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"深色主題"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/因「節約耗電量」功能而暫時停用"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"因「節約耗電量」功能而暫時啟用"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/因「省電模式」而暫時停用"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"因「省電模式」而暫時啟用"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"支援的應用程式也會切換為深色主題"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"我知道了"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"試用深色主題"</string>

diff --git a/src/com/android/settings/sound/MediaControlsParentPreferenceController.java b/src/com/android/settings/sound/MediaControlsParentPreferenceController.java
index 9aebd75..acdfb56 100644
--- a/src/com/android/settings/sound/MediaControlsParentPreferenceController.java
+++ b/src/com/android/settings/sound/MediaControlsParentPreferenceController.java

@@ -18,8 +18,6 @@
 
 import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME;
 
-import static com.android.settings.sound.MediaControlsPreferenceController.useQsMediaPlayer;
-
 import android.content.Context;
 import android.provider.Settings;
 
@@ -37,7 +35,7 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return useQsMediaPlayer(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return AVAILABLE;
     }
 
     @Override

diff --git a/src/com/android/settings/sound/MediaControlsPreferenceController.java b/src/com/android/settings/sound/MediaControlsPreferenceController.java
index 2e8b163..050cf93 100644
--- a/src/com/android/settings/sound/MediaControlsPreferenceController.java
+++ b/src/com/android/settings/sound/MediaControlsPreferenceController.java

@@ -16,7 +16,6 @@
 
 package com.android.settings.sound;
 
-import static android.provider.Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS;
 import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME;
 
 import android.content.Context;
@@ -47,11 +46,6 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return useQsMediaPlayer(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    protected static boolean useQsMediaPlayer(Context context) {
-        return Settings.Global.getInt(context.getContentResolver(),
-                SHOW_MEDIA_ON_QUICK_SETTINGS, 1) > 0;
+        return AVAILABLE;
     }
 }

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 910917a..9669190 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java

@@ -1064,6 +1064,7 @@
             }
             return true;
         } else if (pref == mAddGuest) {
+            mAddGuest.setEnabled(false); // prevent multiple tap issue
             UserInfo guest = mUserManager.createGuest(
                     getContext(), getString(com.android.settingslib.R.string.user_guest));
             openUserDetails(guest, true);

diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java
index 90f1dbd..aeb779f 100644
--- a/src/com/android/settings/widget/AppSwitchPreference.java
+++ b/src/com/android/settings/widget/AppSwitchPreference.java

@@ -36,7 +36,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }

diff --git a/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
index c5e0217..f4c3a14 100644
--- a/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
+++ b/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java

@@ -52,7 +52,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }

diff --git a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
index a4e3c6e..1b4d681 100644
--- a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
+++ b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java

@@ -50,7 +50,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }

diff --git a/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java
index a1a3f12..d9edee2 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaControlsParentPreferenceControllerTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.sound;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -67,20 +66,7 @@
     }
 
     @Test
-    public void getAvailability_flagNotEnabled_returnUnsupportedOnDevice() {
-        // When the qs_media flag is not enabled
-        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0);
-
-        // Then the media resume option should not appear
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
-    }
-
-    @Test
-    public void getAvailability_flagEnabled_returnAvailable() {
-        // When the qs_media flag is enabled
-        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
-
-        // Then the media resume option should appear
+    public void getAvailability_returnAvailable() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 

diff --git a/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
index ff35ebf..b8cc709 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.sound;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -65,20 +64,7 @@
     }
 
     @Test
-    public void getAvailability_flagNotEnabled_returnUnsupportedOnDevice() {
-        // When the qs_media flag is not enabled
-        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0);
-
-        // Then the media resume option should not appear
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
-    }
-
-    @Test
-    public void getAvailability_flagEnabled_returnAvailable() {
-        // When the qs_media flag is enabled
-        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
-
-        // Then the media resume option should appear
+    public void getAvailability_returnAvailable() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }