diff --git a/overlay/frameworks/base/core/res/res/values-ast-rES/strings.xml b/overlay/frameworks/base/core/res/res/values-ast-rES/strings.xml
index e2cd0c4..c03de8a 100644
--- a/overlay/frameworks/base/core/res/res/values-ast-rES/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-ast-rES/strings.xml
@@ -688,7 +688,6 @@
     <string name="biometric_not_recognized">Nun se reconoz</string>
     <string name="biometric_error_canceled">Encaboxóse l\'autenticación</string>
     <string name="biometric_error_device_not_secured">Nun s\'afitó nengún PIN, patrón o contraseña</string>
-    <string name="fingerprint_acquired_insufficient">Nun se pudo procesar la buelga. Volvi tentalo.</string>
     <string name="fingerprint_acquired_too_slow">El deu movióse perdespacio. Volvi tentalo.</string>
     <string name="fingerprint_acquired_already_enrolled">Prueba otra buelga</string>
     <string-array name="fingerprint_acquired_vendor"/>
@@ -696,12 +695,8 @@
     <string name="face_authenticated_no_confirmation_required">Autenticóse la cara</string>
     <string name="face_authenticated_confirmation_required">Autenticóse la cara, primi «Confirmar»</string>
     <string name="fingerprint_error_hw_not_available">El hardware de buelgues nun ta disponible.</string>
-    <string name="fingerprint_error_timeout">Escosó\'l tiempu d\'espera de la buelga. Volvi tentalo.</string>
     <string name="fingerprint_error_canceled">Encaboxóse la operación de buelga.</string>
     <string name="fingerprint_error_user_canceled">L\'usuariu encaboxó la operación de la buelga.</string>
-    <string name="fingerprint_error_lockout">Ficiéronse milenta intentos. Volvi tentalo.</string>
-    <string name="fingerprint_error_lockout_permanent">Ficiéronse milenta intentos. Inhabilitóse\'l sensor de buelgues.</string>
-    <string name="fingerprint_error_unable_to_process">Volvi tentalo.</string>
     <string name="fingerprint_error_no_fingerprints">Nun se rexistró nenguna buelga.</string>
     <string name="fingerprint_error_hw_not_present">Esti preséu nun tien nengún sensor de buelgues.</string>
     <string name="fingerprint_error_security_update_required">El sensor desactivóse temporalmente.</string>
@@ -1379,6 +1374,7 @@
     <string name="android_preparing_apk">Tresnando «<xliff:g id="appname">%1$s</xliff:g>».</string>
     <string name="android_upgrading_starting_apps">Aniciando les aplicaciones.</string>
     <string name="android_upgrading_complete">Finando l\'arrinque.</string>
+    <string name="fp_power_button_enrollment_button_text">Desactivar</string>
     <string name="fp_power_button_bp_negative_button">Siguir</string>
     <string name="heavy_weight_notification">«<xliff:g id="app">%1$s</xliff:g>» ta n\'execución</string>
     <string name="heavy_weight_notification_detail">Toca pa volver al xuegu</string>
@@ -1541,16 +1537,11 @@
     <string name="ext_media_new_notification_title" product="automotive">«<xliff:g id="name" example="SD card">%s</xliff:g>» nun funciona</string>
     <string name="ext_media_new_notification_message">Toca pa configurar</string>
     <string name="ext_media_new_notification_message" product="automotive">Quiciabes tengas de volver formatiar el preséu. Toca pa espulsalu.</string>
-    <string name="ext_media_ready_notification_message">Pa tresferir ficheros multimedia</string>
     <string name="ext_media_unmountable_notification_title">Hai problemes con «<xliff:g id="name" example="SD card">%s</xliff:g>»</string>
     <string name="ext_media_unmountable_notification_title" product="automotive">«<xliff:g id="name" example="SD card">%s</xliff:g>» nun funciona</string>
     <string name="ext_media_unmountable_notification_message">Toca pa igualu</string>
     <string name="ext_media_unmountable_notification_message" product="tv">El mediu «<xliff:g id="name" example="SD card">%s</xliff:g>» ta toyíu. Esbilla esti avisu pa igualu.</string>
     <string name="ext_media_unmountable_notification_message" product="automotive">Quiciabes tengas de volver formatiar el preséu. Toca pa espulsalu.</string>
-    <string name="ext_media_unsupported_notification_title">«<xliff:g id="name" example="SD card">%s</xliff:g>» nun ye compatible</string>
-    <string name="ext_media_unsupported_notification_title" product="automotive">«<xliff:g id="name" example="SD card">%s</xliff:g>» nun funciona</string>
-    <string name="ext_media_unsupported_notification_message">Esti preséu nun ye compatible col mediu «<xliff:g id="name" example="SD card">%s</xliff:g>». Toca pa configuralu con un formatu compatible.</string>
-    <string name="ext_media_unsupported_notification_message" product="automotive">Quiciabes tengas de volver formatiar el preséu</string>
     <string name="ext_media_badremoval_notification_title">«<xliff:g id="name" example="SD card">%s</xliff:g>» estráxose inesperadamente</string>
     <string name="ext_media_badremoval_notification_message">Espulsa\'l mediu enantes d\'estrayelu pa evitar la perda del conteníu</string>
     <string name="ext_media_nomedia_notification_title">Estráxose\'l mediu «<xliff:g id="name" example="SD card">%s</xliff:g>»</string>
@@ -2095,6 +2086,7 @@
     <string name="country_selection_title">Preferencia rexonal</string>
     <string name="search_language_hint">Nome de la llingua</string>
     <string name="language_picker_section_suggested">Suxerse</string>
+    <string name="language_picker_regions_section_suggested">Suxerse</string>
     <string name="language_picker_section_all">Toles llingües</string>
     <string name="region_picker_section_all">Toles rexones</string>
     <string name="locale_search_menu">Buscar</string>
diff --git a/overlay/frameworks/base/core/res/res/values-cy/strings.xml b/overlay/frameworks/base/core/res/res/values-cy/strings.xml
index b388eab..eced81c 100644
--- a/overlay/frameworks/base/core/res/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-cy/strings.xml
@@ -587,7 +587,6 @@
     <string name="screen_lock_app_setting_name">Defnyddio clo sgrin</string>
     <string name="screen_lock_dialog_default_subtitle">Rho dy glo sgrin i barhau</string>
     <string name="fingerprint_acquired_partial">Pwysa\'n gadarn ar y synhwyrydd</string>
-    <string name="fingerprint_acquired_insufficient">Methwyd â phrosesu\'r ôl bys. Rho gynnig arall arni.</string>
     <string name="fingerprint_acquired_imager_dirty">Glanha\'r synhwyrydd ôl bys a cheisio eto</string>
     <string name="fingerprint_acquired_imager_dirty_alt">Glanha\'r synhwyrydd a cheisio eto</string>
     <string name="fingerprint_acquired_too_fast">Pwysa\'n gadarn ar y synhwyrydd</string>
@@ -604,12 +603,8 @@
     <string name="face_authenticated_confirmation_required">Dilyswyd y wyneb; Rhaid ei gadarnhau</string>
     <string name="fingerprint_error_hw_not_available">Does dim caledwedd ôl bys ar gael.</string>
     <string name="fingerprint_error_no_space">Methu â gosod ôl bys</string>
-    <string name="fingerprint_error_timeout">Mae\'r cyfnod amser wedi dod i ben. Rho gynnig arall arni.</string>
     <string name="fingerprint_error_canceled">Diddymwyd y weithred ôl bys.</string>
     <string name="fingerprint_error_user_canceled">Diddymwyd y weithred ôl bys gan y defnyddiwr.</string>
-    <string name="fingerprint_error_lockout">Gormod o ymdrechion. Rho gynnig arall arni\'n hwyrach.</string>
-    <string name="fingerprint_error_lockout_permanent">Gormod o ymdrechion. Mae\'r synhwyrydd ôl bys wedi\'i analluogi.</string>
-    <string name="fingerprint_error_unable_to_process">Ceisia eto.</string>
     <string name="fingerprint_error_no_fingerprints">Dim olion bysedd wedi\'u cofrestru.</string>
     <string name="fingerprint_error_hw_not_present">Nid oes gan y ddyfais hon synhwyrydd ôl bys.</string>
     <string name="fingerprint_error_security_update_required">Synhwyrydd wedi\'i analluogi dros dro.</string>
@@ -1251,9 +1246,7 @@
     <string name="android_preparing_apk">Yn paratoi <xliff:g id="appname">%1$s</xliff:g>...</string>
     <string name="android_upgrading_starting_apps">Yn cychwyn apiau...</string>
     <string name="android_upgrading_complete">Yn cwblhau pethau...</string>
-    <string name="fp_power_button_enrollment_title">Parhau â\'r gosod?</string>
-    <string name="fp_power_button_enrollment_positive_button">Troi\'r sgrin i ffwrdd</string>
-    <string name="fp_power_button_enrollment_negative_button">Parhau â\'r gosod</string>
+    <string name="fp_power_button_enrollment_button_text">Troi i ffwrdd</string>
     <string name="fp_power_button_bp_positive_button">Troi\'r sgrin i ffwrdd</string>
     <string name="fp_power_button_bp_negative_button">Parhau</string>
     <string name="heavy_weight_notification"><xliff:g id="app">%1$s</xliff:g> yn rhedeg</string>
@@ -1401,18 +1394,11 @@
     <string name="ext_media_new_notification_message">Tapia i\'w osod</string>
     <string name="ext_media_new_notification_message" product="tv">Dewisa i\'w osod</string>
     <string name="ext_media_new_notification_message" product="automotive">Efallai fod angen ailfformatio’r ddyfais. Tapia i\'w fwrw allan.</string>
-    <string name="ext_media_ready_notification_message">I drosglwyddo lluniau a chyfryngau</string>
-    <string name="ext_media_ready_notification_message" product="tv">Pori ffeiliau cyfryngau</string>
     <string name="ext_media_unmountable_notification_title">Problem gyda <xliff:g id="name" example="SD card">%s</xliff:g></string>
     <string name="ext_media_unmountable_notification_title" product="automotive">Nid yw <xliff:g id="name" example="SD card">%s</xliff:g> yn gweithio</string>
     <string name="ext_media_unmountable_notification_message">Tapia i drwsio</string>
     <string name="ext_media_unmountable_notification_message" product="tv">Mae <xliff:g id="name" example="SD card">%s</xliff:g> yn llwgr. Dewisa i drwsio.</string>
     <string name="ext_media_unmountable_notification_message" product="automotive">Efallai fod angen ailfformatio’r ddyfais. Tapia i\'w fwrw allan</string>
-    <string name="ext_media_unsupported_notification_title"><xliff:g id="name" example="SD card">%s</xliff:g> anghydnaws</string>
-    <string name="ext_media_unsupported_notification_title" product="automotive">Nid yw <xliff:g id="name" example="SD card">%s</xliff:g> yn gweithio</string>
-    <string name="ext_media_unsupported_notification_message">Nid yw\'r ddyfais hon yn cefnogi\'r <xliff:g id="name" example="SD card">%s</xliff:g> yma. Tapia i\'w osod mewn fformat sy\'n gydnaws.</string>
-    <string name="ext_media_unsupported_notification_message" product="tv">Dewisa i osod <xliff:g id="name" example="SD card">%s</xliff:g> mewn fformat a chefnogir.</string>
-    <string name="ext_media_unsupported_notification_message" product="automotive">Efallai fod angen ailfformatio’r ddyfais.</string>
     <string name="ext_media_badremoval_notification_title">Tynnwyd <xliff:g id="name" example="SD card">%s</xliff:g> yn annisgwyl</string>
     <string name="ext_media_badremoval_notification_message">Dadfowntia gyfrwng cyn ei dynnu allan er mwyn osgoi golli data</string>
     <string name="ext_media_nomedia_notification_title">Cafodd <xliff:g id="name" example="SD card">%s</xliff:g> ei dynnu</string>
@@ -1935,6 +1921,7 @@
     <string name="country_selection_title">Dewis rhanbarth</string>
     <string name="search_language_hint">Rho enw iaith</string>
     <string name="language_picker_section_suggested">Awgrymiadau</string>
+    <string name="language_picker_regions_section_suggested">Awgrymiadau</string>
     <string name="language_picker_section_all">Pob iaith</string>
     <string name="region_picker_section_all">Pob rhanbarth</string>
     <string name="locale_search_menu">Chwilio</string>
@@ -1955,12 +1942,6 @@
     <string name="app_streaming_blocked_title_for_settings_dialog" product="tv">Gosodiadau Android TV ddim ar gael</string>
     <string name="app_streaming_blocked_title_for_settings_dialog" product="tablet">Gosodiadau llechen ddim ar gael</string>
     <string name="app_streaming_blocked_title_for_settings_dialog" product="default">Gosodiadau ffôn ddim ar gael</string>
-    <string name="app_streaming_blocked_message" product="tv">Nid oes modd cyrchu hwn ar dy <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Rho gynnig ar dy Deledu Android yn lle.</string>
-    <string name="app_streaming_blocked_message" product="tablet">Nid oes modd cyrchu hwn ar dy <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Rho gynnig ar dy lechen yn lle.</string>
-    <string name="app_streaming_blocked_message" product="default">Nid oes modd cyrchu hwn ar dy <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Rho gynnig ar dy ffôn yn lle.</string>
-    <string name="app_streaming_blocked_message_for_permission_dialog" product="tv">Nid oes modd cyrchu hwn ar dy <xliff:g id="device" example="Chromebook">%1$s</xliff:g> ar hyn o bryd. Rho gynnig ar dy ddyfais Android TV yn lle.</string>
-    <string name="app_streaming_blocked_message_for_permission_dialog" product="tablet">Nid oes modd cyrchu hwn ar dy <xliff:g id="device" example="Chromebook">%1$s</xliff:g> ar hyn o bryd. Rho gynnig ar dy lechen yn lle.</string>
-    <string name="app_streaming_blocked_message_for_permission_dialog" product="default">Nid oes modd cyrchu hwn ar dy <xliff:g id="device" example="Chromebook">%1$s</xliff:g> ar hyn o bryd. Rho gynnig ar dy ffôn yn lle.</string>
     <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv">Mae\'r ap yn ymofyn diogelwch ychwanegol. Rho gynnig ar dy ddyfais Android TV yn lle.</string>
     <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet">Mae\'r ap yn ymofyn diogelwch ychwanegol. Rho gynnig ar dy lechen yn lle.</string>
     <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default">Mae\'r ap yn ymofyn diogelwch ychwanegol. Rho gynnig ar dy ffôn yn lle.</string>
diff --git a/overlay/frameworks/base/core/res/res/values-gd/strings.xml b/overlay/frameworks/base/core/res/res/values-gd/strings.xml
index a4f7c26..17a772e 100644
--- a/overlay/frameworks/base/core/res/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-gd/strings.xml
@@ -666,19 +666,14 @@
     <string name="biometric_not_recognized">Gun aithneachadh</string>
     <string name="biometric_error_canceled">Chaidh sgur dhen dearbhadh</string>
     <string name="biometric_error_device_not_secured">Cha deach PIN, pàtran no facal-faire a shuidheachadh</string>
-    <string name="fingerprint_acquired_insufficient">Cha b’ urrainn dhuinn an lorg-mheòir a phròiseasadh. Feuch ris a-rithist.</string>
     <string name="fingerprint_acquired_too_slow">Ghluais do mheur ro shlaodach. Feuch ris a-rithist.</string>
     <string-array name="fingerprint_acquired_vendor"/>
     <string name="fingerprint_authenticated">Chaidh an lorg-mheòir a dhearbhadh</string>
     <string name="face_authenticated_no_confirmation_required">Chaidh an t-aodann a dhearbhadh</string>
     <string name="face_authenticated_confirmation_required">Chaidh an t-aodann a dhearbhadh, brùth air “Dearbh”</string>
     <string name="fingerprint_error_hw_not_available">Chan eil bathar-cruaidh luirge-meòir ri fhaighinn.</string>
-    <string name="fingerprint_error_timeout">Dh’fhalbh an ùine air an lorg-mheòir. Feuch ris a-rithist.</string>
     <string name="fingerprint_error_canceled">Chaidh sgur de dh’obrachadh na luirge-meòir.</string>
     <string name="fingerprint_error_user_canceled">Sguir cleachdaiche de ghnìomh an luirg-mheòir.</string>
-    <string name="fingerprint_error_lockout">Cus oidhirpean. Feuch ris a-rithist an ceann greis.</string>
-    <string name="fingerprint_error_lockout_permanent">Cus oidhirpean</string>
-    <string name="fingerprint_error_unable_to_process">Feuch ris a-rithist.</string>
     <string name="fingerprint_error_no_fingerprints">Cha deach lorg-mheòir sam bith a chlàradh.</string>
     <string name="fingerprint_error_hw_not_present">Chan eil mothaichear luirg-mheòir aig an uidheam seo.</string>
     <string name="fingerprint_error_security_update_required">Chaidh am mothaichear a chur à comas greis.</string>
@@ -1340,6 +1335,7 @@
     <string name="android_preparing_apk">Ag ullachadh <xliff:g id="appname">%1$s</xliff:g>.</string>
     <string name="android_upgrading_starting_apps">A’ tòiseachadh nan aplacaidean.</string>
     <string name="android_upgrading_complete">A’ crìochnachadh a’ bhùtaidh.</string>
+    <string name="fp_power_button_enrollment_button_text">Cuir dheth</string>
     <string name="fp_power_button_bp_negative_button">Lean air adhart</string>
     <string name="heavy_weight_notification">Tha <xliff:g id="app">%1$s</xliff:g> a’ ruith</string>
     <string name="heavy_weight_notification_detail">Thoir gnogag gus tilleadh dhan gheama</string>
@@ -1499,16 +1495,11 @@
     <string name="ext_media_new_notification_title" product="automotive">Chan eil <xliff:g id="name" example="SD card">%s</xliff:g> ag obair</string>
     <string name="ext_media_new_notification_message">Thoir gnogag gus a shuidheachadh</string>
     <string name="ext_media_new_notification_message" product="automotive">Dh’fhaoidte gum bi agad ris an uidheam ath-fhòrmatadh. Thoir gnogag gus a ghluasad a-mach.</string>
-    <string name="ext_media_ready_notification_message">A chùm dealbhan is meadhanan a thar-chur</string>
     <string name="ext_media_unmountable_notification_title">Tha duilgheadas le <xliff:g id="name" example="SD card">%s</xliff:g></string>
     <string name="ext_media_unmountable_notification_title" product="automotive">Chan eil <xliff:g id="name" example="SD card">%s</xliff:g> ag obair</string>
     <string name="ext_media_unmountable_notification_message">Thoir gnogag gus a chàradh</string>
     <string name="ext_media_unmountable_notification_message" product="tv">Tha <xliff:g id="name" example="SD card">%s</xliff:g> coirbte. Tagh airson càradh.</string>
     <string name="ext_media_unmountable_notification_message" product="automotive">Dh’fhaoidte gum bi agad ris an uidheam ath-fhòrmatadh. Thoir gnogag gus a ghluasad a-mach.</string>
-    <string name="ext_media_unsupported_notification_title">Chan eil taic ri <xliff:g id="name" example="SD card">%s</xliff:g></string>
-    <string name="ext_media_unsupported_notification_title" product="automotive">Chan eil <xliff:g id="name" example="SD card">%s</xliff:g> ag obair</string>
-    <string name="ext_media_unsupported_notification_message">Cha chuir an t-uidheam seo taic ris a’ <xliff:g id="name" example="SD card">%s</xliff:g> seo. Thoir gnogag gus a shuidheachadh ann am fòrmat ris a bheil taic.</string>
-    <string name="ext_media_unsupported_notification_message" product="automotive">Dh’fhaoidte gum bi agad ris an uidheam ath-fhòrmatadh</string>
     <string name="ext_media_badremoval_notification_title">Chaidh <xliff:g id="name" example="SD card">%s</xliff:g> a thoirt air falbh gun dùil</string>
     <string name="ext_media_badremoval_notification_message">Gluais a-mach am meadhan mus doir thu air falbh e ach nach caill thu susbaint</string>
     <string name="ext_media_nomedia_notification_title">Chaidh <xliff:g id="name" example="SD card">%s</xliff:g> a thoirt air falbh</string>
@@ -2036,6 +2027,7 @@
     <string name="country_selection_title">Prìomh-roinn-dùthcha</string>
     <string name="search_language_hint">Cuir a-steach ainm cànain</string>
     <string name="language_picker_section_suggested">Na mholamaid</string>
+    <string name="language_picker_regions_section_suggested">Na mholamaid</string>
     <string name="language_picker_section_all">Na h-uile cànan</string>
     <string name="region_picker_section_all">Na h-uile roinn-dùthcha</string>
     <string name="locale_search_menu">Lorg</string>
diff --git a/overlay/frameworks/base/core/res/res/values-kab-rDZ/strings.xml b/overlay/frameworks/base/core/res/res/values-kab-rDZ/strings.xml
index 881581f..d435e58 100644
--- a/overlay/frameworks/base/core/res/res/values-kab-rDZ/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-kab-rDZ/strings.xml
@@ -174,7 +174,6 @@
     <string name="permlab_readPhoneNumbers">ɣeṛ uṭṭunen n tiliɣri</string>
     <string name="permlab_setWallpaper">sbadu tugna n ugilal</string>
     <string-array name="fingerprint_acquired_vendor"/>
-    <string name="fingerprint_error_unable_to_process">Ɛṛeḍ tikelt nniḍen.</string>
     <string-array name="fingerprint_error_vendor"/>
     <string-array name="face_acquired_vendor"/>
     <string-array name="face_error_vendor"/>
@@ -388,6 +387,7 @@
     <string name="wait">Rǧu</string>
     <string name="screen_compat_mode_scale">Sellum</string>
     <string name="unsupported_compile_sdk_check_update">Nadi lqem</string>
+    <string name="fp_power_button_enrollment_button_text">Sens</string>
     <string name="fp_power_button_bp_negative_button">Kemmel</string>
     <string name="sendText">Fren tigawt i uḍris</string>
     <string name="volume_music">Imesli n umidya</string>
@@ -531,6 +531,7 @@
     <string name="default_notification_channel_label">War-taggayt</string>
     <string name="language_selection_title">Rnu tutlayt</string>
     <string name="language_picker_section_suggested">Asumer</string>
+    <string name="language_picker_regions_section_suggested">Asumer</string>
     <string name="language_picker_section_all">Akk tutlayin</string>
     <string name="locale_search_menu">Nadi</string>
     <string name="app_suspended_more_details">Issin ugar</string>
diff --git a/overlay/frameworks/base/core/res/res/values-sc-rIT/strings.xml b/overlay/frameworks/base/core/res/res/values-sc-rIT/strings.xml
index 1f63b4c..2e5b1d9 100644
--- a/overlay/frameworks/base/core/res/res/values-sc-rIT/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-sc-rIT/strings.xml
@@ -216,6 +216,7 @@
     <string name="permgroupdesc_calendar">atzede a su calendàriu tuo</string>
     <string name="permgrouplab_sms">SMS</string>
     <string name="permgroupdesc_sms">imbia e visualiza messàgios SMS</string>
+    <string name="permgrouplab_storage">Archìvios</string>
     <string name="permgrouplab_microphone">Micròfonu</string>
     <string name="permgrouplab_camera">Fotocàmera</string>
     <string name="permgroupdesc_camera">faghe fotografias e registra vìdeos</string>
@@ -456,14 +457,10 @@
     <string name="permlab_useFingerprint">impreare s\'imprenta de pòddighe</string>
     <string name="permdesc_useFingerprint">Permitit a s\'aplicatzione de impreare s\'imprenta de pòddighe pro s\'autenticatzione</string>
     <string name="biometric_dialog_default_title">Verìfica chi ses tue</string>
-    <string name="fingerprint_acquired_insufficient">No at fatu a protzessare s\'imprenta de pòddighe. Torra a proare.</string>
     <string name="fingerprint_acquired_too_slow">Su pòddighe s\'est mòvidu tropu a bellu. Torra a proare.</string>
     <string-array name="fingerprint_acquired_vendor"/>
     <string name="fingerprint_error_hw_not_available">S\'imprenta de pòddighe no est a disponimentu.</string>
-    <string name="fingerprint_error_timeout">Tempus pro s\'imprenta de pòddighe logradu. Torra a proare.</string>
     <string name="fingerprint_error_canceled">Operatzione de s\'imprenta de pòddighe annullada.</string>
-    <string name="fingerprint_error_lockout">Tropu tentativos. Torra·bi a proare.</string>
-    <string name="fingerprint_error_unable_to_process">Torra a proare.</string>
     <string name="fingerprint_error_security_update_required">Sensore disabilitadu in manera temporànea.</string>
     <string name="fingerprint_name_template">Pòddighe <xliff:g id="fingerId" example="1">%d</xliff:g></string>
     <string-array name="fingerprint_error_vendor"/>
@@ -1031,11 +1028,6 @@
     <string name="console_running_notification_message">Sa prestatzione est influentziada. Pro disabilitare, controlla su bootloader.</string>
     <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
     <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-    <string name="ext_media_ready_notification_message">Pro tràmudas de fotografias e cuntenutos multimediales</string>
-    <string name="ext_media_unsupported_notification_title">Non suportadu <xliff:g id="name" example="SD card">%s</xliff:g></string>
-    <string name="ext_media_unsupported_notification_title" product="automotive"><xliff:g id="name" example="SD card">%s</xliff:g> no est funtzionende</string>
-    <string name="ext_media_unsupported_notification_message">Custu dispositivu non suportat custa <xliff:g id="name" example="SD card">%s</xliff:g>. Toca pro impostare su formadu suportadu.</string>
-    <string name="ext_media_unsupported_notification_message" product="automotive">Dias pòdere dèpere torrare a formatare su dispositivu</string>
     <string name="ext_media_badremoval_notification_title"><xliff:g id="name" example="SD card">%s</xliff:g> bogadu in manera ispantosa</string>
     <string name="ext_media_unmounting_notification_message">Non boghes</string>
     <string name="ext_media_init_action">Imposta</string>
@@ -1250,9 +1242,11 @@
     </string>
     <string name="accessibility_shortcut_menu_item_status_on">ATIVU</string>
     <string name="accessibility_shortcut_menu_item_status_off">DISATIVADU</string>
+    <string name="accessibility_service_screen_control_title">Visualizatzione e controllu de s\'ischermu</string>
     <string name="accessibility_dialog_button_allow">Permite</string>
     <string name="accessibility_dialog_button_deny">Nega</string>
     <string name="done_accessibility_shortcut_menu_button">Fatu</string>
+    <string name="accessibility_button_prompt_text">Sèbera una funtzione de impreare cando tocas su butone de atzessibilidade:</string>
     <string name="user_switched">Utente atuale <xliff:g id="name" example="Bob">%1$s</xliff:g>.</string>
     <string name="user_switching_message">Passende a <xliff:g id="name" example="Bob">%1$s</xliff:g>\u2026</string>
     <string name="owner_name" msgid="3879126011135546571">Mere</string>
@@ -1461,6 +1455,10 @@
     <string name="PERSOSUBSTATE_RUIM_RUIM_ENTRY">PIN de isblocu de sa RUIM</string>
     <string name="PERSOSUBSTATE_RUIM_NETWORK1_PUK_ENTRY">Inserta PUK</string>
     <string name="PERSOSUBSTATE_RUIM_NETWORK2_PUK_ENTRY">Inserta PUK</string>
+    <string name="PERSOSUBSTATE_RUIM_HRPD_PUK_ENTRY">Inserta PUK</string>
+    <string name="PERSOSUBSTATE_RUIM_RUIM_PUK_ENTRY">Inserta PUK</string>
+    <string name="PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK_IN_PROGRESS">Rechesta de isblocu PUK\u2026</string>
+    <string name="PERSOSUBSTATE_SIM_CORPORATE_PUK_ERROR">Errore in s\'isblocu PUK.</string>
     <string name="PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK_ERROR">Errore in s\'isblocu PUK.</string>
     <string name="PERSOSUBSTATE_SIM_SIM_PUK_ERROR">Errore in s\'isblocu PUK.</string>
     <string name="PERSOSUBSTATE_RUIM_NETWORK1_PUK_ERROR">Errore in s\'isblocu PUK.</string>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/arrays.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/arrays.xml
index 6ffd8b7..bfd440f 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/arrays.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -90,6 +90,8 @@
         <item>Audiu <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g></item>
         <item>Audiu <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_hd">aptX™ HD</xliff:g></item>
         <item>LDAC</item>
+        <item>LC3</item>
+        <item>Opus</item>
     </string-array>
     <string-array name="bluetooth_a2dp_codec_summaries">
         <item>Usar la esbilla del sistema (por defeutu)</item>
@@ -98,6 +100,8 @@
         <item>Audiu <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g></item>
         <item>Audiu <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_hd">aptX™ HD</xliff:g></item>
         <item>LDAC</item>
+        <item>LC3</item>
+        <item>Opus</item>
     </string-array>
     <string-array name="bluetooth_a2dp_codec_sample_rate_titles">
         <item>Usar la esbilla del sistema (por defeutu)</item>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/strings.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/strings.xml
index 223a9e4..83066cb 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-ast-rES/strings.xml
@@ -91,8 +91,6 @@
     <string name="bluetooth_profile_opp">Tresferencia de ficheros</string>
     <string name="bluetooth_profile_hid">Preséu d\'entrada</string>
     <string name="bluetooth_profile_pan">Accesu a internet</string>
-    <string name="bluetooth_profile_pbap">Compartición de contautos</string>
-    <string name="bluetooth_profile_pbap_summary">Úsase pa compartir contautos</string>
     <string name="bluetooth_profile_pan_nap">Compartición de la conexón a internet</string>
     <string name="bluetooth_profile_map">Mensaxes de testu</string>
     <string name="bluetooth_profile_sap">Accesu a la SIM</string>
@@ -462,6 +460,7 @@
     <string name="battery_info_status_charging_fast">En carga, rápida</string>
     <string name="battery_info_status_charging_slow">En carga, lenta</string>
     <string name="battery_info_status_charging_wireless">En carga, ensin filos</string>
+    <string name="battery_info_status_charging_dock">En carga</string>
     <string name="battery_info_status_discharging">Nun ta en carga</string>
     <string name="disabled_by_admin_summary_text">Opción controlada pol alministrador</string>
     <string name="disabled">Desactivóse</string>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-cy/arrays.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-cy/arrays.xml
index a42c076..4514ec9 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-cy/arrays.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-cy/arrays.xml
@@ -90,6 +90,8 @@
         <item>Sain <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g></item>
         <item>Sain <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™ HD</xliff:g></item>
         <item>LDAC</item>
+        <item>LC3</item>
+        <item>Opus</item>
     </string-array>
     <string-array name="bluetooth_a2dp_codec_summaries">
         <item>Defnyddio Dewis y System (Rhagosodiad)</item>
@@ -98,6 +100,8 @@
         <item>Sain <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g></item>
         <item>Sain <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™ HD</xliff:g></item>
         <item>LDAC</item>
+        <item>LC3</item>
+        <item>Opus</item>
     </string-array>
     <string-array name="bluetooth_a2dp_codec_sample_rate_titles">
         <item>Defnyddio Dewis y System (Rhagosodiad)</item>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
index 19b4450..83a8612 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
@@ -92,8 +92,6 @@
     <string name="bluetooth_profile_opp">Trosglwyddo ffeiliau</string>
     <string name="bluetooth_profile_hid">Dyfeisiau mewnbwn</string>
     <string name="bluetooth_profile_pan">Mynediad at y rhyngrwyd</string>
-    <string name="bluetooth_profile_pbap">Rhannu cysylltiadau</string>
-    <string name="bluetooth_profile_pbap_summary">Defnyddio ar gyfer rhannu cysylltiadau</string>
     <string name="bluetooth_profile_pan_nap">Rhannu cysylltiad i\'r rhyngrwyd</string>
     <string name="bluetooth_profile_map">Negeseuon Testun</string>
     <string name="bluetooth_profile_sap">Mynediad SIM</string>
@@ -458,12 +456,12 @@
     <string name="power_charging"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="state">%2$s</xliff:g></string>
     <string name="power_remaining_charging_duration_only"><xliff:g id="time">%1$s</xliff:g> nes yn llawn</string>
     <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="time">%2$s</xliff:g> nes yn llawn</string>
-    <string name="power_charging_limited"><xliff:g id="level">%1$s</xliff:g> - Gwefru wedi\'i gyfyngu dros dro</string>
     <string name="battery_info_status_unknown">Anhysybys</string>
     <string name="battery_info_status_charging">Yn gwefru</string>
     <string name="battery_info_status_charging_fast">Yn gwefru\'n gyflym</string>
     <string name="battery_info_status_charging_slow">Yn gwefru\'n araf</string>
     <string name="battery_info_status_charging_wireless">Yn gwefru\'n ddiwifr</string>
+    <string name="battery_info_status_charging_dock">Yn gwefru</string>
     <string name="battery_info_status_discharging">Dim yn gwefru</string>
     <string name="battery_info_status_not_charging">Wedi cysylltu, dim yn gwefru</string>
     <string name="battery_info_status_full">Wedi gwefru</string>
@@ -616,8 +614,6 @@
     <string name="accessibility_ethernet_disconnected">Ether-rwyd heb gysylltu.</string>
     <string name="accessibility_ethernet_connected">Ether-rwyd.</string>
     <string name="accessibility_no_calling">Dim galw.</string>
-    <string name="dream_complication_title_time">Amser</string>
-    <string name="dream_complication_title_date">Dyddiad</string>
     <string name="physical_keyboard_title">Bysellfwrdd corfforol</string>
     <string name="keyboard_layout_dialog_title">Dewis gosodiad bysellfwrdd</string>
     <string name="keyboard_layout_default_label">Arferol</string>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-gd/arrays.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-gd/arrays.xml
index edba126..b35a132 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-gd/arrays.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-gd/arrays.xml
@@ -90,6 +90,8 @@
         <item>Fuaim <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g></item>
         <item>Fuaim <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_hd">aptX™ HD</xliff:g></item>
         <item>LDAC</item>
+        <item>LC3</item>
+        <item>Opus</item>
     </string-array>
     <string-array name="bluetooth_a2dp_codec_summaries">
         <item>Cleachd taghadh an t-siostaim (bun-roghainn)</item>
@@ -98,6 +100,8 @@
         <item>Fuaim <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g></item>
         <item>Fuaim <xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_hd">aptX™ HD</xliff:g></item>
         <item>LDAC</item>
+        <item>LC3</item>
+        <item>Opus</item>
     </string-array>
     <string-array name="bluetooth_a2dp_codec_sample_rate_titles">
         <item>Cleachd taghadh an t-siostaim (bun-roghainn)</item>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-gd/strings.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-gd/strings.xml
index fd3c220..bca8107 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-gd/strings.xml
@@ -84,8 +84,6 @@
     <string name="bluetooth_profile_opp">Tar-chur fhaidhlichean</string>
     <string name="bluetooth_profile_hid">Uidheam ion-chuir</string>
     <string name="bluetooth_profile_pan">Inntrigeadh an eadar-lìn</string>
-    <string name="bluetooth_profile_pbap">Co-roinneadh luchd-aithne</string>
-    <string name="bluetooth_profile_pbap_summary">Cleachd a chùm co-roinneadh luchd-aithne</string>
     <string name="bluetooth_profile_pan_nap">Co-roinneadh a’ cheangail ris an eadar-lìon</string>
     <string name="bluetooth_profile_map">Teachdaireachdan teacsa</string>
     <string name="bluetooth_profile_sap">Inntrigeadh dhan t-SIM</string>
@@ -451,6 +449,7 @@
     <string name="battery_info_status_charging">’Ga theàirrdseadh</string>
     <string name="battery_info_status_charging_fast">’Ga theàirrdseadh gu luath</string>
     <string name="battery_info_status_charging_slow">\'Ga theàirrdseadh gu mall</string>
+    <string name="battery_info_status_charging_dock">’Ga theàirrdseadh</string>
     <string name="battery_info_status_discharging">Chan eil e ’ga theàirrdseadh</string>
     <string name="disabled_by_admin_summary_text">Fo smachd rianaire</string>
     <string name="disabled">À comas</string>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-kab-rDZ/strings.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-kab-rDZ/strings.xml
index 75e536d..12a0cd3 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-kab-rDZ/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-kab-rDZ/strings.xml
@@ -94,6 +94,7 @@
     <string name="daltonizer_mode_disabled">Insa</string>
     <string name="battery_info_status_unknown">Arussin</string>
     <string name="battery_info_status_charging">Ittɛemmiṛ</string>
+    <string name="battery_info_status_charging_dock">Ittɛemmiṛ</string>
     <string name="disabled">Insa</string>
     <string name="external_source_trusted">Ittwasireg</string>
     <string name="external_source_untrusted">Ur ittwasireg ara</string>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-sc-rIT/strings.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-sc-rIT/strings.xml
index 7ee8128..056ce26 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-sc-rIT/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-sc-rIT/strings.xml
@@ -33,6 +33,7 @@
     <string name="private_dns_broken">Impossìbile atzèdere a su serbidore privadu DNS</string>
     <string name="connected_via_carrier">Collegadu cun %1$s</string>
     <string name="available_via_carrier">A disponimentu cun %1$s</string>
+    <string name="speed_label_medium">Mesanu</string>
     <string name="wifi_passpoint_expired">Iscadidu</string>
     <string name="bluetooth_disconnected">Disconnètidu</string>
     <string name="bluetooth_disconnecting">Iscolleghende·si\u2026</string>
@@ -41,8 +42,6 @@
     <string name="bluetooth_profile_opp">Tràmuda de archìvios</string>
     <string name="bluetooth_profile_hid">Dispositivu de intrada</string>
     <string name="bluetooth_profile_pan">Atzessu a internet</string>
-    <string name="bluetooth_profile_pbap">Cumpartzidura de cuntatos</string>
-    <string name="bluetooth_profile_pbap_summary">Imprea pro sa cumpartzidura de messàgios</string>
     <string name="bluetooth_profile_pan_nap">Cumpartzidura de connessione a internet</string>
     <string name="bluetooth_profile_sap">Atzessu a sa SIM</string>
     <string name="bluetooth_opp_profile_summary_connected">Collegadu a su serbidore de tràmuda de archìvios</string>
@@ -79,6 +78,17 @@
     <string name="unknown">Disconnotu</string>
     <string name="running_process_item_user_label">Utente: <xliff:g id="user_name">%1$s</xliff:g></string>
     <string name="tts_status_title">Istadu de limba predefinidu</string>
+    <string-array name="tts_rate_entries">
+        <item>Very slow</item>
+        <item>Lentu</item>
+        <item>Normal</item>
+        <item>Fast</item>
+        <item>Faster</item>
+        <item>Very fast</item>
+        <item>Rapid</item>
+        <item>Very rapid</item>
+        <item>Fastest</item>
+    </string-array>
     <string name="enable_adb_wireless">Curretzione de sa lìnia sena filos</string>
     <string name="enable_adb_wireless_summary">Modalidade curretzione de errores cando su Wi\u2011Fi est connètidu</string>
     <string name="adb_wireless_error">Errore</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-ast-rES/strings.xml b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-ast-rES/strings.xml
index d9dbde4..9184ac2 100644
--- a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-ast-rES/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-ast-rES/strings.xml
@@ -70,15 +70,7 @@
         \n\nVolvi tentalo en <xliff:g id="number">%2$d</xliff:g> segundos.
     </string>
     <string name="kg_password_wrong_pin_code_pukked">El códigu PIN de la SIM ye incorreutu. Agora tienes de ponete en contautu cola operadora pa desbloquiar el preséu.</string>
-    <plurals name="kg_password_wrong_pin_code">
-        <item quantity="one">El códigu PIN de la SIM ye incorreutu. Quédate <xliff:g id="number">%d</xliff:g> intentu enantes de tener de ponete en contautu cola operadora pa desbloquiar el preséu.</item>
-        <item quantity="other">El códigu PIN de la SIM ye incorreutu. Quédente <xliff:g id="number">%d</xliff:g> intentos.</item>
-    </plurals>
     <string name="kg_password_wrong_puk_code_dead">La SIM ta inutilizada. Ponte en contautu cola operadora.</string>
-    <plurals name="kg_password_wrong_puk_code">
-        <item quantity="one">El códigu PUK de la SIM ye incorreutu. Quédate <xliff:g id="number">%d</xliff:g> intentu enantes d\'inutilizar dafechu la SIM.</item>
-        <item quantity="other">El códigu PUK de la SIM ye incorreutu. Quédente <xliff:g id="number">%d</xliff:g> intentos enantes d\'inutilizar dafechu la SIM.</item>
-    </plurals>
     <string name="kg_password_pin_failed">¡La operación col PIN de la SIM falló!</string>
     <string name="kg_password_puk_failed">¡La operación col PUK de la SIM falló!</string>
     <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Botón «Cambiar el métodu d\'entrada»</string>
@@ -92,14 +84,6 @@
     <string name="kg_prompt_reason_device_admin">L\'alministrador bloquió\'l preséu</string>
     <string name="kg_prompt_reason_user_request">El preséu bloquióse manualmente</string>
     <string name="kg_face_not_recognized">Nun se reconoz</string>
-    <plurals name="kg_password_default_pin_message">
-        <item quantity="one">Introduz el PIN de la SIM. Quédate <xliff:g id="number">%d</xliff:g> intentu enantes de tener de ponete en contautu cola operadora pa desbloquiar el preséu.</item>
-        <item quantity="other">Introduz el PIN de la SIM. Quédente <xliff:g id="number">%d</xliff:g> intentos.</item>
-    </plurals>
-    <plurals name="kg_password_default_puk_message">
-        <item quantity="one">Agora la SIM ta inhabilitada. Introduz el códigu PUK pa siguir. Quédate <xliff:g id=" number">%d</xliff:g> intentu enantes d\'inutilizar dafechu la SIM. Ponte en contautu cola operadora pa consiguir más información.</item>
-        <item quantity="other">Agora la SIM ta inhabilitada. Introduz el códigu PUK pa siguir. Quédente <xliff:g id=" number">%d</xliff:g> intentos enantes d\'inutilizar dafechu la SIM. Ponte en contautu cola operadora pa consiguir más información.</item>
-    </plurals>
     <string name="clock_title_default">Por defeutu</string>
     <string name="clock_title_bubble">Burbuya</string>
     <string name="clock_title_analog">Analóxicu</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-cy/strings.xml b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-cy/strings.xml
index a577890..fefdec6 100644
--- a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-cy/strings.xml
@@ -24,11 +24,9 @@
     <string name="keyguard_sim_error_message_short">Cerdyn Annilys.</string>
     <string name="keyguard_charged">Wedi gwefru</string>
     <string name="keyguard_plugged_in_wireless"><xliff:g id="percentage" example="20%">%s</xliff:g> • Yn gwefru\u2019n ddiwifr</string>
-    <string name="keyguard_plugged_in_dock"><xliff:g id="percentage" example="20%">%s</xliff:g> • Doc Gwefru</string>
     <string name="keyguard_plugged_in"><xliff:g id="percentage">%s</xliff:g> • Yn gwefru</string>
     <string name="keyguard_plugged_in_charging_fast"><xliff:g id="percentage">%s</xliff:g> • Yn gwefru\'n gyflym</string>
     <string name="keyguard_plugged_in_charging_slowly"><xliff:g id="percentage">%s</xliff:g> • Yn gwefru\'n araf</string>
-    <string name="keyguard_plugged_in_charging_limited"><xliff:g id="percentage">%s</xliff:g> • Gwefru wedi\'i gyfyngu dros dro</string>
     <string name="keyguard_instructions_when_pattern_disabled">Gwasga Dewislen i ddatgloi.</string>
     <string name="keyguard_network_locked_message">Rhwydwaith wedi\'i gloi</string>
     <string name="keyguard_missing_sim_message_short">Dim cerdyn SIM</string>
@@ -71,23 +69,7 @@
         \n\nRho gynnig arall arni ymhen <xliff:g id="number">%2$d</xliff:g> eiliad.
     </string>
     <string name="kg_password_wrong_pin_code_pukked">Rhoddwyd PIN SIM anghywir a rhaid nawr cysylltu â dy ddarparwr gwasanaeth er mwyn datgloi dy ddyfais.</string>
-    <plurals name="kg_password_wrong_pin_code">
-        <item quantity="zero">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> ceisiadau yn weddill.</item>
-        <item quantity="one">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill.</item>
-        <item quantity="two">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> gais yn weddill.</item>
-        <item quantity="few">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill.</item>
-        <item quantity="many">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> chais yn weddill.</item>
-        <item quantity="other">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill.</item>
-    </plurals>
     <string name="kg_password_wrong_puk_code_dead">Nid yw\'n bosib defnyddio\'r SIM. Cysyllta â dy ddarparwr gwasanaeth.</string>
-    <plurals name="kg_password_wrong_puk_code">
-        <item quantity="zero">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> ceisiadau yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
-        <item quantity="one">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
-        <item quantity="two">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> gais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
-        <item quantity="few">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
-        <item quantity="many">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> chais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
-        <item quantity="other">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
-    </plurals>
     <string name="kg_password_pin_failed">Methodd gweithred PIN y SIM!</string>
     <string name="kg_password_puk_failed">Methodd gweithred PUK y SIM!</string>
     <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Newid dull mewnbwn</string>
@@ -101,22 +83,6 @@
     <string name="kg_prompt_reason_device_admin">Cafodd y ddyfais ei chloi gan weinyddwr</string>
     <string name="kg_prompt_reason_user_request">Cafodd y ddyfais ei chloi gan rywun.</string>
     <string name="kg_face_not_recognized">Dim yn ei adnabod</string>
-    <plurals name="kg_password_default_pin_message">
-        <item quantity="zero">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynigion yn weddill.</item>
-        <item quantity="one">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnig yn weddill cyn bydd yn rhaid cysylltu â dy ddarparwr gwasanaeth i ddatgloi dy ddyfais.</item>
-        <item quantity="two">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnig yn weddill cyn bydd yn rhaid cysylltu â dy ddarparwr gwasanaeth i ddatgloi dy ddyfais.</item>
-        <item quantity="few">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnig yn weddill.</item>
-        <item quantity="many">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnig yn weddill.</item>
-        <item quantity="other">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnig yn weddill.</item>
-    </plurals>
-    <plurals name="kg_password_default_puk_message">
-        <item quantity="zero">Mae\'r SIM nawr wedi\'i analluogi. Rho god PUK i barhau. Mae gennyt <xliff:g id=" number">%d</xliff:g> cynigion yn weddill nes na fydd posib defnyddio\'r SIM byth eto. Cysyllta â dy ddarparwr gwasanaeth am ragor o fanylion.</item>
-        <item quantity="one">Mae\'r SIM nawr wedi\'i analluogi. Rho god PUK i barhau. Mae gennyt <xliff:g id=" number">%d</xliff:g> cynnig yn weddill nes na fydd posib defnyddio\'r SIM byth eto. Cysyllta â dy ddarparwr gwasanaeth am ragor o fanylion.</item>
-        <item quantity="two">Mae\'r SIM nawr wedi\'i analluogi. Rho god PUK i barhau. Mae gennyt <xliff:g id=" number">%d</xliff:g> gynnig yn weddill nes na fydd posib defnyddio\'r SIM byth eto. Cysyllta â dy ddarparwr gwasanaeth am ragor o fanylion.</item>
-        <item quantity="few">Mae\'r SIM nawr wedi\'i analluogi. Rho god PUK i barhau. Mae gennyt <xliff:g id=" number">%d</xliff:g> cynnig yn weddill nes na fydd posib defnyddio\'r SIM byth eto. Cysyllta â dy ddarparwr gwasanaeth am ragor o fanylion.</item>
-        <item quantity="many">Mae\'r SIM nawr wedi\'i analluogi. Rho god PUK i barhau. Mae gennyt <xliff:g id=" number">%d</xliff:g> chynnig yn weddill nes na fydd posib defnyddio\'r SIM byth eto. Cysyllta â dy ddarparwr gwasanaeth am ragor o fanylion.</item>
-        <item quantity="other">Mae\'r SIM nawr wedi\'i analluogi. Rho god PUK i barhau. Mae gennyt <xliff:g id=" number">%d</xliff:g> cynnig yn weddill nes na fydd posib defnyddio\'r SIM byth eto. Cysyllta â dy ddarparwr gwasanaeth am ragor o fanylion.</item>
-    </plurals>
     <string name="clock_title_default">Rhagosodiad</string>
     <string name="clock_title_bubble">Swigod</string>
     <string name="clock_title_analog">Analog</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-gd/strings.xml b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-gd/strings.xml
index 58e7647..0a45f25 100644
--- a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-gd/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-gd/strings.xml
@@ -70,19 +70,7 @@
         \n\nFeuch ris a-rithist an ceann <xliff:g id="number">%2$d</xliff:g> diog(an).
     </string>
     <string name="kg_password_wrong_pin_code_pukked">Còd PIN an t-SIM ceàrr. Feumaidh tu bruidhinn ris a’ ghiùlanair agad a-nis airson a’ ghlas a thoirt far an uidheim agad.</string>
-    <plurals name="kg_password_wrong_pin_code">
-        <item quantity="one">Còd PIN an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirp eile agad mus bi agad ri bruidhinn ris a’ ghiùlanair agad airson a’ ghlas a thoirt far an uidheim agad.</item>
-        <item quantity="two">Còd PIN an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirp eile agad.</item>
-        <item quantity="few">Còd PIN an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirpean eile agad.</item>
-        <item quantity="other">Còd PIN an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirp eile agad.</item>
-    </plurals>
     <string name="kg_password_wrong_puk_code_dead">Cha ghabh an SIM seo cleachdadh. Cuir fios gun ghiùlanair agad.</string>
-    <plurals name="kg_password_wrong_puk_code">
-        <item quantity="one">Còd PUK an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirp eile agad gus am bi an SIM agad gun fheum gu buan.</item>
-        <item quantity="two">Còd PUK an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirp eile agad gus am bi an SIM agad gun fheum gu buan.</item>
-        <item quantity="few">Còd PUK an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirpean eile agad gus am bi an SIM agad gun fheum gu buan.</item>
-        <item quantity="other">Còd PUK an t-SIM ceàrr. Tha <xliff:g id="number">%d</xliff:g> oidhirp eile agad gus am bi an SIM agad gun fheum gu buan.</item>
-    </plurals>
     <string name="kg_password_pin_failed">Dh’fhàillig le obrachadh PIN an t-SIM!</string>
     <string name="kg_password_puk_failed">Dh’fhàillig le obrachadh PUK an t-SIM!</string>
     <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Geàrr leum gu modh ion-chuir eile</string>
@@ -96,22 +84,6 @@
     <string name="kg_prompt_reason_device_admin">Chaidh an t-uidheam a ghlasadh le rianaire</string>
     <string name="kg_prompt_reason_user_request">Chaidh an t-uidheam a ghlasadh a làimh</string>
     <string name="kg_face_not_recognized">Gun aithneachadh</string>
-    <plurals name="kg_password_default_pin_message">
-        <item quantity="one">Cuir a-steach PIN an t-SIM. Tha <xliff:g id="number">%d</xliff:g> oidhirp air fhàgail
-agad mus bi agad ri bruidhinn ris a’ ghiùlanair agad airson a’ ghlas a thoirt far an uidheim agad.</item>
-        <item quantity="two">Cuir a-steach PIN an t-SIM. Tha <xliff:g id="number">%d</xliff:g> oidhirp air fhàgail
-agad.</item>
-        <item quantity="few">Cuir a-steach PIN an t-SIM. Tha <xliff:g id="number">%d</xliff:g> oidhirpean air fhàgail
-agad.</item>
-        <item quantity="other">Cuir a-steach PIN an t-SIM. Tha <xliff:g id="number">%d</xliff:g> oidhirp air fhàgail
-agad.</item>
-    </plurals>
-    <plurals name="kg_password_default_puk_message">
-        <item quantity="one">Tha an SIM à comas a-nis. Cuir a-steach còd PUK airson leantainn air adhart. Tha <xliff:g id=" number">%d</xliff:g> oidhirp air fhàgail dhut gus nach gabh an SIM a chleachdadh a-rithist gu bràth tuilleadh. Cuir fios gun ghiùlanair airson barrachd fiosrachaidh.</item>
-        <item quantity="two">Tha an SIM à comas a-nis. Cuir a-steach còd PUK airson leantainn air adhart. Tha <xliff:g id=" number">%d</xliff:g> oidhirp air fhàgail dhut gus nach gabh an SIM a chleachdadh a-rithist gu bràth tuilleadh. Cuir fios gun ghiùlanair airson barrachd fiosrachaidh.</item>
-        <item quantity="few">Tha an SIM à comas a-nis. Cuir a-steach còd PUK airson leantainn air adhart. Tha <xliff:g id=" number">%d</xliff:g> oidhirpean air fhàgail dhut gus nach gabh an SIM a chleachdadh a-rithist gu bràth tuilleadh. Cuir fios gun ghiùlanair airson barrachd fiosrachaidh.</item>
-        <item quantity="other">Tha an SIM à comas a-nis. Cuir a-steach còd PUK airson leantainn air adhart. Tha <xliff:g id=" number">%d</xliff:g> oidhirp air fhàgail dhut gus nach gabh an SIM a chleachdadh a-rithist gu bràth tuilleadh. Cuir fios gun ghiùlanair airson barrachd fiosrachaidh.</item>
-    </plurals>
     <string name="clock_title_default">Bun-roghainn</string>
     <string name="clock_title_bubble">Builgean</string>
     <string name="clock_title_analog">Analogach</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-ast-rES/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-ast-rES/strings.xml
index 2f37615..4e6abaa 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-ast-rES/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-ast-rES/strings.xml
@@ -99,9 +99,6 @@
     <string name="accessibility_unlock_button">Desbloquiar</string>
     <string name="accessibility_scanning_face">Escaniando la cara</string>
     <string name="accessibility_send_smart_reply">Unviar</string>
-    <string name="phone_label">abrir el teléfonu</string>
-    <string name="voice_assist_label">abrir l\'asistencia per voz</string>
-    <string name="camera_label">abrir la cámara</string>
     <string name="cancel">Encaboxar</string>
     <string name="biometric_dialog_confirm">Confirmar</string>
     <string name="biometric_dialog_try_again">Retentar</string>
@@ -172,10 +169,6 @@
     <string name="accessibility_sensors_off_active">Activóse «Desactivar los sensores»</string>
     <string name="accessibility_clear_all">Quitar tolos avisos.</string>
     <string name="notification_group_overflow_indicator">+ <xliff:g id="number" example="3">%s</xliff:g></string>
-    <plurals name="notification_group_overflow_description">
-        <item quantity="one"><xliff:g id="number" example="1">%s</xliff:g> avisu más nel interior.</item>
-        <item quantity="other"><xliff:g id="number" example="3">%s</xliff:g> avisos más nel interior.</item>
-    </plurals>
     <string name="accessibility_rotation_lock_on_landscape">La pantalla ta bloquiada na orientación horizontal.</string>
     <string name="accessibility_rotation_lock_on_portrait">La pantalla ta bloquiada na orientación vertical.</string>
     <string name="dessert_case">Caxa pa postres</string>
@@ -193,6 +186,7 @@
     <string name="quick_settings_rotation_unlocked_label">Voltéu automáticu</string>
     <string name="accessibility_quick_settings_rotation">Voltéu de pantalla automáticu</string>
     <string name="quick_settings_location_label">Llocalización</string>
+    <string name="quick_settings_screensaver_label">Curiapantalles</string>
     <string name="quick_settings_media_device_label">Preséu multimedia</string>
     <string name="quick_settings_user_title">Usuariu</string>
     <string name="quick_settings_wifi_label">Wi-Fi</string>
@@ -212,10 +206,6 @@
     <string name="quick_settings_hotspot_label">Puntu Wi-Fi</string>
     <string name="quick_settings_hotspot_secondary_label_transient">Activando…</string>
     <string name="quick_settings_hotspot_secondary_label_data_saver_enabled">L\'aforrador de datos ta activáu</string>
-    <plurals name="quick_settings_hotspot_secondary_label_num_devices">
-        <item quantity="one">%d preséu</item>
-        <item quantity="other">%d preseos</item>
-    </plurals>
     <string name="quick_settings_flashlight_label">Llinterna</string>
     <string name="quick_settings_flashlight_camera_in_use">Cámara n\'usu</string>
     <string name="quick_settings_cellular_detail_title">Datos móviles</string>
@@ -271,10 +261,6 @@
     <string name="guest_wipe_session_wipe">Volver comenzar</string>
     <string name="guest_wipe_session_dontwipe">Sí, siguir</string>
     <string name="user_limit_reached_title">Algamóse la llende d\'usuarios</string>
-    <plurals name="user_limit_reached_message">
-        <item quantity="one">Namás se pue crear un usuariu.</item>
-        <item quantity="other">Pues amestar hasta <xliff:g id="count" example="3">%d</xliff:g> usuarios.</item>
-    </plurals>
     <string name="user_remove_user_title">¿Quies quitar l\'usuariu?</string>
     <string name="user_remove_user_message">Van desaniciase toles aplicaciones y tolos datos d\'esti usuariu.</string>
     <string name="user_remove_user_remove">Quitar</string>
@@ -321,6 +307,7 @@
     <string name="volume_odi_captions_content_description">Superposición de sotítulos</string>
     <string name="volume_odi_captions_hint_enable">activar</string>
     <string name="volume_odi_captions_hint_disable">desactivar</string>
+    <string name="volume_panel_dialog_settings_button">Axustes</string>
     <string name="screen_pinning_title">L\'aplicación ta fixada</string>
     <string name="screen_pinning_description">Va siguir na vista hasta que lliberes la pantalla. Pa facelo, ten primíos al empar los botones «Atrás» y «Vista xeneral».</string>
     <string name="screen_pinning_description_recents_invisible">Va siguir na vista hasta que lliberes la pantalla. Pa facelo, ten primíos al empar los botones «Atrás» y «Aniciu».</string>
@@ -438,14 +425,6 @@
     <string name="notification_menu_snooze_action">Acordase</string>
     <string name="snooze_undo">Desfacer</string>
     <string name="snoozed_for_time">Aplazóse <xliff:g id="time_amount" example="15 minutes">%1$s</xliff:g></string>
-    <plurals name="snoozeHourOptions">
-        <item quantity="one">%d hora</item>
-        <item quantity="other">%d hores</item>
-    </plurals>
-    <plurals name="snoozeMinuteOptions">
-        <item quantity="one">%d minutu</item>
-        <item quantity="other">%d minutos</item>
-    </plurals>
     <string name="battery_detail_switch_title">Aforrador d\'enerxía</string>
     <string name="keyboard_key_button_template">Botón «<xliff:g id="name">%1$s</xliff:g>»</string>
     <string name="keyboard_key_home">Aniciu</string>
@@ -568,8 +547,6 @@
     <string name="high_temp_notif_message">Dalgunes funciones puen tar llendaes mentanto\'l teléfonu esfrez.\nToca pa consiguir más información</string>
     <string name="high_temp_dialog_message">El teléfonu va tentar d\'esfrecese automáticamente. Vas poder siguir usando\'l preséu mas pue funcionar más lentu.\n\nNamás que\'l telefonu esfreza, va funcionar con normalidá.</string>
     <string name="high_temp_dialog_help_text">Ver los pasos de curiáu</string>
-    <string name="high_temp_alarm_title">Desconecta\'l cargador</string>
-    <string name="high_temp_alarm_notify_message">Hai un problema al cargar esti preséu. Desconecta l\'adautador de corriente y ten curiáu darréu que\'l cable pue tar caliente.</string>
     <string name="high_temp_alarm_help_care_steps">Ver los pasos de curiáu</string>
     <string name="lockscreen_shortcut_left">Atayu de la esquierda</string>
     <string name="lockscreen_shortcut_right">Atayu de la derecha</string>
@@ -588,7 +565,7 @@
     <string name="notification_channel_alerts">Alertes</string>
     <string name="notification_channel_battery">Batería</string>
     <string name="notification_channel_screenshot">Captures de pantalla</string>
-    <string name="notification_channel_general">Mensaxes xenerales</string>
+    <string name="notification_channel_instant">Aplicaciones instantánees</string>
     <string name="notification_channel_storage">Almacenamientu</string>
     <string name="notification_channel_hints">Suxerencies</string>
     <string name="instant_apps">Aplicaciones instantánees</string>
@@ -639,10 +616,6 @@
     <string name="accessibility_floating_button_action_move_bottom_right">Mover p\'abaxo a la derecha</string>
     <string name="quick_controls_title">Controles de preseos</string>
     <string name="controls_providers_title">Escueyi una aplicación p\'amestar controles</string>
-    <plurals name="controls_number_of_favorites">
-        <item quantity="one">Amestóse <xliff:g id="number" example="1">%s</xliff:g> control.</item>
-        <item quantity="other">Amestáronse <xliff:g id="number" example="3">%s</xliff:g> controles.</item>
-    </plurals>
     <string name="controls_removed">Quitóse</string>
     <string name="accessibility_control_favorite">Amestóse a Favoritos</string>
     <string name="accessibility_control_favorite_position">Amestóse a Favoritos, posición <xliff:g id="number" example="1">%d</xliff:g></string>
@@ -692,7 +665,6 @@
     <string name="media_output_dialog_group">Grupu</string>
     <string name="media_output_dialog_single_device">Esbillóse 1 preséu</string>
     <string name="media_output_dialog_multiple_devices">Esbilláronse <xliff:g id="count" example="2">%1$d</xliff:g> preseos</string>
-    <string name="media_output_dialog_pairing_new">Empareyamientu d\'un preséu nuevu</string>
     <string name="media_output_broadcast_dialog_save">Guardar</string>
     <string name="select_conversation_title">Widgets de conversación</string>
     <string name="priority_conversations">Conversaciones con prioridá</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
index 864c7a8..d8c493d 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
@@ -118,9 +118,6 @@
     <string name="accessibility_lock_icon">Dyfais dan glo</string>
     <string name="accessibility_scanning_face">Sganio wyneb</string>
     <string name="accessibility_send_smart_reply">Anfon</string>
-    <string name="phone_label">agor y ffôn</string>
-    <string name="voice_assist_label">agor cymorth llais</string>
-    <string name="camera_label">agor y camera</string>
     <string name="cancel">Diddymu</string>
     <string name="biometric_dialog_confirm">Cadarnhau</string>
     <string name="biometric_dialog_try_again">Ceisio eto</string>
@@ -193,14 +190,6 @@
     <string name="accessibility_sensors_off_active">Synhwyryddion i ffwrdd ar waith</string>
     <string name="accessibility_clear_all">Clirio pob hysbysiad.</string>
     <string name="notification_group_overflow_indicator">+ <xliff:g id="number" example="3">%s</xliff:g></string>
-    <plurals name="notification_group_overflow_description">
-        <item quantity="zero"><xliff:g id="number" example="3">%s</xliff:g> rhagor o hysbysiadau tu fewn.</item>
-        <item quantity="one"><xliff:g id="number" example="3">%s</xliff:g> hysbysiad arall tu fewn.</item>
-        <item quantity="two"><xliff:g id="number" example="3">%s</xliff:g> hysbysiad arall tu fewn.</item>
-        <item quantity="few"><xliff:g id="number" example="3">%s</xliff:g> hysbysiad arall tu fewn.</item>
-        <item quantity="many"><xliff:g id="number" example="3">%s</xliff:g> hysbysiad arall tu fewn.</item>
-        <item quantity="other"><xliff:g id="number" example="3">%s</xliff:g> hysbysiad arall tu fewn.</item>
-    </plurals>
     <string name="accessibility_rotation_lock_on_landscape">Mae\'r sgrin wedi\'i chloi yn y gorweddiad tirwedd.</string>
     <string name="accessibility_rotation_lock_on_portrait">Mae\'r sgrin wedi\'i chloi yn y gorweddiad darlun.</string>
     <string name="dessert_case">Cyflwyniad Pwdinau</string>
@@ -218,6 +207,7 @@
     <string name="quick_settings_rotation_unlocked_label">Troi yn Awtomatig</string>
     <string name="accessibility_quick_settings_rotation">Troi\'r sgrin yn awtomatig</string>
     <string name="quick_settings_location_label">Lleoliad</string>
+    <string name="quick_settings_screensaver_label">Arbedwr sgrin</string>
     <string name="quick_settings_camera_label">Mynediad at gamera</string>
     <string name="quick_settings_mic_label">Mynediad at ficroffon</string>
     <string name="quick_settings_camera_mic_available">Ar gael</string>
@@ -247,14 +237,6 @@
     <string name="quick_settings_hotspot_label">Llecyn Wi-Fi</string>
     <string name="quick_settings_hotspot_secondary_label_transient">Yn troi ymlaen…</string>
     <string name="quick_settings_hotspot_secondary_label_data_saver_enabled">Arbedwr Data ar waith</string>
-    <plurals name="quick_settings_hotspot_secondary_label_num_devices">
-        <item quantity="zero">%d dyfeisiau</item>
-        <item quantity="one">%d dyfais</item>
-        <item quantity="two">%d ddyfais</item>
-        <item quantity="few">%d dyfais</item>
-        <item quantity="many">%d dyfais</item>
-        <item quantity="other">%d dyfais</item>
-    </plurals>
     <string name="quick_settings_flashlight_label">Fflacholau</string>
     <string name="quick_settings_flashlight_camera_in_use">Camera yn cael ei ddefnyddio</string>
     <string name="quick_settings_cellular_detail_title">Data symudol</string>
@@ -330,14 +312,6 @@
     <string name="guest_wipe_session_wipe">Dechrau eto</string>
     <string name="guest_wipe_session_dontwipe">Ydw, parhau</string>
     <string name="user_limit_reached_title">Terfyn defnyddwyr wedi\'i gyrraedd</string>
-    <plurals name="user_limit_reached_message">
-        <item quantity="zero">Gellir ychwanegu <xliff:g id="count" example="3">%d</xliff:g> mwy o ddefnyddwyr.</item>
-        <item quantity="one">Gellir ychwanegu dim ond un defnyddiwr.</item>
-        <item quantity="two">Gellir ychwanegu hyd at <xliff:g id="count" example="3">%d</xliff:g> ddefnyddiwr.</item>
-        <item quantity="few">Gellir ychwanegu hyd at <xliff:g id="count" example="3">%d</xliff:g> defnyddiwr.</item>
-        <item quantity="many">Gellir ychwanegu hyd at <xliff:g id="count" example="3">%d</xliff:g> defnyddiwr.</item>
-        <item quantity="other">Gellir ychwanegu hyd at <xliff:g id="count" example="3">%d</xliff:g> defnyddiwr.</item>
-    </plurals>
     <string name="user_remove_user_title">Tynnu defnyddiwr?</string>
     <string name="user_remove_user_message">Caiff holl apiau a data\'r defnyddiwr hwn eu dileu.</string>
     <string name="user_remove_user_remove">Tynnu</string>
@@ -397,6 +371,7 @@
     <string name="volume_odi_captions_content_description">Troshaen isdeitlau</string>
     <string name="volume_odi_captions_hint_enable">galluogi</string>
     <string name="volume_odi_captions_hint_disable">analluogi</string>
+    <string name="volume_panel_dialog_settings_button">Gosodiadau</string>
     <string name="screen_pinning_title">Ap wedi\'i binio</string>
     <string name="screen_pinning_description">Mae hyn yn ei chadw mewn golwg nes dy fod yn ei dadbinio. Cyffyrdda a dal Nôl a Throsolwg i\'w dadbinio.</string>
     <string name="screen_pinning_description_recents_invisible">Mae hyn yn ei chadw mewn golwg nes dy fod yn ei dadbinio. Cyffyrdda a dal Nôl a Cartref i\'w dadbinio.</string>
@@ -537,22 +512,6 @@
     <string name="notification_menu_snooze_action">Atgoffa fi</string>
     <string name="snooze_undo">Dad-wneud</string>
     <string name="snoozed_for_time">Ar oediad am <xliff:g id="time_amount" example="15 minutes">%1$s</xliff:g></string>
-    <plurals name="snoozeHourOptions">
-        <item quantity="zero">%d oriau</item>
-        <item quantity="one">%d awr</item>
-        <item quantity="two">%d awr</item>
-        <item quantity="few">%d awr</item>
-        <item quantity="many">%d awr</item>
-        <item quantity="other">%d awr</item>
-    </plurals>
-    <plurals name="snoozeMinuteOptions">
-        <item quantity="zero">%d munudau</item>
-        <item quantity="one">%d munud</item>
-        <item quantity="two">%d funud</item>
-        <item quantity="few">%d munud</item>
-        <item quantity="many">%d munud</item>
-        <item quantity="other">%d munud</item>
-    </plurals>
     <string name="battery_detail_switch_title">Arbedwr Batri</string>
     <string name="keyboard_key_button_template">Botwm <xliff:g id="name">%1$s</xliff:g></string>
     <string name="keyboard_key_home">Cartref</string>
@@ -608,7 +567,6 @@
     <string name="switch_bar_on">Ymlaen</string>
     <string name="switch_bar_off">I ffwrdd</string>
     <string name="tile_unavailable">Ddim ar gael</string>
-    <string name="tile_disabled">Analluogwyd</string>
     <string name="nav_bar">Bar llywio</string>
     <string name="nav_bar_layout">Gosodiad</string>
     <string name="left_nav_bar_button_type">Math botwm chwith ychwanegol</string>
@@ -681,8 +639,6 @@
     <string name="high_temp_notif_message">Mae rhai nodweddion yn gyfyngedig tra bo\'r ffôn yn oeri.\nTapia am fwy o wybodaeth</string>
     <string name="high_temp_dialog_message">Bydd y ffôn yn ceisio oeri yn awtomatig. Mi fydd dal yn bosib defnyddio dy ffôn, ond mae\'n debyg y bydd yn rhedeg yn arafach.\n\nUnwaith y bydd wedi oeri digon, mi fydd yn rhedeg fel arfer.</string>
     <string name="high_temp_dialog_help_text">Gweler y camau gofal</string>
-    <string name="high_temp_alarm_title">Datgysyllta\u2019r gwefrydd</string>
-    <string name="high_temp_alarm_notify_message">Mae yna broblem wrth wefru\u2019r ddyfais hon. Datgysyllta\u2019r pŵer, gan gymryd gofal rhag ofn bod y wifren yn gynnes.</string>
     <string name="high_temp_alarm_help_care_steps">Gweler y camau gofal</string>
     <string name="lockscreen_shortcut_left">Llwybr byr chwith</string>
     <string name="lockscreen_shortcut_right">Llwybr byr dde</string>
@@ -701,7 +657,7 @@
     <string name="notification_channel_alerts">Rhybuddion</string>
     <string name="notification_channel_battery">Batri</string>
     <string name="notification_channel_screenshot">Sgrinluniau</string>
-    <string name="notification_channel_general">Negeseuon Cyffredinol</string>
+    <string name="notification_channel_instant">Apiau ar Unwaith</string>
     <string name="notification_channel_storage">Storfa</string>
     <string name="notification_channel_hints">Awgrymiadau</string>
     <string name="instant_apps">Apiau ar Unwaith</string>
@@ -775,14 +731,6 @@
     <string name="accessibility_floating_button_action_double_tap_to_toggle">toglo</string>
     <string name="quick_controls_title">Rheolyddion dyfeisiau</string>
     <string name="controls_providers_title">Dewis ap i ychwanegu rheolyddion</string>
-    <plurals name="controls_number_of_favorites">
-        <item quantity="zero"><xliff:g id="number" example="3">%s</xliff:g> rheolydd wedi\'u hychwanegu.</item>
-        <item quantity="one"><xliff:g id="number" example="1">%s</xliff:g> rheolydd wedi\'u hychwanegu.</item>
-        <item quantity="two"><xliff:g id="number" example="3">%s</xliff:g> rheolydd wedi\'u hychwanegu.</item>
-        <item quantity="few"><xliff:g id="number" example="3">%s</xliff:g> rheolydd wedi\'u hychwanegu.</item>
-        <item quantity="many"><xliff:g id="number" example="3">%s</xliff:g> rheolydd wedi\'u hychwanegu.</item>
-        <item quantity="other"><xliff:g id="number" example="3">%s</xliff:g> rheolydd wedi\'u hychwanegu.</item>
-    </plurals>
     <string name="controls_removed">Tynnwyd</string>
     <string name="accessibility_control_favorite">Ffefrynwyd</string>
     <string name="accessibility_control_favorite_position">Ffefrynwyd, safle <xliff:g id="number" example="1">%d</xliff:g></string>
@@ -845,7 +793,6 @@
     <string name="media_output_dialog_single_device">Dewiswyd 1 ddyfais</string>
     <string name="media_output_dialog_multiple_devices"><xliff:g id="count" example="2">%1$d</xliff:g> dyfais wedi\'u dewis</string>
     <string name="media_output_dialog_disconnected">(wedi datgysylltu)</string>
-    <string name="media_output_dialog_pairing_new">Paru â dyfais newydd</string>
     <string name="media_output_dialog_unknown_launch_app_name">Ap anhysbys</string>
     <string name="media_output_dialog_button_stop_casting">Stopio taflu</string>
     <string name="media_output_dialog_accessibility_seekbar">Uchder sain</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml
index 694bdce..c06bbad 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml
@@ -26,6 +26,7 @@
     <string name="quick_settings_close_user_panel">Fermi</string>
     <string name="user_remove_user_remove">Forigi</string>
     <string name="notification_section_header_alerting">Sciigoj</string>
+    <string name="volume_panel_dialog_settings_button">Agordoj</string>
     <string name="status_bar_airplane">Aviadila reĝimo</string>
     <string name="keyboard_shortcut_group_system_notifications">Sciigoj</string>
     <string name="controls_media_settings_button">Agordoj</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml
index 7fdf37f..7d8efd5 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml
@@ -98,9 +98,6 @@
     <string name="accessibility_unlock_button">Thoir a’ ghlas dheth</string>
     <string name="accessibility_scanning_face">A’ sganadh d’ aodainn</string>
     <string name="accessibility_send_smart_reply">Cuir</string>
-    <string name="phone_label">fosgail am fòn</string>
-    <string name="voice_assist_label">fosgail an taic gutha</string>
-    <string name="camera_label">fosgail an camara</string>
     <string name="cancel">Sguir dheth</string>
     <string name="biometric_dialog_confirm">Dearbh</string>
     <string name="biometric_dialog_try_again">Feuch ris a‑rithist</string>
@@ -171,12 +168,6 @@
     <string name="accessibility_sensors_off_active">Tha “Mothaichearan dheth” gnìomhach</string>
     <string name="accessibility_clear_all">Falamhaich a h-uile brath.</string>
     <string name="notification_group_overflow_indicator">+ <xliff:g id="number" example="3">%s</xliff:g></string>
-    <plurals name="notification_group_overflow_description">
-        <item quantity="one">Tha <xliff:g id="number" example="1">%s</xliff:g> bhrath eile ann.</item>
-        <item quantity="two">Tha <xliff:g id="number" example="3">%s</xliff:g> bhrath eile ann.</item>
-        <item quantity="few">Tha <xliff:g id="number" example="3">%s</xliff:g> brathan eile ann.</item>
-        <item quantity="other">Tha <xliff:g id="number" example="3">%s</xliff:g> brath eile ann.</item>
-    </plurals>
     <string name="accessibility_rotation_lock_on_landscape">Tha an sgrìn glaiste air comhair an dreach-tìre.</string>
     <string name="accessibility_rotation_lock_on_portrait">Tha an sgrìn glaiste air comhair na portraid.</string>
     <string name="dessert_case">Cèis mhìlsean</string>
@@ -194,6 +185,7 @@
     <string name="quick_settings_rotation_unlocked_label">Fèin-chuairtich</string>
     <string name="accessibility_quick_settings_rotation">Cuairtich an sgrìn gu fèin-obrachail</string>
     <string name="quick_settings_location_label">Ionad</string>
+    <string name="quick_settings_screensaver_label">Sàbhalaiche-sgrìn</string>
     <string name="quick_settings_media_device_label">Uidheam mheadhanan</string>
     <string name="quick_settings_user_title">Cleachdaiche</string>
     <string name="quick_settings_wifi_label">WiFi</string>
@@ -213,12 +205,6 @@
     <string name="quick_settings_hotspot_label">Hotspot</string>
     <string name="quick_settings_hotspot_secondary_label_transient">’Ga chur air…</string>
     <string name="quick_settings_hotspot_secondary_label_data_saver_enabled">Tha caomhnaiche an dàta air</string>
-    <plurals name="quick_settings_hotspot_secondary_label_num_devices">
-        <item quantity="one">%d uidheam</item>
-        <item quantity="two">%d uidheam</item>
-        <item quantity="few">%d uidheaman</item>
-        <item quantity="other">%d uidheam</item>
-    </plurals>
     <string name="quick_settings_flashlight_label">Leus</string>
     <string name="quick_settings_flashlight_camera_in_use">Tha an camara ’ga chleachdadh</string>
     <string name="quick_settings_cellular_detail_title">Dàta mobile</string>
@@ -272,12 +258,6 @@
     <string name="guest_wipe_session_wipe">Tòisich às ùr</string>
     <string name="guest_wipe_session_dontwipe">Leanaidh</string>
     <string name="user_limit_reached_title">Ràinig thu crìoch nan cleachdaichean</string>
-    <plurals name="user_limit_reached_message">
-        <item quantity="one">’S urrainn dhut suas ri <xliff:g id="count" example="3">%d</xliff:g> chleachdaiche a chur ris.</item>
-        <item quantity="two">’S urrainn dhut suas ri <xliff:g id="count" example="3">%d</xliff:g> chleachdaiche a chur ris.</item>
-        <item quantity="few">’S urrainn dhut suas ri <xliff:g id="count" example="3">%d</xliff:g> cleachdaichean a chur ris.</item>
-        <item quantity="other">’S urrainn dhut suas ri <xliff:g id="count" example="3">%d</xliff:g> cleachdaiche a chur ris.</item>
-    </plurals>
     <string name="user_remove_user_title">An doir thu an cleachdaiche air falbh?</string>
     <string name="user_remove_user_message">Thèid a h-uile aplacaid is dàta aig a’ chleachdaiche seo a sguabadh às.</string>
     <string name="user_remove_user_remove">Thoir air falbh</string>
@@ -324,6 +304,7 @@
     <string name="volume_odi_captions_content_description">Tar-chòmhdachadh fho-thiotalan</string>
     <string name="volume_odi_captions_hint_enable">cuir an comas</string>
     <string name="volume_odi_captions_hint_disable">cuir à comas</string>
+    <string name="volume_panel_dialog_settings_button">Roghainnean</string>
     <string name="screen_pinning_title">Chaidh an aplacaid a phrìneachadh</string>
     <string name="screen_pinning_description">Cumaidh seo san t-sealladh e gus an dì-phrìnich thu e. Suath ri “Air ais” agus air “Foir-shealladh” ⁊ cùm sìos iad gus a dhì-phrìneachadh.</string>
     <string name="screen_pinning_description_recents_invisible">Cumaidh seo san t-sealladh e gus an dì-phrìnich thu e. Suath ri “Air ais” agus air “Dachaigh” ⁊ cùm sìos iad gus a dhì-phrìneachadh.</string>
@@ -438,18 +419,6 @@
     <string name="notification_menu_snooze_action">Cuir ’nam chuimhne</string>
     <string name="snooze_undo">Neo-dhèan</string>
     <string name="snoozed_for_time">’Na dhùsal fad <xliff:g id="time_amount" example="15 minutes">%1$s</xliff:g></string>
-    <plurals name="snoozeHourOptions">
-        <item quantity="one">%d uair a thìde</item>
-        <item quantity="two">%d uair a thìde</item>
-        <item quantity="few">%d uairean a thìde</item>
-        <item quantity="other">%d uair a thìde</item>
-    </plurals>
-    <plurals name="snoozeMinuteOptions">
-        <item quantity="one">%d mhionaid</item>
-        <item quantity="two">%d mhionaid</item>
-        <item quantity="few">%d mionaidean</item>
-        <item quantity="other">%d mionaid</item>
-    </plurals>
     <string name="battery_detail_switch_title">Caomhnaiche a’ bhataraidh</string>
     <string name="keyboard_key_button_template">Putan <xliff:g id="name">%1$s</xliff:g></string>
     <string name="keyboard_key_home">Dachaigh</string>
@@ -572,8 +541,6 @@
     <string name="high_temp_notif_message">Tha cuid a ghleusan cuingichte fhad ’s a tha am fòn ’ga fhuarachadh.\nThoir gnogag airson barrachd fiosrachaidh</string>
     <string name="high_temp_dialog_message">Feuchaidh am fòn agad gum fuaraich e gu fèin-obrachail. ’S urrainn dhut am fòn agad a chleachdadh fhathast ach dh’fhaoidte gun dig maille air.\n\nNuair a bhios am fòn agad fionnar gu leòr, bidh e ag obair mar as àbhaist a-rithist.</string>
     <string name="high_temp_dialog_help_text">Seall ceumannan a’ chùraim</string>
-    <string name="high_temp_alarm_title">Dì-phlugaich an teàirrdsear</string>
-    <string name="high_temp_alarm_notify_message">Tha duilgheadas le teàirrdseadh an uidheim seo. Dì-cheangail adaptar a’ bhun-dealain agus thoir an aire on a bhios an càball blàth ma dh’fhaoidte.</string>
     <string name="high_temp_alarm_help_care_steps">Seall ceumannan a’ chùraim</string>
     <string name="lockscreen_shortcut_left">Ath-ghoirid taobh clì</string>
     <string name="lockscreen_shortcut_right">Ath-ghoirid taobh deas</string>
@@ -592,7 +559,7 @@
     <string name="notification_channel_alerts">Rabhaidhean</string>
     <string name="notification_channel_battery">Bataraidh</string>
     <string name="notification_channel_screenshot">Glacaidhean-sgrìn</string>
-    <string name="notification_channel_general">Teachdaireachdan coitcheann</string>
+    <string name="notification_channel_instant">Aplacaidean sa bhad</string>
     <string name="notification_channel_storage">An stòras</string>
     <string name="notification_channel_hints">Oidheaman</string>
     <string name="instant_apps">Aplacaidean sa bhad</string>
@@ -643,12 +610,6 @@
     <string name="accessibility_floating_button_action_move_bottom_right">Gluais gun bhonn taobh deas</string>
     <string name="quick_controls_title">Uidheaman-smachd do dh’uidheaman</string>
     <string name="controls_providers_title">Tagh aplacaid airson uidheaman-smachd a chur ris</string>
-    <plurals name="controls_number_of_favorites">
-        <item quantity="one">Chaidh <xliff:g id="number" example="1">%s</xliff:g> uidheam-smachd a chur ris.</item>
-        <item quantity="two">Chaidh <xliff:g id="number" example="3">%s</xliff:g> uidheam-smachd a chur ris.</item>
-        <item quantity="few">Chaidh <xliff:g id="number" example="3">%s</xliff:g> uidheaman-smachd a chur ris.</item>
-        <item quantity="other">Chaidh <xliff:g id="number" example="3">%s</xliff:g> uidheam-smachd a chur ris.</item>
-    </plurals>
     <string name="controls_removed">Air a thoirt air falbh</string>
     <string name="accessibility_control_favorite">’Na annsachd</string>
     <string name="accessibility_control_favorite_position">’Na annsachd, air ionad <xliff:g id="number" example="1">%d</xliff:g></string>
@@ -697,7 +658,6 @@
     <string name="media_output_dialog_group">Buidheann</string>
     <string name="media_output_dialog_single_device">Chaidh 1 uidheam a thaghadh</string>
     <string name="media_output_dialog_multiple_devices">Chaidh <xliff:g id="count" example="2">%1$d</xliff:g> uidheam(an) a thaghadh</string>
-    <string name="media_output_dialog_pairing_new">Paidhrich uidheam ùr</string>
     <string name="media_output_broadcast_dialog_save">Sàbhail</string>
     <string name="battery_state_unknown_notification_title">Mearachd a’ leughadh inneal-tomhais a’ bhataraidh agad</string>
     <string name="battery_state_unknown_notification_text">Thoir gnogag airson barrachd fiosrachaidh</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-kab-rDZ/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-kab-rDZ/strings.xml
index 6079f39..43d26b6 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-kab-rDZ/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-kab-rDZ/strings.xml
@@ -46,8 +46,6 @@
     <string name="accessibility_voice_assist_button">Amarag aɣectan</string>
     <string name="accessibility_unlock_button">Serreḥ</string>
     <string name="accessibility_send_smart_reply">Azen</string>
-    <string name="phone_label">ldi tiliɣri</string>
-    <string name="camera_label">ldi takamiṛat</string>
     <string name="cancel">Sefsex</string>
     <string name="biometric_dialog_confirm">Sentem</string>
     <string name="biometric_dialog_try_again">Ɛṛeḍ tikelt nniḍen</string>
@@ -98,6 +96,7 @@
     <string name="empty_shade_text">Ulac ilɣa</string>
     <string name="volume_odi_captions_hint_enable">Rmed</string>
     <string name="volume_odi_captions_hint_disable">désactiver</string>
+    <string name="volume_panel_dialog_settings_button">Iɣewwaṛen</string>
     <string name="screen_pinning_positive">Awi-t</string>
     <string name="screen_pinning_negative">Uhu tannemmit</string>
     <string name="stream_voice_call">Siwel</string>
@@ -124,14 +123,6 @@
     <string name="notification_more_settings">Iγewwaṛen nniḍen</string>
     <string name="notification_app_settings">Sagen</string>
     <string name="snooze_undo">Err-d</string>
-    <plurals name="snoozeHourOptions">
-        <item quantity="one">%d n usrag</item>
-        <item quantity="other">%d n isragen</item>
-    </plurals>
-    <plurals name="snoozeMinuteOptions">
-        <item quantity="one">%d tsedat</item>
-        <item quantity="other">%d tsedatin</item>
-    </plurals>
     <string name="battery_detail_switch_title">Aḥraz n uẓru</string>
     <string name="keyboard_key_home">Agdil agejdan</string>
     <string name="keyboard_key_back">Ar deffir</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml
index e1be58e..65a45e8 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml
@@ -35,8 +35,6 @@
     <string name="accessibility_camera_button">کامێرا</string>
     <string name="accessibility_phone_button">تەلەفۆن</string>
     <string name="accessibility_unlock_button">کردنەوە</string>
-    <string name="phone_label">کردنەوەی تەلەفۆن</string>
-    <string name="camera_label">کردنەوەی کامێرا</string>
     <string name="accessibility_bluetooth_connected">بلوتوس پەیوەندکراوە.</string>
     <string name="accessibility_bluetooth_name">پەیوەندکراوە بە <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
     <string name="accessibility_not_connected">نەبەستراوەتەوە.</string>
@@ -68,6 +66,7 @@
     <string name="quick_settings_connecting">په‌یوه‌ندیكردن...</string>
     <string name="quick_settings_flashlight_label">لایتی فلاش</string>
     <string name="notification_section_header_alerting">تێبینی</string>
+    <string name="volume_panel_dialog_settings_button">ڕێکخستنه‌کان</string>
     <string name="stream_voice_call">Call</string>
     <string name="stream_ring">Ring</string>
     <string name="stream_bluetooth_sco">بلوتوس</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml
index ac4088a..7680ff5 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml
@@ -37,8 +37,6 @@
     <string name="accessibility_camera_button">Fotoapparat</string>
     <string name="accessibility_phone_button">Telefon</string>
     <string name="accessibility_unlock_button">Entspären</string>
-    <string name="phone_label">Telefon opmaachen</string>
-    <string name="camera_label">Kamera opmaachen</string>
     <string name="accessibility_bluetooth_connected">Bluetooth connectéiert.</string>
     <string name="accessibility_bluetooth_name">Verbonne mat <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
     <string name="accessibility_not_connected">Net connectéiert.</string>
@@ -99,6 +97,7 @@
     <string name="empty_shade_text">Keng Notifikatiounen</string>
     <string name="quick_settings_disclosure_monitoring">D\'Netzwierk kéint iwwerwaacht sinn</string>
     <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>
+    <string name="volume_panel_dialog_settings_button">Astellungen</string>
     <string name="screen_pinning_positive">Verstanen</string>
     <string name="screen_pinning_negative">Nee Merci</string>
     <string name="stream_voice_call">Call</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sc-rIT/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-sc-rIT/strings.xml
index 4ac3187..79950e1 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-sc-rIT/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-sc-rIT/strings.xml
@@ -67,9 +67,6 @@
     <string name="accessibility_phone_button">Telèfonu</string>
     <string name="accessibility_voice_assist_button">Assistèntzia de boghe</string>
     <string name="accessibility_unlock_button">Isbloca</string>
-    <string name="phone_label">abèrrere su telèfonu</string>
-    <string name="voice_assist_label">abèrrere s\'assistèntzia de boghe</string>
-    <string name="camera_label">abèrrere sa fotocàmera</string>
     <string name="cancel">Annulla</string>
     <string name="biometric_dialog_empty_space_description">Toca pro annullare s\'autenticatzione</string>
     <string name="biometric_dialog_authenticated">Autenticadu</string>
@@ -186,6 +183,7 @@
     <string name="monitoring_description_management_network_logging">S\'amministradore tuo at ativadu su registru de rete, chi controllat su tràficu in su dispositivu tuo.</string>
     <string name="legacy_vpn_name">VPN</string>
     <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>
+    <string name="volume_panel_dialog_settings_button">Impostatziones</string>
     <string name="screen_pinning_exposes_personal_data">Is datos personales diant pòdere èssere atzessìbiles (comente cuntatos e messàgios de posta eletrònica).</string>
     <string name="screen_pinning_positive">AB</string>
     <string name="screen_pinning_negative">No, gràtzias</string>
@@ -217,6 +215,7 @@
     <string name="enable_bluetooth_message">Pro collegare su tecladu cun sa tauledda, in antis de totu depes ativare su Bluetooth.</string>
     <string name="enable_bluetooth_confirmation_ok">Ativa</string>
     <string name="inline_done_button">Fatu</string>
+    <string name="inline_ok_button">Àplica</string>
     <string name="notification_channel_summary_low">Perunu sonu o vibratzione</string>
     <string name="notification_priority_title">Prioridade</string>
     <string name="notification_more_settings">Àteras cunfiguratziones</string>
diff --git a/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml b/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
index 61b248d..ae4dc3f 100644
--- a/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
@@ -350,7 +350,6 @@
     <string name="more_special_access_title">Rhagor</string>
     <string name="location_settings_title">Lleoliad</string>
     <string name="location_no_recent_access">Dim apiau diweddar</string>
-    <string name="driver_assistance_label"><xliff:g id="time" example="1 min. ago">%1$s</xliff:g> \u2022 Cynorthwyo Gyrrwr</string>
     <string name="location_settings_app_permissions_title">Caniatâd lefel apiau</string>
     <string name="location_settings_services_title">Gwasanaethau Lleoliad</string>
     <string name="microphone_no_recent_access">Dim apiau diweddar</string>
@@ -469,7 +468,6 @@
     <string name="storage_clear_user_data_text">Clirio\'r storfa</string>
     <string name="storage_clear_cache_btn_text">Clirio\'r cuddstôr</string>
     <string name="storage_clear_data_dlg_title">Dileu data\'r ap?</string>
-    <string name="storage_clear_data_dlg_text">Caiff holl ddata\'r ap hwn ei ddileu yn barhaol. Mae hyn yn cynnwys holl ffeiliau, gosodiadau, cyfrifon, cronfeydd data, ayyb.</string>
     <string name="storage_clear_failed_dlg_text">Methwyd â chlirio storfa ar gyfer yr ap.</string>
     <string name="storage_unmount_success">Dadfowntwyd <xliff:g id="name" example="SD card">%1$s</xliff:g> yn ddiogel</string>
     <string name="storage_unmount_failure">Methwyd â dadfowntio <xliff:g id="name" example="SD card">%1$s</xliff:g> yn ddiogel</string>
diff --git a/overlay/packages/apps/Car/Settings/res/values-gd/strings.xml b/overlay/packages/apps/Car/Settings/res/values-gd/strings.xml
index 0bd8300..5896f95 100644
--- a/overlay/packages/apps/Car/Settings/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Car/Settings/res/values-gd/strings.xml
@@ -461,7 +461,6 @@
     <string name="storage_clear_user_data_text">Falamhaich an stòras</string>
     <string name="storage_clear_cache_btn_text">Falamhaich an tasgadan</string>
     <string name="storage_clear_data_dlg_title">An sguab sinn às dàta na h-aplacaid?</string>
-    <string name="storage_clear_data_dlg_text">Thèid dàta gu lèir na h-aplacaid seo a sguabadh às gu buan. Gabhaidh seo a-steach a h-uile faidhle, roghainn, cunntas, stòr-dàta is msaa.</string>
     <string name="storage_clear_failed_dlg_text">Tha b’ urrainn dhuinn an stòras fhalamhachadh dhan aplacaid.</string>
     <string name="storage_unmount_success">Chaidh <xliff:g id="name" example="SD card">%1$s</xliff:g> a ghluasad a-mach gu sàbhailte</string>
     <string name="storage_unmount_failure">Cha b’ urrainn dhuinn <xliff:g id="name" example="SD card">%1$s</xliff:g> a ghluasad a-mach gu sàbhailte</string>
diff --git a/overlay/packages/apps/Settings/res/values-ast-rES/strings.xml b/overlay/packages/apps/Settings/res/values-ast-rES/strings.xml
index 05afec2..36394e2 100644
--- a/overlay/packages/apps/Settings/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-ast-rES/strings.xml
@@ -264,6 +264,8 @@
     <string name="select_invalid_bug_report_handler_toast_text">Esta escoyeta yá nun ye válida. Volvi tentalo.</string>
     <string name="cards_passes_sentence">Tarxetes y pases</string>
     <string name="cards_passes_lower">tarxetes y pases</string>
+    <string name="power_menu_long_press_for_power_menu_title">Menú d\'apagáu</string>
+    <string name="power_menu_long_press_for_assistant_title">Asistente dixital</string>
     <string name="provider_internet_settings">Internet</string>
     <string name="provider_network_settings_title">SIMs</string>
     <string name="sms_preference_title">SMS</string>
diff --git a/overlay/packages/apps/Settings/res/values-cy/strings.xml b/overlay/packages/apps/Settings/res/values-cy/strings.xml
index 663de6d..18784c1 100644
--- a/overlay/packages/apps/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-cy/strings.xml
@@ -374,7 +374,7 @@
     <string name="security_settings_face_enroll_introduction_title">Datgloi gyda dy wyneb</string>
     <string name="security_settings_face_enroll_consent_introduction_title">Caniatáu Datgloi ag Wyneb</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled">Defnyddio dy wyneb i ddilysu</string>
-    <string name="security_settings_face_enroll_introduction_message">Defnyddia dy wyneb i ddatgloi dy ffôn, caniatáu taliadau, neu fewngofnodi i apiau.</string>
+    <string name="security_settings_face_enroll_introduction_message" product="default">Defnyddia dy wyneb i ddatgloi dy ffôn, caniatáu taliadau, neu fewngofnodi i apiau.</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled">Defnyddia dy wyneb i ddatgloi dy ffôn neu i awdurdodi taliadau.\n\nNoder: Ni ellir defnyddio dy wyneb i ddatgloi\u2019r ddyfais hon. Am ragor o wybodaeth, cysyllta â gweinyddwr dy sefydliad.</string>
     <string name="security_settings_face_enroll_introduction_message_setup">Defnyddia dy wyneb i ddatgloi dy ffôn, caniatáu taliadau, neu fewngofnodi i apiau</string>
     <string name="security_settings_face_enroll_repeat_title">Rho dy wyneb yn y cylch</string>
@@ -427,7 +427,7 @@
     <string name="security_settings_fingerprint_enroll_consent_introduction_title">Caniatáu datgloi ag ôl bys</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled">Defnyddio ôl dy fys</string>
     <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="default">Defnyddio ôl dy fys i ddatgloi dy ffôn neu i ddilysu mai ti sy\u2019n ei ddefnyddio, fel pan fyddi\u2019n mewngofnodi i apiau neu\u2019n cadarnhau taliadau.</string>
-    <string name="security_settings_fingerprint_enroll_introduction_consent_message">Caniatáu i dy blentyn defnyddio ôl ei fys i ddatgloi ei ffôn neu ddilysu mai nhw sydd yn ei ddefnyddio. Mae hyn yn digwydd wrth iddyn nhw fewngofnodi i apiau, cymeradwyo taliadau, a mwy.</string>
+    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default">Caniatáu i dy blentyn defnyddio ôl ei fys i ddatgloi ei ffôn neu ddilysu mai nhw sydd yn ei ddefnyddio. Mae hyn yn digwydd wrth iddyn nhw fewngofnodi i apiau, cymeradwyo taliadau, a mwy.</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_1">Rwyt mewn rheolaeth</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1">Rwyt ti a dy blentyn mewn rheolaeth</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_2">Cofia</string>
@@ -442,16 +442,16 @@
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text">Dyw gosod ôl bys ond yn cymryd munud neu ddau. Os wyt yn neidio hyn, mi fydd yn bosib gosod dy ôl fys yn y gosodiadau yn hwyrach.</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup">Pan weli\'r eicon hwn, defnyddia ôl dy fys i ddilysu, fel pan fyddi\'n mewngofnodi i apiau neu\'n cadarnhau taliad</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1">Cofia</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1">Gall ddefnyddio ôl dy fys i ddatgloi dy ffôn fod yn llai diogel na PIN neu batrwm cryf</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="default">Gall ddefnyddio ôl dy fys i ddatgloi dy ffôn fod yn llai diogel na PIN neu batrwm cryf</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2">Sut mae\'n gweithio</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2">Mae Datgloi ag Ôl Bys yn creu model unigryw o ôl dy fys i ddilysu mai ti sydd yno. I greu\u2019r model hwn ar ddechrau, rhaid cymryd lluniau o ôl dy fys o wahanol fannau.</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2">Mae Datgloi ag Ôl Bys yn creu model unigryw o ôl bys dy blentyn i ddilysu mai nhw sydd yno. I greu\u2019r model hwn ar ddechrau, rhaid cymryd lluniau o\'r ôl bys o wahanol fannau.</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3">Pan wyt yn defnyddio Pixel Imprint, defnyddir y delweddau i ddiweddaru model ôl dy fys. Dyw\u2019r delweddau hyn byth yn cael eu cadw, ond mae\u2019r model ôl bys yn cael ei gadw\u2019n ddiogel ar dy ddyfais a byth yn gadael y ddyfais. Mae\u2019r holl brosesu yn digwydd yn ddiogel ar dy ddyfais.</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3">Pan mae nhw\u2019n defnyddio Pixel Imprint, defnyddir y delweddau i ddiweddaru model ôl eu bys. Dyw\u2019r delweddau hyn byth yn cael eu cadw, ond mae\u2019r model ôl bys yn cael ei gadw\u2019n ddiogel ar eu dyfais a byth yn gadael y ddyfais. Mae\u2019r holl brosesu yn digwydd yn ddiogel ar eu dyfais.</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4">Gellir dileu delweddau a model ôl dy fys neu droi Datgloi ag Ôl Bys i ffwrdd unrhyw bryd yn Gosodiadau. Mae delweddau a modelau olion bysedd yn cael eu cadw ar y ddyfais nes dy fod yn eu dileu.</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4">Gellir dileu delweddau a model ôl eu bys neu droi Datgloi ag Ôl Bys i ffwrdd unrhyw bryd yn Gosodiadau. Mae delweddau a modelau olion bysedd yn cael eu cadw ar y ddyfais nes eu bod yn cael eu dileu.</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5">Gellir datgloi dy ddyfais heb i ti fwriadu gwneud, fel os yw rhywun yn ei dal at dy fys.</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5">Gellir datgloi eu dyfais heb iddynt fwriadu gwneud, fel os yw rhywun yn ei dal at eu bys.</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="default">Pan wyt yn defnyddio Pixel Imprint, defnyddir y delweddau i ddiweddaru model ôl dy fys. Dyw\u2019r delweddau hyn byth yn cael eu cadw, ond mae\u2019r model ôl bys yn cael ei gadw\u2019n ddiogel ar dy ddyfais a byth yn gadael y ddyfais. Mae\u2019r holl brosesu yn digwydd yn ddiogel ar dy ddyfais.</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="default">Pan mae nhw\u2019n defnyddio Pixel Imprint, defnyddir y delweddau i ddiweddaru model ôl eu bys. Dyw\u2019r delweddau hyn byth yn cael eu cadw, ond mae\u2019r model ôl bys yn cael ei gadw\u2019n ddiogel ar eu dyfais a byth yn gadael y ddyfais. Mae\u2019r holl brosesu yn digwydd yn ddiogel ar eu dyfais.</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="default">Gellir dileu delweddau a model ôl dy fys neu droi Datgloi ag Ôl Bys i ffwrdd unrhyw bryd yn Gosodiadau. Mae delweddau a modelau olion bysedd yn cael eu cadw ar y ddyfais nes dy fod yn eu dileu.</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="default">Gellir dileu delweddau a model ôl eu bys neu droi Datgloi ag Ôl Bys i ffwrdd unrhyw bryd yn Gosodiadau. Mae delweddau a modelau olion bysedd yn cael eu cadw ar y ddyfais nes eu bod yn cael eu dileu.</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default">Gellir datgloi dy ddyfais heb i ti fwriadu gwneud, fel os yw rhywun yn ei dal at dy fys.</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default">Gellir datgloi eu dyfais heb iddynt fwriadu gwneud, fel os yw rhywun yn ei dal at eu bys.</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_try_adjusting">Newidia leoliad dy fys fymryn pob tro</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_partially_detected">Rho ganol ôl dy fys dros yr eicon</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_already_enrolled">Mae\u2019r ôl bys hwn eisoes wedi\u2019i ychwanegu</string>
@@ -492,6 +492,7 @@
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description">Darlun yn dangos lleoliad y synhwyrydd ôl bys ar y ddyfais</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label">Enw</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok">Iawn</string>
+    <string name="security_settings_fingerprint_enroll_dialog_try_again">Ceisio eto</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete">Dileu</string>
     <string name="security_settings_fingerprint_enroll_start_title">Cyffyrdda\'r synhwyrydd</string>
     <string name="security_settings_fingerprint_enroll_start_message">Rho dy fys ar y synhwyrydd a\'i godi ar ôl iddo ddirgrynu</string>
@@ -503,10 +504,13 @@
     <string name="security_settings_fingerprint_enroll_repeat_message">Dalia i godi dy fys i ychwanegu gwahanol rannau o ôl dy fys.</string>
     <string name="security_settings_udfps_enroll_repeat_message">Cyffyrdda a dal pob tro mae\u2019r eicon ôl bys yn symud. Mae hyn yn helpu cadw mwy o ôl dy fys.</string>
     <string name="security_settings_udfps_enroll_fingertip_title">Rho ben dy fys ar y synhwyrydd</string>
+    <string name="security_settings_sfps_enroll_fingertip_title">Rho ben dy fys ar y synhwyrydd</string>
     <string name="security_settings_udfps_enroll_edge_message">Rho ochr ôl dy fys ar y synhwyrydd a\u2019i dal, yna newid i\u2019r ochr arall</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message">Mae hyn yn helpu cadw mwy o ôl dy fys</string>
+    <string name="security_settings_sfps_enroll_progress_a11y_message">Yn cofrestru\u2019r ôl bys <xliff:g id="percentage" example="10">%d</xliff:g> y cant</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message">Yn cofrestru\u2019r ôl bys <xliff:g id="percentage" example="10">%d</xliff:g> y cant</string>
     <string name="security_settings_fingerprint_enroll_finish_title">Ychwanegwyd yr ôl bys</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default">Nawr gellir defnyddio ôl dy fys i ddatgloi dy ddyfais a dilysu mai ti sy\u2019n ei ddefnyddio, fel pan rwyt yn mewngofnodi i apiau.</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip">Gwneud hyn yn hwyrach</string>
     <string name="security_settings_udfps_tip_fingerprint_help">Coda dy fys, yna cyffyrdda eto</string>
     <string name="security_settings_udfps_side_fingerprint_help">Rho ochr ôl dy fys ar y synhwyrydd a\u2019i dal, yna newid i\u2019r ochr arall</string>
@@ -564,8 +568,6 @@
     <string name="security_settings_fingerprint_enroll_done">Gorffen</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title">Wps, nid dyna\u2019r synhwyrydd</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message">Cyffyrdda\'r synhwyrydd ar gefn dy ffôn. Defnyddia dy fynegfys (bys cyntaf).</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title">Ni chwblhawyd y cofrestriad</string>
-    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message">Daeth amser i gofrestru\'r ôl bys i ben. Rho gynnig arall arni.</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message">Ni weithiodd cofrestriad ôl bys. Rho gynnig arall arni neu ddefnyddio bys arall.</string>
     <string name="fingerprint_enroll_button_add">Ychwanegu un arall</string>
     <string name="fingerprint_enroll_button_next">Nesaf</string>
@@ -577,10 +579,8 @@
     <string name="fingerprint_intro_error_max">Rwyt wedi ychwanegu\'r nifer mwyaf o olion bysau a ganiateir.</string>
     <string name="fingerprint_intro_error_unknown">Methu ag ychwanegu rhagor o ôl fysedd</string>
     <string name="fingerprint_last_delete_title">Tynnu pob un o\'r olion bysedd?</string>
-    <string name="fingerprint_delete_title">Tynnu \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
     <string name="fingerprint_delete_message">Wyt ti am ddileu\'r ôl bys hwn?</string>
-    <string name="fingerprint_v2_delete_message">Mae hyn yn dileu model a delweddau ôl bys sydd ar y ddyfais yn gysylltiedig a \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
-    <string name="fingerprint_last_delete_message">Ni fydd yn bosib defnyddio ôl dy fys i ddatgloi dy ddyfais na dilysu mai ti sy\u2019n defnyddio apiau.</string>
+    <string name="fingerprint_last_delete_message" product="default">Ni fydd yn bosib defnyddio ôl dy fys i ddatgloi dy ddyfais na dilysu mai ti sy\u2019n defnyddio apiau.</string>
     <string name="fingerprint_last_delete_message_profile_challenge">Ni fydd yn bosib defnyddio ôl dy fys i ddatgloi dy broffil gwaith, awdurdodi prynnu pethau, na mewngofnodi i apiau gwaith.</string>
     <string name="fingerprint_last_delete_confirm">Ie, dw i am ei dynnu</string>
     <string name="encryption_settings_title">Amgryptiad</string>
@@ -1413,15 +1413,12 @@
     <string name="style_suggestion_summary">Rho gynnig ar wahanol arddulliau, papurau wal, a mwy</string>
     <string name="screensaver_settings_title">Arbedwr sgrin</string>
     <string name="screensaver_settings_summary_either_long">Wrth wefru neu wedi docio</string>
-    <string name="screensaver_settings_summary_either_short">Y ddau</string>
     <string name="screensaver_settings_summary_sleep">Wrth wefru</string>
     <string name="screensaver_settings_summary_dock">Tra wedi\'i docio</string>
     <string name="screensaver_settings_summary_never">Byth</string>
     <string name="screensaver_settings_summary_off">I ffwrdd</string>
-    <string name="screensaver_settings_disabled_prompt">I reoli be sy\'n digwydd pan mae\'r ffôn wedi docio a/neu yn cysgu, rho\'r arbedwr sgrin ar waith.</string>
     <string name="screensaver_settings_when_to_dream">Pa bryd i ddechrau</string>
     <string name="screensaver_settings_current">Arbedwr sgrin cyfredol</string>
-    <string name="screensaver_settings_button">Gosodiadau</string>
     <string name="automatic_brightness">Disgleirdeb awtomatig</string>
     <string name="lift_to_wake_title">Codi i ddeffro</string>
     <string name="ambient_display_screen_title">Dangosydd amgylchynol</string>
@@ -1579,9 +1576,8 @@
     <string name="storage_menu_rename">Ailenwi</string>
     <string name="storage_menu_mount">Mowntio</string>
     <string name="storage_menu_unmount">Dadfowntio</string>
-    <string name="storage_menu_format">Fformatio</string>
     <string name="storage_menu_format_public">Fformatio fel datgysylltadwy</string>
-    <string name="storage_menu_format_private">Fformatio fel mewnol</string>
+    <string name="storage_menu_format_option">Fformatio</string>
     <string name="storage_menu_migrate">Mudo data</string>
     <string name="storage_menu_forget">Anghofio</string>
     <string name="storage_menu_set_up">Gosod</string>
@@ -1611,17 +1607,12 @@
     <string name="storage_rename_title">Ailenwi\'r storfa</string>
     <string name="storage_dialog_unmounted">Mae\'r <xliff:g id="name" example="SD card">^1</xliff:g> hwn wedi ei dadfowntio yn llwyddiannus, ond mae\'n dal i fod ar gael.\n\nI ddefnyddio\'r <xliff:g id="name" example="SD card">^1</xliff:g> hwn, rhaid yn gyntaf ei fowntio eto.</string>
     <string name="storage_dialog_unmountable">Mae\'r <xliff:g id="name" example="SD card">^1</xliff:g> hwn yn llygredig.\n\nI ddefnyddio\'r <xliff:g id="name" example="SD card">^1</xliff:g> hwn, rhaid yn gyntaf ei osod.</string>
-    <string name="storage_internal_format_details">Ar ôl fformatio, mae\'n bosib defnyddio <xliff:g id="name" example="SD card">^1</xliff:g> mewn dyfeisiau eraill.\n\nCaiff yr holl ddata ar <xliff:g id="name" example="SD card">^1</xliff:g> ei dileu, felly dylid ystyried creu copi wrth gefn cyn dechrau.\n\n<b>Creu copi wrth gefn o luniau a chyfryngau eraill</b>\nSymuda dy ffeiliau cyfryngau i storfa wahanol ar y ddyfais hon neu eu trosglwyddo i gyfrifiadur gan ddefnyddio gwifren USB.\n\n<b>Creu copi wrth gefn o apiau</b>\nCaiff pob ap sydd ar <xliff:g id="name" example="SD card">^1</xliff:g> ei ddadosod a\'i data ei dileu. I gadw\'r apiau hyn, symuda nhw i storfa arall ar y ddyfais hon.</string>
     <string name="storage_internal_unmount_details"><b>Pan fyddi di\'n dadfowntio\'r <xliff:g id="name" example="SD card">^1</xliff:g>, bydd apiau arno yn stopio gweithio a bydd ffeiliau cyfryngau arno ddim ar gael nes ei fod yn cael ei ail-fowntio.</b>\n\nMae\'r <xliff:g id="name" example="SD card">^1</xliff:g> wedi ei fformatio i weithio ar y ddyfais hon yn unig. Ni fydd yn gweithio ar unrhyw ddyfeisiau eraill.</string>
     <string name="storage_internal_forget_details">I ddefnyddio apiau, lluniau neu ddata <xliff:g id="name" example="SD card">^1</xliff:g>, rho gynnig ar ei ailosod yn y ddyfais.\n\nFel arall, mae\'n bosib dewis anghofio\'r storfa hon os nad yw\'r ddyfais ar gael.\n\nOs wyt yn dewis ei anghofio, bydd yr holl ddata mae\'r ddyfais yn ei gynnwys yn cael ei golli am byth.\n\nMae\'n bosib ailosod yr apiau yn hwyrach, ond bydd y data maen nhw wedi cadw ar y ddyfais hon wedi ei golli.</string>
     <string name="storage_internal_forget_confirm_title">Anghofio <xliff:g id="name" example="SD card">^1</xliff:g>?</string>
     <string name="storage_internal_forget_confirm">Caiff yr holl apiau, lluniau a data ar y <xliff:g id="name" example="SD card">^1</xliff:g> eu colli am byth.</string>
     <string name="storage_detail_dialog_system">Mae\'r system yn cynnwys ffeiliau defnyddir i redeg Android fersiwn <xliff:g id="version" example="8.0">%s</xliff:g></string>
     <string name="storage_wizard_init_title">Gosod y <xliff:g id="name" example="SD card">^1</xliff:g></string>
-    <string name="storage_wizard_init_external_title">Defnyddio fel storfa datgysylltadwy</string>
-    <string name="storage_wizard_init_external_summary">Er mwyn medru symud lluniau a ffeiliau eraill rhwng gwahanol ddyfeisiau.</string>
-    <string name="storage_wizard_init_internal_title">Defnyddio fel storfa fewnol</string>
-    <string name="storage_wizard_init_internal_summary">Er mwyn cadw unrhyw beth beth ar y ddyfais hon yn unig, gan gynnwys apiau a lluniau. Bydd rhaid ei fformatio a ni fydd yn gweithio gyda dyfeisiau eraill.</string>
     <string name="storage_wizard_format_confirm_title">Fformatio fel storfa fewnol</string>
     <string name="storage_wizard_format_confirm_body">Mae hyn angen fod <xliff:g id="name" example="SD card">^1</xliff:g> yn cael ei fformatio i\'w wneud yn ddiogel.\n\nAr ôl ei fformatio, bydd <xliff:g id="name" example="SD card">^1</xliff:g> ond yn gweithio yn y ddyfais hon.\n\n<b>Mae fformatio yn dileu\'r holl ddata sydd eisoes ar <xliff:g id="name" example="SD card">^1</xliff:g>.</b> Er mwyn osgoi colli\'r data, mae\'n dda ystyried creu copi wrth gefn.</string>
     <string name="storage_wizard_format_confirm_public_title">Fformatio fel storfa datgysylltadwy</string>
@@ -1642,9 +1633,6 @@
 \n\u2022 Bydd rhai apiau ddim yn gweithio\'n gywir.
 \n\u2022 Cadwa\'r ddyfais wedi\'i gwefru.
     </string>
-    <string name="storage_wizard_ready_title">Mae\'r <xliff:g id="name" example="SD card">^1</xliff:g> yn barod i\'w ddefnyddio</string>
-    <string name="storage_wizard_ready_external_body">Mae\'r <xliff:g id="name" example="SD card">^1</xliff:g> wedi ei osod ac yn barod i\'w ddefnyddio gyda lluniau a chyfryngau eraill.</string>
-    <string name="storage_wizard_ready_internal_body">Mae dy <xliff:g id="name" example="SD card">^1</xliff:g> newydd yn gweithio.\n\nI symud lluniau, ffeiliau, a data apiau i\'r ddyfais hon, gweler Dewisiadau &gt; Storfa.    </string>
     <string name="storage_wizard_move_confirm_title">Symud <xliff:g id="app" example="Calculator">^1</xliff:g></string>
     <string name="storage_wizard_move_confirm_body">Bydd symud <xliff:g id="app" example="Calculator">^1</xliff:g> a\'i ddata i <xliff:g id="name" example="SD card">^2</xliff:g> ond yn cymryd ychydig funudau. Ni fyddi\'n medru defnyddio\'r ap nes bod y trosglwyddo wedi ei gwblhau.\n\nPaid â thynnu <xliff:g id="name" example="SD card">^2</xliff:g> nes bod y trosglwyddo wedi ei gwblhau.</string>
     <string name="storage_wizard_move_unlock">I symud data mae angen datgloi\'r defnyddiwr <xliff:g id="app" example="Joey">^1</xliff:g>.</string>
@@ -1657,16 +1645,10 @@
 \n\nMae\'n bosib parhau, ond mae\'n bosib y bydd apiau sy\'n cael eu symud i\'r lleoliad hwn yn araf wrth stopio a dechrau a gall trosglwyddo data gymryd amser hir.
 \n\nYstyria defnyddio <xliff:g id="name" example="SD card">^1</xliff:g> mwy cyflym ar gyfer perfformiad gwell.</string>
     <string name="storage_wizard_init_v2_title">Sut fydd y <xliff:g id="name" example="SD card">^1</xliff:g> yn cael ei ddefnyddio?</string>
-    <string name="storage_wizard_init_v2_internal_title" product="tablet">Defnyddio ar gyfer storfa llechen ychwanegol</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="tablet">Ar gyfer apiau, ffeiliau a chyfryngau ar y llechen hon yn unig</string>
-    <string name="storage_wizard_init_v2_internal_action" product="tablet">Storfa\'r llechen</string>
-    <string name="storage_wizard_init_v2_internal_title" product="default">Defnyddio ar gyfer storfa ffôn ychwanegol</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="default">Ar gyfer apiau, ffeiliau a chyfryngau ar y ffôn hwn yn unig</string>
-    <string name="storage_wizard_init_v2_internal_action" product="default">Storfa\'r ffôn</string>
+    <string name="storage_wizard_init_v2_internal_action" product="tablet">Fformatio</string>
+    <string name="storage_wizard_init_v2_internal_action" product="default">Fformatio</string>
     <string name="storage_wizard_init_v2_or">Neu</string>
-    <string name="storage_wizard_init_v2_external_title">Defnyddio storfa datgysylltadwy</string>
-    <string name="storage_wizard_init_v2_external_summary">Er mwyn trosglwyddo ffeiliau a chyfryngau rhwng dyfeisiau</string>
-    <string name="storage_wizard_init_v2_external_action">Storfeydd datgysylltadwy</string>
+    <string name="storage_wizard_init_v2_external_action">Fformatio</string>
     <string name="storage_wizard_init_v2_later">Gosod rhywbryd eto</string>
     <string name="storage_wizard_format_confirm_v2_title">Fformatio\'r <xliff:g id="name" example="SD card">^1</xliff:g> hwn?</string>
     <string name="storage_wizard_format_confirm_v2_body">Mae angen fformatio\'r <xliff:g id="name" example="SanDisk SD card">^1</xliff:g> hwn er mwyn cadw apiau, ffeiliau a chyfryngau arno. \n\nBydd fformatio yn dileu unrhyw gynnwys sydd ar y <xliff:g id="name" example="SD card">^2</xliff:g>. I osgoi colli cynnwys, cadwa copi wrth gefn i <xliff:g id="name" example="SD card">^3</xliff:g> neu ddyfais arall.</string>
@@ -1690,10 +1672,6 @@
 \n\nRho gynnig ar ddefnyddio <xliff:g id="name" example="SD card">^3</xliff:g> cyflymach neu ddefnyddio\'r <xliff:g id="name" example="SD card">^4</xliff:g> hwn ar gyfer storfa gludadwy yn lle.</string>
     <string name="storage_wizard_slow_v2_start_over">Dechrau eto</string>
     <string name="storage_wizard_slow_v2_continue">Parhau</string>
-    <string name="storage_wizard_ready_v2_external_body">Gellir symud cynnwys i <xliff:g id="name" example="SanDisk SD card">^1</xliff:g></string>
-    <string name="storage_wizard_ready_v2_internal_body">I symud cynnwys i <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>. gweler <b>Gosodiadau &gt; Storfa</b></string>
-    <string name="storage_wizard_ready_v2_internal_moved_body">Cafodd dy gynnwys ei symud i <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>.
-\n\nI reoli\'r <xliff:g id="name" example="SD card">^2</xliff:g> hwn, gweler <b>Gosodiadau &gt; Storfa </b>.</string>
     <string name="battery_status_title">Statws batri</string>
     <string name="battery_level_title">Lefel batri</string>
     <string name="apn_settings">APNau</string>
@@ -1944,6 +1922,7 @@
     <string name="lockpassword_choose_your_pin_header">Gosoda PIN</string>
     <string name="lockpassword_choose_your_profile_pin_header">Gosoda PIN gwaith</string>
     <string name="lockpassword_choose_your_pattern_header">Gosoda batrwm</string>
+    <string name="lockpassword_choose_your_pattern_description">Am ddiogelwch ychwanegol, gosoda batrwm i ddatgloi\'r ddyfais</string>
     <string name="lockpassword_choose_your_profile_pattern_header">Gosoda batrwm gwaith</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint">I ddefnyddio ôl dy fys, gosoda gyfrinair</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint">I ddefnyddio ôl dy fys, gosoda batrwm</string>
@@ -2102,7 +2081,6 @@
     <string name="default_emergency_app">Ap mewn Argyfwng</string>
     <string name="reset_app_preferences">Ailosod dewisiadau apiau</string>
     <string name="reset_app_preferences_title">Ailosod dewisiadau apiau?</string>
-    <string name="reset_app_preferences_desc">Bydd hyn yn ailosod yr holl ddewisiadau ar gyfer:\n\n<li>Apiau wedi\'u hanalluogi</li>\n<li>Hysbysiadau apiau wedi\'u hanalluogi</li>\n<li>Apiau rhagosodedig ar gyfer gweithredoedd</li>\n<li>Cyfyngiadau data cefndirol apiau</li>\n<li>Unrhyw gyfyngiadau caniatâd</li>\n\nNi fyddwch yn colli unrhyw ddata apiau.</string>
     <string name="reset_app_preferences_button">Ailosod apiau</string>
     <string name="manage_space_text">Rheoli lle cof</string>
     <string name="filter">Hidlydd</string>
@@ -2669,7 +2647,6 @@
     <string name="advanced_battery_preference_title">Defnydd batri</string>
     <string name="advanced_battery_preference_summary_with_hours">Gweld defnydd y 24 awr ddiwethaf</string>
     <string name="advanced_battery_preference_summary">Gweld defnydd ers gwefru\'n llawn</string>
-    <string name="battery_details_title">Defnydd batri</string>
     <string name="details_subtitle">Manylion defnydd</string>
     <string name="controls_subtitle">Addasu defnydd pŵer</string>
     <string name="packages_subtitle">Pecynnau wedi\'u cynnwys</string>
@@ -2688,8 +2665,6 @@
     <string name="battery_tip_early_heads_up_done_summary">Gall fod rhai nodweddion wedi eu cyfyngu</string>
     <string name="battery_tip_high_usage_title">Defnydd batri uwch</string>
     <string name="battery_tip_high_usage_summary">Gweld yr apiau gyda\'r defnydd uchaf</string>
-    <string name="battery_tip_limited_temporarily_title">Gwefru wedi\'i gyfyngu dros dro</string>
-    <string name="battery_tip_limited_temporarily_summary">I warchod dy fatri. Dysgu mwy.</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge">Parhau i wefru</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default">Mewn rhai amgylchiadau, fel tymheredd uchel a chyfnodau gwefru hir, gall gwefru batri cael ei gyfyngu i <xliff:g id="percent" example="50%">%1$s</xliff:g> er mwyn gwarchod iechyd y batri.\n\nPan daw\'r fath amgylchiadau i ben, bydd y ddyfais yn gwefru\'n awtomatig fel arfer.</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet">Mewn rhai amgylchiadau, fel tymheredd uchel a chyfnodau gwefru hir, gall gwefru batri cael ei gyfyngu i <xliff:g id="percent" example="50%">%1$s</xliff:g> er mwyn gwarchod iechyd y batri.\n\nPan daw\'r fath amgylchiadau i ben, bydd y ddyfais yn gwefru\'n awtomatig fel arfer.</string>
@@ -2891,6 +2866,7 @@
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> • cefndir llai na munud\nam <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>
     <string name="battery_not_usage">Dim defnydd ers gwefru\'n llawn diwethaf</string>
     <string name="battery_not_usage_24hr">Dim defnydd dros y 24 awr ddiwethaf</string>
+    <string name="battery_usage_other_users">Defnyddwyr eraill</string>
     <string name="advanced_battery_graph_subtext">Mae\'r batri\'n weddill wedi\'i amcan ar sail defnydd dy ddyfais</string>
     <string name="estimated_time_left">Amcangyfrif amser yn weddill</string>
     <string name="estimated_charging_time_left">Nes wedi gwefru\'n llawn</string>
@@ -2934,8 +2910,7 @@
     <string name="battery_usage_background_less_than_one_minute">Cefndir: llai na munud</string>
     <string name="battery_usage_for_total_time">Cyfanswm: <xliff:g id="time">%s</xliff:g></string>
     <string name="battery_usage_for_background_time">Cefndir: <xliff:g id="time">%s</xliff:g></string>
-    <string name="battery_usage_screen_footer">Bras gyfrif yw data defnydd batri ac nid yw\'n mesur defnydd tra bod y batri\'n gwefru</string>
-    <string name="battery_usage_screen_footer_empty">Bydd defnydd data ar gael ar ôl defnyddio\'r ddyfais am rai oriau</string>
+    <string name="battery_usage_screen_footer" product="default">Bras gyfrif yw data defnydd batri ac nid yw\'n mesur defnydd tra bod y batri\'n gwefru</string>
     <string name="battery_usage_chart">Siart defnydd batri</string>
     <string name="process_stats_summary_title">Ystadegau Proses</string>
     <string name="process_stats_summary">Ystadegau manwl am brosesau sy\'n rhedeg</string>
@@ -3374,6 +3349,7 @@
     <string name="user_delete_button">Dileu</string>
     <string name="user_exit_guest_confirm_message">Caiff holl apiau a data\'r sesiwn hon eu dileu.</string>
     <string name="user_exit_guest_dialog_remove">Tynnu</string>
+    <string name="other_user_category_title">Defnyddwyr eraill</string>
     <string name="user_enable_calling">Troi galwadau ffôn ymlaen</string>
     <string name="user_enable_calling_sms">Troi galwadau ffôn a SMS ymlaen</string>
     <string name="user_remove_user">Dileu\'r defnyddiwr</string>
@@ -4816,6 +4792,9 @@
     <string name="battery_saver_button_turn_on">Troi ymlaen nawr</string>
     <string name="battery_saver_button_turn_off">Troi i ffwrdd nawr</string>
     <string name="not_battery_optimizing">Dim yn defnyddio optimeiddiad batri</string>
+    <string name="filter_battery_unrestricted_title">Dim cyfyngu</string>
+    <string name="filter_battery_optimized_title">Defnydd optimaidd</string>
+    <string name="filter_battery_restricted_title">Wedi\'i rhwystro</string>
     <string name="lockscreen_remote_input">Os yw\'r ddyfais ar glo, rhwystro teipio atebion neu destun arall mewn hysbysiadau.</string>
     <string name="default_spell_checker">Gwirydd sillafu rhagosodedig</string>
     <string name="choose_spell_checker">Dewisa gwirydd sillafu</string>
@@ -5254,7 +5233,6 @@
     <string name="prevent_ringing_option_none">Gwneud dim</string>
     <string name="prevent_ringing_option_vibrate_summary">Dirgrynu</string>
     <string name="prevent_ringing_option_mute_summary">Distewi</string>
-    <string name="prevent_ringing_option_unavailable_lpp_summary">I alluogi, newidia \"Pwyso a dal y botwm pŵer\" i\'r ddewislen pŵer</string>
     <string name="pref_title_network_details">Manylion y rhwydwaith</string>
     <string name="about_phone_device_name_warning">Mae enw dy ddyfais yn weladwy i apiau ar dy ffôn. Mae\'n bosib y bydd hefyd yn weladwy i eraill pan fyddi yn cysylltu â dyfeisiau Bluetooth, yn cysylltu â rhwydwaith Wi-Fi neu\'n creu llecyn Wi-Fi.</string>
     <string name="devices_title">Dyfeisiau</string>
@@ -5540,13 +5518,9 @@
     <string name="quick_controls_lower">Rheolyddion dyfais</string>
     <string name="cards_passes_sentence">Cardiau a phasiau</string>
     <string name="cards_passes_lower">cardiau a phasiau</string>
-    <string name="power_menu_setting_name">Pwyso a dal y botwm pŵer</string>
-    <string name="power_menu_summary_long_press_for_assist_enabled">Pwyso a dal am y Cynorthwyydd</string>
-    <string name="power_menu_summary_long_press_for_assist_disabled_with_power_menu">Pwysa a dal am y ddewislen pŵer</string>
+    <string name="power_menu_long_press_for_power_menu_title">Dewislen pŵer</string>
+    <string name="power_menu_long_press_for_assistant_title">Cynorthwyydd digidol</string>
     <string name="lockscreen_privacy_not_secure">I\'w ddefnyddio, rhaid yn gyntaf gosod sgrin cloi</string>
-    <string name="power_menu_long_press_for_assist">Dal am y Cynorthwyydd</string>
-    <string name="power_menu_long_press_for_assist_summary">Sbarduno\'r Cynorthwyydd gan ddal y botwm pŵer</string>
-    <string name="power_menu_power_volume_up_hint">Dewislen Pŵer ac Argyfwng:\nPwysa Pŵer a Sain i Fyny ar yr un pryd.</string>
     <string name="power_menu_long_press_for_assist_sensitivity_title">Hyd pwyso a dal</string>
     <string name="power_menu_long_press_for_assist_sensitivity_summary">Addasa sensitifrwydd gan ddewis pa mor hir i bwyso a dal y botwm pŵer</string>
     <string name="power_menu_long_press_for_assist_sensitivity_low_label">Byr</string>
diff --git a/overlay/packages/apps/Settings/res/values-eo/strings.xml b/overlay/packages/apps/Settings/res/values-eo/strings.xml
index ac03ce5..8dbce3f 100644
--- a/overlay/packages/apps/Settings/res/values-eo/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-eo/strings.xml
@@ -61,7 +61,6 @@
     <string name="volume_notification_description">Sciigoj</string>
     <string name="search_settings">Serĉi</string>
     <string name="screensaver_settings_summary_never">Neniam</string>
-    <string name="screensaver_settings_button">Agordoj</string>
     <string name="sim_enter_cancel">Nuligi</string>
     <string name="status_imei">IMEI</string>
     <string name="status_imei_sv">IMEI SV</string>
diff --git a/overlay/packages/apps/Settings/res/values-gd/strings.xml b/overlay/packages/apps/Settings/res/values-gd/strings.xml
index 5c27ac9..883158a 100644
--- a/overlay/packages/apps/Settings/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-gd/strings.xml
@@ -332,7 +332,7 @@
     <string name="security_settings_face_enroll_introduction_more">Barrachd</string>
     <string name="security_settings_face_enroll_introduction_title">Thoir a’ ghlas dheth le d’ aodann</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled">Cleachd d’ aonan a chùm dearbhaidh</string>
-    <string name="security_settings_face_enroll_introduction_message">Cleachd d’ aodann airson a’ ghlas a thoirt far an uidheim agad, ceannachdan ùghdarrachadh no clàradh a-steach gu aplacaidean.</string>
+    <string name="security_settings_face_enroll_introduction_message" product="default">Cleachd d’ aodann airson a’ ghlas a thoirt far an uidheim agad, ceannachdan ùghdarrachadh no clàradh a-steach gu aplacaidean.</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled">Cleachd d’ aodann airson a’ ghlas a thoirt far an fhòn agad no ceannachdan a dhearbhadh.\n\nAn aire: Chan urrainn dhut d’ aodann a chleachdadh airson a’ ghlas a thoirt far an uidheim seo. Cuir fios gu rianaire a’ bhuidhinn agad airson barrachd fiosrachaidh.</string>
     <string name="security_settings_face_enroll_introduction_message_setup">Cleachd d’ aodann airson a’ ghlas a thoirt far an uidheim agad, ceannachdan ùghdarrachadh no clàradh a-steach gu aplacaidean</string>
     <string name="security_settings_face_enroll_repeat_title">Cuir d’ aodann am meadhan a’ chearcaill</string>
@@ -381,6 +381,7 @@
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description">Sgead-dhealbh le uidheam agus an t-ionad aig mothaichear nan lorgan-meòir</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label">Ainm</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok">Ceart ma-thà</string>
+    <string name="security_settings_fingerprint_enroll_dialog_try_again">Feuch ris a‑rithist</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete">Sguab às</string>
     <string name="security_settings_fingerprint_enroll_start_title">Suath ris a’ mhothaichear</string>
     <string name="security_settings_fingerprint_enroll_start_message">Cuir do chorrag air a’ mhothaichear is tog e às dèidh crith fhaireachdainn</string>
@@ -398,8 +399,6 @@
     <string name="security_settings_fingerprint_enroll_done">Deiseil</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title">Iochd, chan e sin am mothaichear</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message">Suath ris a’ mhothaichear air cùlaibh an fhòn agad. Cleachd do sgealbag.</string>
-    <string name="security_settings_fingerprint_enroll_error_dialog_title">Cha deach an clàradh a choileanadh</string>
-    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message">Dh’fhalbh an ùine air clàradh na luirge-meòir. Feuch ris a-rithist.</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message">Cha deach le clàradh na luirge-meòir. Feuch ris a-rithist no cleachd corrag eile.</string>
     <string name="fingerprint_enroll_button_add">Cuir tè eile ris</string>
     <string name="fingerprint_enroll_button_next">Air adhart</string>
@@ -409,7 +408,6 @@
     <string name="fingerprint_intro_error_max">Chuir thu na tha ceadaichte de lorgan-meòir ris</string>
     <string name="fingerprint_intro_error_unknown">Chan urrainn dhut barrachd lorgan-meòir a chur ris</string>
     <string name="fingerprint_last_delete_title">An doir thu air falbh a h-uile lorg-mheòir?</string>
-    <string name="fingerprint_delete_title">Thoir air falbh “<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>”</string>
     <string name="fingerprint_delete_message">A bheil thu airson</string>
     <string name="fingerprint_last_delete_confirm">Bheir mi air falbh iad</string>
     <string name="encryption_settings_title">Crioptachadh</string>
@@ -1160,15 +1158,12 @@
     <string name="style_suggestion_summary">Cleachd stoidhlean eadar-dhealaichte, pàipearan-balla is a bharrachd</string>
     <string name="screensaver_settings_title">Sàbhalaiche-sgrìn</string>
     <string name="screensaver_settings_summary_either_long">Rè teàirrdseadh no docadh</string>
-    <string name="screensaver_settings_summary_either_short">An dà chuid</string>
     <string name="screensaver_settings_summary_sleep">Rè teàirrdsidh</string>
     <string name="screensaver_settings_summary_dock">Nuair a bhios e docaichte</string>
     <string name="screensaver_settings_summary_never">Chan ann idir</string>
     <string name="screensaver_settings_summary_off">Dheth</string>
-    <string name="screensaver_settings_disabled_prompt">Airson stiùireadh na thachras nuair a thèid am fòn a docadh agus/no a chur ’na chadal, cuir an sàbhalaiche-sgrìn air.</string>
     <string name="screensaver_settings_when_to_dream">Cuin a thòisicheas e</string>
     <string name="screensaver_settings_current">An sàbhalaiche-sgrìn làithreach</string>
-    <string name="screensaver_settings_button">Roghainnean</string>
     <string name="automatic_brightness">Soilleireachd fhèin-obrachail</string>
     <string name="lift_to_wake_title">Tog airson a dhùsgadh</string>
     <string name="ambient_display_screen_title">Taisbeanadh cuairteach</string>
@@ -1328,9 +1323,8 @@
     <string name="storage_menu_rename">Thoir ainm ùr air</string>
     <string name="storage_menu_mount">Munntaich</string>
     <string name="storage_menu_unmount">Gluais a-mach</string>
-    <string name="storage_menu_format">Fòrmataich</string>
     <string name="storage_menu_format_public">Fòrmat mar stòras so-ghiùlan</string>
-    <string name="storage_menu_format_private">Fòrmataich stòras inntearnail</string>
+    <string name="storage_menu_format_option">Fòrmataich</string>
     <string name="storage_menu_migrate">Imrich dàta</string>
     <string name="storage_menu_forget">Dìochuimhnich</string>
     <string name="storage_menu_set_up">Suidhich</string>
@@ -1361,12 +1355,6 @@
 \n\nAirson <xliff:g id="name" example="SD card">^1</xliff:g> a chleachdadh, feumaidh tu a mhunntachadh an toiseach.</string>
     <string name="storage_dialog_unmountable">Tha <xliff:g id="name" example="SD card">^1</xliff:g> coirbte.
 \n\nAirson <xliff:g id="name" example="SD card">^1</xliff:g> a chleachdadh, feumaidh tu a shuidheachadh an toiseach.</string>
-    <string name="storage_internal_format_details">Nuair a bhios tu air fhòrmatadh, ’s urrainn dhut <xliff:g id="name" example="SD card">^1</xliff:g> a chleachdadh ann an uidheaman eile.
-\n\nThèid dàta sam bith air <xliff:g id="name" example="SD card">^1</xliff:g> a shuathadh bàn. Saoil an dèan thu lethbhreac-glèidhidh dheth an toiseach?
-\n\n<b>Dèan lethbhreac-glèidhidh dhe na dealbhan ⁊ meadhanan eile</b>
-\nGluais na faidhlichean meadhain agad gu stòras eile air an uidheam seo no tar-chuir gu coimpiutair iad le càball USB.
-\n\n<b>Dèan lethbhreac-glèidhidh dhe na h-aplacaidean</b>
-\nThèid aplacaid sam bith a chaidh a stòradh air <xliff:g id="name" example="SD card">^1</xliff:g> a dhì-stàladh agus an dàta aca a shuathadh bàn. Airson na h-aplacaidean seo a chumail, gluais gu stòras eile air an uidheam seo iad.</string>
     <string name="storage_internal_unmount_details"><b>Nuair a ghluaiseas tu a-mach <xliff:g id="name" example="SD card">^1</xliff:g>, chan obraich na h-aplacaidean a tha ’gan stòradh air tuilleadh agus cha bhi na meadhanan a tha ’gan stòradh air ri làimh dhut mus cuir thu a-steach e a-rithist.</b>
 \n\nChaidh <xliff:g id="name" example="SD card">^1</xliff:g> fhòrmatadh air dòigh nach gabh a chleachdadh ach air an uidheam seo. Chan obraich e air uidheam sam bith eile.</string>
     <string name="storage_internal_forget_details">Airson na h-aplacaidean, na dealbhan no an dàta a th’ air <xliff:g id="name" example="SD card">^1</xliff:g> a chleachdadh, cuir a-steach e a-rithist.
@@ -1377,10 +1365,6 @@
     <string name="storage_internal_forget_confirm">Thèid aplacaidean, dealbhan is dàta sam bith a chaidh a stòradh air<xliff:g id="name" example="SD card">^1</xliff:g> air chall gu buan.</string>
     <string name="storage_detail_dialog_system">Tha an siostam a’ gabhail a-staigh faidhlichean airson tionndadh <xliff:g id="version" example="8.0">%s</xliff:g> de dh’Android a ruith</string>
     <string name="storage_wizard_init_title">Suidhich <xliff:g id="name" example="SD card">^1</xliff:g></string>
-    <string name="storage_wizard_init_external_title">Cleachd ’na stòras so-ghiùlan</string>
-    <string name="storage_wizard_init_external_summary">Airson dealbhan is meadhanan eile a ghluasad o uidheam gu uidheam.</string>
-    <string name="storage_wizard_init_internal_title">Cleachd ’na stòras inntearnail</string>
-    <string name="storage_wizard_init_internal_summary">Airson rud sam bith a stòradh air an uidheam seo a-mhàin, a’ gabhail a-staigh aplacaidean is dealbhan. Bidh feum air fòrmatadh a chuireas bacadh air a chleachdadh ann an uidheam sam bith eile.</string>
     <string name="storage_wizard_format_confirm_title">Fòrmataich mar stòras inntearnail</string>
     <string name="storage_wizard_format_confirm_body">Feumaidh thu <xliff:g id="name" example="SD card">^1</xliff:g> fhòrmatadh airson a dhèanamh tèarainte.
 \n\nNuair a bhios tu air fhòrmatadh, chan obraich <xliff:g id="name" example="SD card">^1</xliff:g> ach air an uidheam seo.
@@ -1407,11 +1391,6 @@
 \n\u2022 Chan obraich cuid dhe na h-aplacaidean mar bu chòir.
 \n\u2022 Cùm teàirrds air an uidheam.
     </string>
-    <string name="storage_wizard_ready_title">Tha <xliff:g id="name" example="SD card">^1</xliff:g> deis ri chleachdadh</string>
-    <string name="storage_wizard_ready_external_body">Tha <xliff:g id="name" example="SD card">^1</xliff:g> deis ri chleachdadh le dealbhan is meadhanan eile.</string>
-    <string name="storage_wizard_ready_internal_body">Tha <xliff:g id="name" example="SD card">^1</xliff:g> ag obair.
-\n\nAirson dealbhan, faidhlichean is dàta aplacaidean a ghluasad dhan uidheam ùr seo, rac gu “Roghainnean” &gt; “An stòras”.
-    </string>
     <string name="storage_wizard_move_confirm_title">Gluais <xliff:g id="app" example="Calculator">^1</xliff:g></string>
     <string name="storage_wizard_move_confirm_body">Cha doir e ach greiseag <xliff:g id="app" example="Calculator">^1</xliff:g> ’s an dàta aige a ghluasad gu <xliff:g id="name" example="SD card">^2</xliff:g>. Chan urrainn dhuit an aplacaid a chleachdadh gus am bi an gluasad deiseil.
 \n\nNa doir air falbh <xliff:g id="name" example="SD card">^2</xliff:g> rè a’ ghluasaid.
@@ -1426,16 +1405,10 @@
 \n\n’S urrainn dhut leantainn air adhart ach tha sinn an dùil gum bi na h-aplacaidean a ghluaiseas tu dhan uidheam seo stadach agus gun doir tar-chur dàta ùine mhòr.
 \n\nSaoil an cleachd thu <xliff:g id="name" example="SD card">^1</xliff:g> as luaithe airson dèanadas as fheàrr?</string>
     <string name="storage_wizard_init_v2_title">Ciamar a chleachdas tu a’ <xliff:g id="name" example="SD card">^1</xliff:g> seo?</string>
-    <string name="storage_wizard_init_v2_internal_title" product="tablet">Cleachd airson stòras tablaid a bharrachd</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="tablet">Airson aplacaidean, faidhlichean is meadhanan air an tablaid seo a-mhàin</string>
-    <string name="storage_wizard_init_v2_internal_action" product="tablet">Stòras tablaid</string>
-    <string name="storage_wizard_init_v2_internal_title" product="default">Cleachd airson stòras fòn a bharrachd</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="default">Airson aplacaidean, faidhlichean is meadhanan air an fhòn seo a-mhàin</string>
-    <string name="storage_wizard_init_v2_internal_action" product="default">Stòras an fhòn</string>
+    <string name="storage_wizard_init_v2_internal_action" product="tablet">Fòrmataich</string>
+    <string name="storage_wizard_init_v2_internal_action" product="default">Fòrmataich</string>
     <string name="storage_wizard_init_v2_or">No</string>
-    <string name="storage_wizard_init_v2_external_title">Cleachd airson stòras so-ghiùlan</string>
-    <string name="storage_wizard_init_v2_external_summary">Airson faidhlichean is meadhanan a thar-chur eadar uidheaman</string>
-    <string name="storage_wizard_init_v2_external_action">Stòras so-ghiùlan</string>
+    <string name="storage_wizard_init_v2_external_action">Fòrmataich</string>
     <string name="storage_wizard_init_v2_later">Suidhich uaireigin eile e</string>
     <string name="storage_wizard_format_confirm_v2_title">A bheil thu airson a’ <xliff:g id="name" example="SD card">^1</xliff:g> seo fhòrmatadh?</string>
     <string name="storage_wizard_format_confirm_v2_body">Tha <xliff:g id="name" example="SanDisk SD card">^1</xliff:g> feumach air fòrmatadh airson aplacaidean, faidhlichean is meadhanan a stòradh air.
@@ -1460,10 +1433,6 @@
 \n\nFeuch an cleachd thu <xliff:g id="name" example="SD card">^3</xliff:g> nas luaithe no gun cleachd thu a’ <xliff:g id="name" example="SD card">^4</xliff:g> mar stòras so-ghiùlan ’na àite.</string>
     <string name="storage_wizard_slow_v2_start_over">Tòisich às ùr</string>
     <string name="storage_wizard_slow_v2_continue">Air adhart</string>
-    <string name="storage_wizard_ready_v2_external_body">’S urrainn dhut susbaint a ghluasad gu <xliff:g id="name" example="SanDisk SD card">^1</xliff:g></string>
-    <string name="storage_wizard_ready_v2_internal_body">Airson susbaint a ghluasad gu <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>, tadhail air <b>Roghainnean &gt; Stòras</b></string>
-    <string name="storage_wizard_ready_v2_internal_moved_body">Chaidh an t-susbaint agad a ghluasad gu <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>.
-\n\nAirson a’ <xliff:g id="name" example="SD card">^2</xliff:g> seo a stiùireadh, tadhail air <b>Roghainnean &gt; Stòras</b>.</string>
     <string name="battery_status_title">Staid a’ bhataraidh</string>
     <string name="battery_level_title">Leibheil a’ bhataraidh</string>
     <string name="apn_settings">APNs</string>
@@ -1851,7 +1820,6 @@
     <string name="default_emergency_app">Aplacaid èiginn</string>
     <string name="reset_app_preferences">Ath-shuidhich roghainnean nan aplacaidean</string>
     <string name="reset_app_preferences_title">An ath-shuidhich thu roghainnean nan aplacaidean?</string>
-    <string name="reset_app_preferences_desc">Nì seo ath-shuidheachadh air gach roghainn dha:\n\n        <li>Aplacaidean à comas</li>\n        <li>Brathan aplacaidean à comas</li>\n        <li>Aplacaidean bunaiteach airson gnìomhan</li>\n        <li>Cuingeachadh air dàta sa chùlaibh air aplacaidean</li>\n        <li>Cuingeachadh air cead sam bith</li>\n\nCha chaill thu dàta aplacaid sam bith.</string>
     <string name="reset_app_preferences_button">Ath-shuidhich na h-aplacaidean</string>
     <string name="manage_space_text">Stiùir an àite</string>
     <string name="filter">Criathrag</string>
@@ -2359,7 +2327,6 @@
     <string name="advanced_battery_title">Caitheamh a’ bhataraidh</string>
     <string name="history_details_title">Mion-fhiosrachadh na h-eachdraidh</string>
     <string name="advanced_battery_preference_title">Caitheamh a’ bhataraidh</string>
-    <string name="battery_details_title">Caitheamh a’ bhataraidh</string>
     <string name="details_subtitle">Mion-fhiosrachadh mun chaitheamh</string>
     <string name="controls_subtitle">Cuir gleus air caitheamh na cumhachd</string>
     <string name="packages_subtitle">Na pacaidean ’gan gabhail a-staigh</string>
@@ -2530,6 +2497,7 @@
     <string name="battery_detail_power_usage">Caitheamh a’ bhataraidh</string>
     <string name="battery_detail_info_title">On làn-teàirrds mu dheireadh</string>
     <string name="battery_detail_manage_title">Stiùirich caitheamh a’ bhataraidh</string>
+    <string name="battery_usage_other_users">Cleachdaichean eile</string>
     <string name="advanced_battery_graph_subtext">Tha an tuairmse air dè cho fada ’s a mhaireas am bataraidh stèidhichte air cleachdadh an uidheim</string>
     <string name="estimated_time_left">Tuairmse air an t-àm a tha air fhàgail</string>
     <string name="estimated_charging_time_left">Gus am bi e air a làn-teàirrdseadh</string>
@@ -2996,6 +2964,7 @@
     <string name="user_delete_button">Sguab às</string>
     <string name="user_exit_guest_confirm_message">Thèid a h-uile aplacaid is dàta san t-seisean seo a sguabadh às.</string>
     <string name="user_exit_guest_dialog_remove">Thoir air falbh</string>
+    <string name="other_user_category_title">Cleachdaichean eile</string>
     <string name="user_enable_calling">Cuir gairmean fòn air</string>
     <string name="user_enable_calling_sms">Cuir gairmean fòn ⁊ SMS air</string>
     <string name="user_remove_user">Sguab às an cleachdaiche</string>
@@ -4292,6 +4261,7 @@
     <string name="battery_saver_button_turn_on">Cuir air an-dràsta</string>
     <string name="battery_saver_button_turn_off">Cuir dheth an-dràsta</string>
     <string name="not_battery_optimizing">Gun phiseachadh a’ bhataraidh</string>
+    <string name="filter_battery_restricted_title">Cuingichte</string>
     <string name="lockscreen_remote_input">Nuair a bhios an t-uidheam glaiste, bac sgrìobhadh freagairte no teacsa eile am broinn bratha</string>
     <string name="default_spell_checker">An dearbhair-litreachaidh bunaiteach</string>
     <string name="choose_spell_checker">Tagh dearbhair-litreachaidh</string>
@@ -4909,6 +4879,7 @@
     <string name="quick_controls_lower">uidheaman-smachd do dh’uidheaman</string>
     <string name="cards_passes_sentence">Cairtean ⁊ pasaichean</string>
     <string name="cards_passes_lower">cairtean ⁊ pasaichean</string>
+    <string name="power_menu_long_press_for_power_menu_title">Clàr-taice na cumhachd</string>
     <string name="lockscreen_privacy_not_secure">Suidhich glas na sgrìn mus cleachd thu seo</string>
     <string name="power_menu_long_press_for_assist_sensitivity_low_label">Goirid</string>
     <string name="power_menu_long_press_for_assist_sensitivity_high_label">Fada</string>
diff --git a/overlay/packages/apps/Settings/res/values-kab-rDZ/strings.xml b/overlay/packages/apps/Settings/res/values-kab-rDZ/strings.xml
index 58e6f85..c7b6b24 100644
--- a/overlay/packages/apps/Settings/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-kab-rDZ/strings.xml
@@ -109,6 +109,7 @@
     <string name="security_settings_udfps_enroll_find_sensor_start_button">Bdu</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label">Isem</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok">IH</string>
+    <string name="security_settings_fingerprint_enroll_dialog_try_again">Ɛreḍ tikkelt nniḍen</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete">Kkes</string>
     <string name="security_settings_fingerprint_enroll_done">Immed</string>
     <string name="fingerprint_enroll_button_next">Γer zdat</string>
@@ -258,7 +259,6 @@
     <string name="screensaver_settings_summary_sleep">Mara ittɛemmiṛ</string>
     <string name="screensaver_settings_summary_never">Weṛǧin</string>
     <string name="screensaver_settings_summary_off">Insa</string>
-    <string name="screensaver_settings_button">Iγewwaṛen</string>
     <string name="automatic_brightness">Luminosité automatique</string>
     <string name="ambient_display_screen_title">Askan n uskar n ugani</string>
     <string name="title_font_size">Teγzi n tsefsit</string>
@@ -291,7 +291,6 @@
     <string name="storage_menu_set_up">Sebded</string>
     <string name="storage_menu_manage">Sefrek aḥraz</string>
     <string name="storage_wizard_migrate_confirm_next">Senkez</string>
-    <string name="storage_wizard_init_v2_internal_action" product="default">Aḥraz n tiltiɣri</string>
     <string name="storage_wizard_slow_v2_start_over">Ales tanekra</string>
     <string name="storage_wizard_slow_v2_continue">Kemmel</string>
     <string name="apn_not_set">Ur ittwasbadu ara</string>
@@ -787,6 +786,7 @@
     <string name="data_saver_title">Aḥraz n isefka</string>
     <string name="data_saver_off">Insa</string>
     <string name="battery_saver_off_summary">Insa</string>
+    <string name="filter_battery_restricted_title">Yesεa tilas</string>
     <string name="spell_checker_not_selected">Ur yettwafren ara</string>
     <string name="notification_log_no_title">(ulac)</string>
     <string name="notification_log_details_delimiter">": "</string>
@@ -882,6 +882,7 @@
     <string name="personal_profile_app_subtext">Udmawan</string>
     <string name="work_profile_app_subtext">Axeddim</string>
     <string name="system_default_app_subtext">Amezwer n unagraw</string>
+    <string name="power_menu_long_press_for_power_menu_title">Umuɣ n usenker/useḥbes</string>
     <string name="power_menu_long_press_for_assist_sensitivity_low_label">Awezlan</string>
     <string name="power_menu_long_press_for_assist_sensitivity_high_label">Aɣezfan</string>
     <string name="media_controls_title">Amidya</string>
diff --git a/overlay/packages/apps/Settings/res/values-ku/strings.xml b/overlay/packages/apps/Settings/res/values-ku/strings.xml
index 9543dd4..f8c2687 100644
--- a/overlay/packages/apps/Settings/res/values-ku/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-ku/strings.xml
@@ -414,11 +414,9 @@
     <string name="wallpaper_settings_title">وێنەی سەر شاشە</string>
     <string name="wallpaper_settings_summary_default">بنێڕه‌ت</string>
     <string name="wallpaper_settings_fragment_title">دیوارپۆشێک هەڵبژێرە لە</string>
-    <string name="screensaver_settings_summary_either_short">یان</string>
     <string name="screensaver_settings_summary_sleep">کاتێک بارگاوی ئەکات</string>
     <string name="screensaver_settings_summary_dock">کاتێک لە تابگەیە</string>
     <string name="screensaver_settings_summary_off">ناچالاککردن</string>
-    <string name="screensaver_settings_button">رێکخستەکان</string>
     <string name="automatic_brightness">ڕوناکی خۆکارانه‌</string>
     <string name="title_font_size">قه‌باره‌ی فۆنت</string>
     <string name="sim_lock_settings">ڕێکخستنی قوفڵی سیمکارت</string>
@@ -982,6 +980,7 @@
     <string name="battery_sugg_apps_gps">دیاریکردنی باری باتری-پارێز</string>
     <string name="battery_sugg_apps_settings">بەرنامەکە لەوانەیە ڕێکخستن پێشکەش بکات بۆ کەمکردنەوەی بەکارهێنانی باتری</string>
     <string name="battery_desc_users">باتریەکە بەکارهاتوە لەلایەن بەکارهێنەرەوە</string>
+    <string name="battery_usage_other_users">بەکارهێنەری تر</string>
     <string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> لەوەتەی لە پلاگەکەوە کراوەتەوە</string>
     <string name="menu_stats_last_unplugged">کاتێک لە پلاگ دەرکرا کۆتاجار <xliff:g id="unplugged">%1$s</xliff:g></string>
     <string name="menu_stats_total">بەکارهێنانی گشتی</string>
@@ -1196,6 +1195,7 @@
     <string name="user_adding_new_user">زیادکردنی بەکارهێنەری تازە\u2026</string>
     <string name="user_delete_user_description">سڕینەوەی بەکارهێنەر</string>
     <string name="user_delete_button">سڕینه‌وه‌</string>
+    <string name="other_user_category_title">بەکارهێنەری تر</string>
     <string name="user_remove_user">سڕینەوەی بەکارهێنەر</string>
     <string name="application_restrictions">ڕێگەدان بە بەرنامە و ناوەڕۆک</string>
     <string name="apps_with_restrictions_header">بەرنامەکان لەگەڵ سنورەکان</string>
diff --git a/overlay/packages/apps/Settings/res/values-lb/strings.xml b/overlay/packages/apps/Settings/res/values-lb/strings.xml
index 5e3bfbd..8ff4c38 100644
--- a/overlay/packages/apps/Settings/res/values-lb/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-lb/strings.xml
@@ -478,12 +478,10 @@
     <string name="wallpaper_settings_title">Hannergrondbild</string>
     <string name="wallpaper_settings_summary_default">Standard</string>
     <string name="wallpaper_settings_fragment_title">Hannergrondbild auswielen aus</string>
-    <string name="screensaver_settings_summary_either_short">Béides</string>
     <string name="screensaver_settings_summary_sleep">Beim Oplueden</string>
     <string name="screensaver_settings_summary_dock">Wa gedockt</string>
     <string name="screensaver_settings_summary_never">Ni</string>
     <string name="screensaver_settings_summary_off">Aus</string>
-    <string name="screensaver_settings_button">Astellungen</string>
     <string name="automatic_brightness">Automatesch Hellegkeet</string>
     <string name="lift_to_wake_title">Waakreg maache beim Ophiewen</string>
     <string name="ambient_display_screen_title">Ambiente Schierm</string>
@@ -1097,6 +1095,7 @@
     <string name="battery_msg_unaccounted">Den Akkuverbrauch ass just eng ongeféier Donnée, déi net all Quelle vun Akkuentluedung berücksichtegt. Den diverse Verbrauch bezitt sech op d\'Differenz tëscht dem ongeféiere Akkuverbrauch an der tatsächlecher Akkuentluedung.</string>
     <string name="battery_desc_overcounted">Ze héich berechente Stroumverbrauch</string>
     <string name="mah"><xliff:g id="number" example="30">%d</xliff:g> mAh</string>
+    <string name="battery_usage_other_users">Aner Benotzer</string>
     <string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> säit dem Trenne vun der Steckdous</string>
     <string name="menu_stats_last_unplugged">Säit dem leschten Eraushuelen aus dem Stecker fir <xliff:g id="unplugged">%1$s</xliff:g></string>
     <string name="menu_stats_total">Gesamtverbrauch</string>
@@ -1362,6 +1361,7 @@
     <string name="user_delete_button">Läschen</string>
     <string name="user_exit_guest_confirm_message">All d\'Appen an Daten an dëser Sëtzung gi geläscht.</string>
     <string name="user_exit_guest_dialog_remove">Läschen</string>
+    <string name="other_user_category_title">Aner Benotzer</string>
     <string name="user_remove_user">Benotzer läschen</string>
     <string name="user_enable_calling_confirm_message">Uruffhistorique gëtt mat dësem Benotzer gedeelt.</string>
     <string name="user_enable_calling_and_sms_confirm_message">Uruff- an SMS-Historique gëtt mat dësem Benotzer gedeelt.</string>
diff --git a/overlay/packages/apps/Settings/res/values-sc-rIT/strings.xml b/overlay/packages/apps/Settings/res/values-sc-rIT/strings.xml
index 626b464..f81d185 100644
--- a/overlay/packages/apps/Settings/res/values-sc-rIT/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-sc-rIT/strings.xml
@@ -388,7 +388,6 @@
     <string name="wallpaper_settings_fragment_title">Sèbera isfundu dae</string>
     <string name="screensaver_settings_summary_sleep">Cando est carrighende</string>
     <string name="screensaver_settings_summary_off">Istudadu</string>
-    <string name="screensaver_settings_button">Impostatziones</string>
     <string name="automatic_brightness">Lugore automàticu</string>
     <string name="lift_to_wake_title">Pesa pro ativare</string>
     <string name="ambient_display_screen_title">Ischermu ambiente</string>
diff --git a/overlay/packages/apps/Settings/res/values-ug/strings.xml b/overlay/packages/apps/Settings/res/values-ug/strings.xml
index 4fc85de..b7565fa 100644
--- a/overlay/packages/apps/Settings/res/values-ug/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-ug/strings.xml
@@ -413,11 +413,9 @@
     <string name="wallpaper_settings_title">تام قەغىزى</string>
     <string name="wallpaper_settings_summary_default">كۆڭۈلدىكى</string>
     <string name="wallpaper_settings_fragment_title">تام قەغەز تاللاش ئورنى</string>
-    <string name="screensaver_settings_summary_either_short">يۇقىرىقىلاردىن بىرى</string>
     <string name="screensaver_settings_summary_sleep">توكلاۋاتقاندا</string>
     <string name="screensaver_settings_summary_dock">لەڭگەرلەنگەندە</string>
     <string name="screensaver_settings_summary_off">تاقاق</string>
-    <string name="screensaver_settings_button">تەڭشەكلەر</string>
     <string name="automatic_brightness">يورۇقلۇقنى ئۆزلۈكىدىن تەڭشەش</string>
     <string name="title_font_size">خەت چوڭلۇقى</string>
     <string name="sim_lock_settings">SIM كارتا قۇلۇپلاش تەڭشىكى</string>
@@ -959,6 +957,7 @@
     <string name="battery_sugg_apps_gps">توك تېجەش ھالىتىنى تاللاڭ</string>
     <string name="battery_sugg_apps_settings">بۇ ئەپتە توك سەرپىياتىنى تۆۋەنلىتىدىغان تەڭشەك بولۇشى مۇمكىن</string>
     <string name="battery_desc_users">ئىشلەتكۈچى خوراتقان توك</string>
+    <string name="battery_usage_other_users">باشقا ئىشلەتكۈچىلەر</string>
     <string name="menu_stats_unplugged">توك مەنبەسىنى ئۈزگەندىن كېيىن <xliff:g id="UNPLUGGED">%1$s</xliff:g></string>
     <string name="menu_stats_last_unplugged">ئالدىنقى قېتىم توك مەنبەسىنى ئۈزگەنگە <xliff:g id="UNPLUGGED">%1$s</xliff:g></string>
     <string name="menu_stats_total">ئومۇمى ئىشلىتىش مىقدارى</string>
@@ -1169,6 +1168,7 @@
     <string name="user_adding_new_user">يېڭى ئىشلەتكۈچى قوشۇۋاتىدۇ…</string>
     <string name="user_delete_user_description">ئىشلەتكۈچى ئۆچۈر</string>
     <string name="user_delete_button">ئۆچۈر</string>
+    <string name="other_user_category_title">باشقا ئىشلەتكۈچىلەر</string>
     <string name="user_remove_user">ئىشلەتكۈچى ئۆچۈر</string>
     <string name="application_restrictions">ئەپ ۋە مەزمۇنغا يول قوي</string>
     <string name="apps_with_restrictions_header">چەكلىمىلىك ئەپلەر</string>
diff --git a/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml b/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml
index 147a66f..1dc67e9 100644
--- a/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml
+++ b/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml
@@ -17,7 +17,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Papur wal ac arddull</string>
     <string name="theme_title">Arddull</string>
-    <string name="clock_title">Cloc</string>
     <string name="grid_title">Grid apiau</string>
     <string name="apply_theme_btn">Gosod</string>
     <string name="edit_custom_theme_lbl">Tapia i\'w olygu</string>
diff --git a/overlay/packages/apps/ThemePicker/res/values-gd/strings.xml b/overlay/packages/apps/ThemePicker/res/values-gd/strings.xml
index d2a553b..3de5e36 100644
--- a/overlay/packages/apps/ThemePicker/res/values-gd/strings.xml
+++ b/overlay/packages/apps/ThemePicker/res/values-gd/strings.xml
@@ -16,7 +16,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="theme_title">Stoidhle</string>
-    <string name="clock_title">Cleoc</string>
     <string name="apply_theme_btn">Cuir an sàs</string>
     <string name="edit_custom_theme_lbl">Thoir gnogag gus a dheasachadh</string>
     <string name="keep_my_wallpaper">Cùm am pàipear-balla làithreach</string>
diff --git a/overlay/packages/apps/ThemePicker/res/values-kab-rDZ/strings.xml b/overlay/packages/apps/ThemePicker/res/values-kab-rDZ/strings.xml
index b104ebd..4b30ebc 100644
--- a/overlay/packages/apps/ThemePicker/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/apps/ThemePicker/res/values-kab-rDZ/strings.xml
@@ -16,7 +16,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="theme_title">Aɣanib</string>
-    <string name="clock_title">Tamrint</string>
     <string name="apply_theme_btn">Snes</string>
     <string name="default_theme_title">Akk-a kan</string>
     <string name="preview_name_font">Tasefsit</string>
diff --git a/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml b/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
index 05bd8f5..09aafc1 100644
--- a/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
@@ -56,7 +56,6 @@
     <string name="all_apps_search_bar_hint">Chwilio apiau</string>
     <string name="all_apps_loading_message">Yn llwytho apiau…</string>
     <string name="all_apps_no_search_results">Ni chanfuwyd apiau yn cydweddu â \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string>
-    <string name="all_apps_search_market_message">Chwilio am ragor o apiau</string>
     <string name="label_application">Ap</string>
     <string name="all_apps_label">Pob ap</string>
     <string name="notifications_header">Hysbysiadau</string>
@@ -122,7 +121,6 @@
     <string name="item_removed">Tynnwyd yr eitem</string>
     <string name="undo">Dadwneud</string>
     <string name="action_move">Symud eitem</string>
-    <string name="move_to_empty_cell">Symud i res <xliff:g id="number" example="1">%1$s</xliff:g>, colofn <xliff:g id="number" example="1">%2$s</xliff:g></string>
     <string name="move_to_position">Symud i leoliad <xliff:g id="number" example="1">%1$s</xliff:g></string>
     <string name="move_to_hotseat_position">Symud i leoliad ffefrynnau <xliff:g id="number" example="1">%1$s</xliff:g></string>
     <string name="item_moved">Symudwyd yr eitem</string>
diff --git a/overlay/packages/apps/Trebuchet/res/values-en-rPT/strings.xml b/overlay/packages/apps/Trebuchet/res/values-en-rPT/strings.xml
index 28dc618..488cff4 100644
--- a/overlay/packages/apps/Trebuchet/res/values-en-rPT/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-en-rPT/strings.xml
@@ -19,7 +19,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="all_apps_loading_message">Loading your crew…</string>
     <string name="all_apps_no_search_results">Tharr no apps found matchin\' %1$s</string>
-    <string name="all_apps_search_market_message">Look fo\' new crew</string>
     <string name="notifications_header">Messages in a bottle</string>
     <string name="all_apps_button_label">Crew list</string>
 </resources>
diff --git a/overlay/packages/apps/Trebuchet/res/values-gd/strings.xml b/overlay/packages/apps/Trebuchet/res/values-gd/strings.xml
index 77eab60..d9f3e25 100644
--- a/overlay/packages/apps/Trebuchet/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-gd/strings.xml
@@ -35,7 +35,6 @@
     <string name="all_apps_search_bar_hint">Lorg aplacaidean</string>
     <string name="all_apps_loading_message">A’ luchdadh nan aplacaidean…</string>
     <string name="all_apps_no_search_results">Cha do lorg sinn aplacaid le “<xliff:g id="query" example="Android">%1$s</xliff:g>%1$s”</string>
-    <string name="all_apps_search_market_message">Lorg barrachd aplacaidean</string>
     <string name="label_application">Aplacaid</string>
     <string name="notifications_header">Brathan</string>
     <string name="hotseat_out_of_space">Tha treidhe nan annsachdan làn</string>
@@ -94,7 +93,6 @@
     <string name="item_removed">Chaidh an nì a thoirt air falbh</string>
     <string name="undo">Neo-dhèan</string>
     <string name="action_move">Gluais an nì</string>
-    <string name="move_to_empty_cell">Gluais gu ràgh <xliff:g id="number" example="1">%1$s</xliff:g> colbh <xliff:g id="number" example="1">%2$s</xliff:g></string>
     <string name="move_to_position">Gluais gu ionad <xliff:g id="number" example="1">%1$s</xliff:g></string>
     <string name="move_to_hotseat_position">Gluais gu ionad <xliff:g id="number" example="1">%1$s</xliff:g> nan annsachdan</string>
     <string name="item_moved">Chaidh an nì a ghluasad</string>
diff --git a/overlay/packages/services/Car/service/res/values-cy/strings.xml b/overlay/packages/services/Car/service/res/values-cy/strings.xml
index 4d20e36..5d5102f 100644
--- a/overlay/packages/services/Car/service/res/values-cy/strings.xml
+++ b/overlay/packages/services/Car/service/res/values-cy/strings.xml
@@ -38,8 +38,6 @@
     <string name="car_permission_desc_projection">Mae\u2019n caniatáu i ap daflunio rhyngwyneb o ffôn i ddangosydd y car.</string>
     <string name="car_permission_label_access_projection_status">cael at statws taflunio</string>
     <string name="car_permission_desc_access_projection_status">Mae\u2019n caniatáu i ap gael statws apiau eraill sy\u2019n taflunio i ddangosydd y car.</string>
-    <string name="car_permission_label_bind_projection_service">rhwymo at wasanaeth taflunio</string>
-    <string name="car_permission_desc_bind_projection_service">Mae\'n caniatáu i\u2019r deiliad glymu at ryngwyneb lefel uchaf gwasanaeth taflunio. Ni ddylid byth fod ei angen ar apiau arferol.</string>
     <string name="car_permission_label_audio_volume">rheoli uchder sain y car</string>
     <string name="car_permission_label_audio_settings">rheoli gosodiadau sain y car</string>
     <string name="car_permission_label_mock_vehicle_hal">efelychu HAL y cerbyd</string>
@@ -56,8 +54,6 @@
     <string name="car_permission_desc_car_display_in_cluster">Caniatáu i ap ddatgan gweithgareddau i\u2019w dangos yn y clwstwr offerynnau</string>
     <string name="car_permission_car_cluster_control">Rheolaeth clwstwr offerynnau</string>
     <string name="car_permission_desc_car_cluster_control">Lansio apiau yn y clwstwr offerynnau</string>
-    <string name="car_permission_label_bind_instrument_cluster_rendering">Rendro\u2019r Clwstwr Offerynnau</string>
-    <string name="car_permission_desc_bind_instrument_cluster_rendering">Derbyn data\u2019r clwstwr offerynnau</string>
     <string name="car_permission_label_car_ux_restrictions_configuration">Ffurfweddiad Cyfyngiadau UX</string>
     <string name="car_permission_desc_car_ux_restrictions_configuration">Ffurfweddu Cyfyngiadau UX</string>
     <string name="car_permission_label_car_handle_usb_aoap_device">Cyfathrebu gyda dyfais USB ym modd AOAP</string>
@@ -66,8 +62,6 @@
     <string name="car_permission_desc_read_car_occupant_awareness_state">Mae\'n caniatáu darllen statws a chanfod data i\'r System Ymwybyddiaeth o Bobl yn y Cerbyd</string>
     <string name="car_permission_label_control_car_occupant_awareness_system">Rheoli graff y System Ymwybyddiaeth o Bobl yn y Cerbyd</string>
     <string name="car_permission_desc_control_car_occupant_awareness_system">Mae\'n caniatáu rheoli dechrau a stopio graff y System Ymwybyddiaeth o Bobl yn y Cerbyd</string>
-    <string name="car_permission_label_bind_input_service">Gwasanaeth Mewnbwn y Car</string>
-    <string name="car_permission_desc_bind_input_service">Delio â digwyddiadau mewnbwn</string>
     <string name="car_permission_label_diag_read">darllen data diagnostig</string>
     <string name="car_permission_desc_diag_read">Darllen data diagnostig o\'r car.</string>
     <string name="car_permission_label_diag_clear">clirio data diagnostig</string>
@@ -76,8 +70,6 @@
     <string name="car_permission_desc_vms_publisher">Cyhoeddi negeseuon VMS</string>
     <string name="car_permission_label_vms_subscriber">Tanysgrifiwr VMS</string>
     <string name="car_permission_desc_vms_subscriber">Tanysgrifio i negeseuon VMS</string>
-    <string name="car_permission_label_bind_vms_client">Gwasanaeth Cleient VMS</string>
-    <string name="car_permission_desc_bind_vms_client">Tenynnu at gleientiaid VMS</string>
     <string name="car_permission_label_storage_monitoring">Monitro storfa cof bach</string>
     <string name="car_permission_desc_storage_monitoring">Monitro defnydd storfa cof bach</string>
     <string name="car_permission_label_driving_state">gwrando ar statws gyrru</string>
diff --git a/overlay/packages/services/Car/service/res/values-gd/strings.xml b/overlay/packages/services/Car/service/res/values-gd/strings.xml
index 329ec39..ff5757a 100644
--- a/overlay/packages/services/Car/service/res/values-gd/strings.xml
+++ b/overlay/packages/services/Car/service/res/values-gd/strings.xml
@@ -39,8 +39,6 @@
     <string name="car_permission_desc_projection">Leigidh seo le aplacaid eadar-aghaidh fòn a thilgeil air uidheam-taisbeanaidh a’ chàir.</string>
     <string name="car_permission_label_access_projection_status">staid an tilgeil inntrigeadh</string>
     <string name="car_permission_desc_access_projection_status">Leigidh seo le aplacaid an staid fhaighinn aig aplacaidean eile a tha a’ tilgeil air uidheam-taisbeanaidh a’ chàir.</string>
-    <string name="car_permission_label_bind_projection_service">nasgadh ri seirbheis tilgeil eile</string>
-    <string name="car_permission_desc_bind_projection_service">Leigidh seo leis an aplacaid nasgadh a dhèanamh ri prìomh eadar-aghaidh aig seirbheis tilgeil. Chan eil seo gu feum do dh’aplacaidean àbhaisteach idir.\"</string>
     <string name="car_permission_label_audio_volume">àirde na fuaime aig a’ chàr a stiùireadh</string>
     <string name="car_permission_label_audio_settings">roghainnean fuaime a’ chàir a stiùireadh</string>
     <string name="car_permission_label_mock_vehicle_hal">riochd a chur air HAL a’ charbaid</string>
@@ -62,14 +60,10 @@
       innse ach an dèid an sealltainn sa bhad-inneal</string>
     <string name="car_permission_car_cluster_control">Stiùireadh a’ bhaid-inneal</string>
     <string name="car_permission_desc_car_cluster_control">Cuir aplacaidean gu dol sa bhad-inneal</string>
-    <string name="car_permission_label_bind_instrument_cluster_rendering">Reandaradh sa bhad-inneal</string>
-    <string name="car_permission_desc_bind_instrument_cluster_rendering">Faigh dàta on bhad-inneal</string>
     <string name="car_permission_label_car_ux_restrictions_configuration">Rèiteachadh cuingeachaidhean UX</string>
     <string name="car_permission_desc_car_ux_restrictions_configuration">Stiùirich na cuingeachaidhean air an UX</string>
     <string name="car_permission_label_car_handle_usb_aoap_device">Conaltradh le uidheam USB sa mhodh AOAP</string>
     <string name="car_permission_desc_car_handle_usb_aoap_device">Leigidh seo le aplacaid conaltradh le uidheam sa mhodh AOAP</string>
-    <string name="car_permission_label_bind_input_service">Seirbheis ion-chur càir</string>
-    <string name="car_permission_desc_bind_input_service">Stiùireadh thachartasan ion-chuir</string>
     <string name="car_permission_label_diag_read">dàta na diagnosachd a leughadh</string>
     <string name="car_permission_desc_diag_read">Dàta diagnosachd a leughadh on chàr.</string>
     <string name="car_permission_label_diag_clear">dàta na diagnosachd fhalamhachadh</string>
@@ -78,8 +72,6 @@
     <string name="car_permission_desc_vms_publisher">Foillseachadh teachdaireachdan VMS</string>
     <string name="car_permission_label_vms_subscriber">Fo-sgrìobhadair VMS</string>
     <string name="car_permission_desc_vms_subscriber">Fo-sgrìobhadh air teachdaireachdan VMS</string>
-    <string name="car_permission_label_bind_vms_client">Seirbheis cliant VMS</string>
-    <string name="car_permission_desc_bind_vms_client">Nasgadh ri cliantan VMS</string>
     <string name="car_permission_label_storage_monitoring">Cumail sùil air stòras flash</string>
     <string name="car_permission_desc_storage_monitoring">Sùil a chumail air cleachdadh stòrais flash</string>
     <string name="car_permission_label_driving_state">èisteadh ri staid an dràibhidh</string>
diff --git a/overlay/packages/services/Telecomm/res/values-cy/strings.xml b/overlay/packages/services/Telecomm/res/values-cy/strings.xml
index 1cd062e..5924161 100644
--- a/overlay/packages/services/Telecomm/res/values-cy/strings.xml
+++ b/overlay/packages/services/Telecomm/res/values-cy/strings.xml
@@ -29,9 +29,6 @@
     <string name="notification_disconnectedCall_generic_body">        Cafodd dy alwad ei datgysylltu am fod galwad brys wedi ei gwneud.
     </string>
     <string name="notification_audioProcessing_title">Galwad yn y cefndir</string>
-    <string name="notification_audioProcessing_body">        Mae <xliff:g id="audio_processing_app_name">%s</xliff:g> wedi gosod galwad yn
-        y cefndir. Gall fod yr ap hwn yn cael at ac yn chwarae sain dros yr alwad.
-    </string>
     <string name="notification_incallservice_not_responding_title">        Stopiodd <xliff:g id="in_call_service_app_name">%s</xliff:g> ymateb
     </string>
     <string name="notification_incallservice_not_responding_body">        Defnyddiodd dy alwad yr ap ffôn daeth gyda dy ddyfais
diff --git a/overlay/packages/services/Telecomm/res/values-gd/strings.xml b/overlay/packages/services/Telecomm/res/values-gd/strings.xml
index 54934dc..6c7e5b6 100644
--- a/overlay/packages/services/Telecomm/res/values-gd/strings.xml
+++ b/overlay/packages/services/Telecomm/res/values-gd/strings.xml
@@ -28,9 +28,6 @@
     <string name="notification_disconnectedCall_generic_body">        Chaidh crìoch a chur air a’ ghairm agad on a chaidh gairm-èiginn a chur.
     </string>
     <string name="notification_audioProcessing_title">Gairm sa chùlaibh</string>
-    <string name="notification_audioProcessing_body">        Chuir <xliff:g id="audio_processing_app_name">%s</xliff:g> gairm
-        dhan chùlaibh. Dh’fhaoidte gu bheil an aplacaid seo ag inntrigeadh ’s a’ cluich fuaim thar na gairme.
-    </string>
     <string name="notification_incallservice_not_responding_title">        Chan eil <xliff:g id="in_call_service_app_name">%s</xliff:g> a’ freagairt tuilleadh
     </string>
     <string name="notification_incallservice_not_responding_body">        Chleachd a’ ghairm agad aplacaid an fhòn a thàining am broinn an uidheim agad