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 87fd117..47eac9a 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
@@ -174,10 +174,6 @@
     <string name="low_memory" product="watch">L\'almacenamientu del reló ta enllén. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
     <string name="low_memory" product="tv">L\'almacenamientu d\'Android TV ta enllén. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
     <string name="low_memory" product="default">L\'almacenamientu del teléfonu ta enllén. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
-    <plurals name="ssl_ca_cert_warning">
-        <item quantity="one">Instalóse l\'autoridá certificadora</item>
-        <item quantity="other">Instaláronse les autoridaes certificadores</item>
-    </plurals>
     <string name="ssl_ca_cert_noti_by_unknown">Por un terceru desconocíu</string>
     <string name="ssl_ca_cert_noti_by_administrator">Pol alministrador del perfil llaboral</string>
     <string name="ssl_ca_cert_noti_managed">Por «<xliff:g id="managing_domain">%s</xliff:g>»</string>
@@ -263,10 +259,6 @@
         mínima cuando\'l preséu nun respuenda o vaiga lentu, o cuando precises toles
         seiciones del informe. Nun permite qu\'introduzas más detalles o faigas más
         captures de pantalla.</string>
-    <plurals name="bugreport_countdown">
-        <item quantity="one">Va facese una captura de pantalla pal informe de fallos en <xliff:g id="number">%d</xliff:g> segundu.</item>
-        <item quantity="other">Va facese una captura de pantalla pal informe de fallos en <xliff:g id="number">%d</xliff:g> segundos.</item>
-    </plurals>
     <string name="bugreport_screenshot_success_toast">Fízose una captura de pantalla col informe de fallos</string>
     <string name="bugreport_screenshot_failure_toast">Hebo un fallu al facer la captura de pantalla col informe de fallos</string>
     <string name="global_action_toggle_silent_mode">Mou silenciosu</string>
@@ -320,8 +312,6 @@
     <string name="permgroupdesc_calendar">accesu al calendariu</string>
     <string name="permgrouplab_sms">SMS</string>
     <string name="permgroupdesc_sms">unviu y visualización de mensaxes SMS</string>
-    <string name="permgrouplab_storage">Ficheros y multimedia</string>
-    <string name="permgroupdesc_storage">accesu a los ficheros multimedia del preséu</string>
     <string name="permgrouplab_microphone">Micrófonu</string>
     <string name="permgroupdesc_microphone">grabación d\'audiu</string>
     <string name="permgrouplab_activityRecognition">Actividá física</string>
@@ -335,6 +325,7 @@
     <string name="permgroupdesc_phone">xestión y fechura de llamaes telefóniques</string>
     <string name="permgrouplab_sensors">Sensores corporales</string>
     <string name="permgroupdesc_sensors">accesu a los datos del sensor sobre les tos constantes vitales</string>
+    <string name="permgrouplab_notifications">Avisos</string>
     <string name="capability_title_canRetrieveWindowContent">Recuperar el conteníu de les ventanes</string>
     <string name="capability_desc_canRetrieveWindowContent">Inspeiciona\'l conteníu de la ventana
         cola que teas interactuando.</string>
@@ -502,10 +493,6 @@
     <string name="permdesc_writeCallLog" product="default">Permite que l\'aplicación modifique\'l rexistru de llamaes del teléfonu, incluyíes les llamaes entrantes
         y salientes. Les aplicaciones malicioses puen usar esti permisu pa desaniciar o modificar
         el rexistru de llamaes.</string>
-    <string name="permlab_bodySensors">sensores corporales
-    </string>
-    <string name="permdesc_bodySensors" product="default">Permite que l\'aplicación acceda a los datos de los sensores
-    que supervisen la to condición física, como\'l ritmu cardiacu.</string>
     <string name="permlab_readCalendar">llectura de los eventos y los detalles del calendariu</string>
     <string name="permdesc_readCalendar" product="tablet">Esta aplicación pue lleer tolos eventos del calendariu atroxaos na tableta y compartir o guardar los datos del calendariu.</string>
     <string name="permdesc_readCalendar" product="tv">Esta aplicación pue lleer tolos eventos del calendariu atroxaos n\'Android TV y compartir o guardar datos del calendariu.</string>
@@ -701,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_partial">Detectóse una buelga parcial</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>
@@ -989,7 +975,7 @@
     <string name="lockscreen_instructions_when_pattern_enabled">Primi «Menú» pa desbloquiar o facer una llamada d\'emerxencia.</string>
     <string name="lockscreen_instructions_when_pattern_disabled">Primi «Menú» pa desbloquiar.</string>
     <string name="lockscreen_pattern_instructions">Dibuxa\'l patrón pa desbloquiar</string>
-    <string name="lockscreen_emergency_call">Llamada d\'emerxencia</string>
+    <string name="lockscreen_emergency_call">Emerxencia</string>
     <string name="lockscreen_return_to_call">Volver a la llamada</string>
     <string name="lockscreen_pattern_correct">¡La combinación ye correuta!</string>
     <string name="lockscreen_pattern_wrong">Volvi tentalo</string>
@@ -1229,7 +1215,6 @@
     <string name="save_password_never">Enxamás</string>
     <string name="open_permission_deny">Nun tienes permisu p\'abrir esta páxina.</string>
     <string name="text_copied">El testu copióse nel cartafueyu.</string>
-    <string name="copied">Copióse</string>
     <string name="pasted_text">«<xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g>» apegó\'l testu que copiesti</string>
     <string name="pasted_image">«<xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g>» apegó una imaxe que copiesti</string>
     <string name="pasted_content">«<xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g>» apegó\'l conteníu que copiesti</string>
@@ -1260,10 +1245,6 @@
        deu o facer xestos pa interactuar col teléfonu.</string>
     <string name="oneMonthDurationPast">Hai un mes</string>
     <string name="beforeOneMonthDurationPast">Hai más d\'un mes</string>
-    <plurals name="last_num_days">
-        <item quantity="one">L\'últimu día (<xliff:g id="count">%d</xliff:g>)</item>
-        <item quantity="other">Los últimos <xliff:g id="count">%d</xliff:g> díes</item>
-    </plurals>
     <string name="last_month">El mes pasáu</string>
     <string name="older">Anterior</string>
     <string name="preposition_for_date">el <xliff:g id="date" example="May 29">%s</xliff:g></string>
@@ -1282,70 +1263,6 @@
     <string name="year">añu</string>
     <string name="years">años</string>
     <string name="now_string_shortest">agora</string>
-    <plurals name="duration_minutes_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>m</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>m</item>
-    </plurals>
-    <plurals name="duration_hours_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>h</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>h</item>
-    </plurals>
-    <plurals name="duration_days_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>d</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>d</item>
-    </plurals>
-    <plurals name="duration_years_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>a</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>a</item>
-    </plurals>
-    <plurals name="duration_minutes_shortest_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g>m</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g>m</item>
-    </plurals>
-    <plurals name="duration_hours_shortest_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g>h</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g>h</item>
-    </plurals>
-    <plurals name="duration_days_shortest_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g>d</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g>d</item>
-    </plurals>
-    <plurals name="duration_years_shortest_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g>a</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g>a</item>
-    </plurals>
-    <plurals name="duration_minutes_relative">
-        <item quantity="one">Hai <xliff:g example="1" id="count">%d</xliff:g> minutu</item>
-        <item quantity="other">Hai <xliff:g example="1" id="count">%d</xliff:g> minutos</item>
-    </plurals>
-    <plurals name="duration_hours_relative">
-        <item quantity="one">Hai <xliff:g example="1" id="count">%d</xliff:g> hora</item>
-        <item quantity="other">Hai <xliff:g example="1" id="count">%d</xliff:g> hores</item>
-    </plurals>
-    <plurals name="duration_days_relative">
-        <item quantity="one">Hai <xliff:g example="1" id="count">%d</xliff:g> día</item>
-        <item quantity="other">Hai <xliff:g example="1" id="count">%d</xliff:g> díes</item>
-    </plurals>
-    <plurals name="duration_years_relative">
-        <item quantity="one">Hai <xliff:g example="1" id="count">%d</xliff:g> añu</item>
-        <item quantity="other">Hai <xliff:g example="1" id="count">%d</xliff:g> años</item>
-    </plurals>
-    <plurals name="duration_minutes_relative_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g> minutu</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g> minutos</item>
-    </plurals>
-    <plurals name="duration_hours_relative_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g> hora</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g> hores</item>
-    </plurals>
-    <plurals name="duration_days_relative_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g> día</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g> díes</item>
-    </plurals>
-    <plurals name="duration_years_relative_future">
-        <item quantity="one">en <xliff:g example="1" id="count">%d</xliff:g> añu</item>
-        <item quantity="other">en <xliff:g example="2" id="count">%d</xliff:g> años</item>
-    </plurals>
     <string name="VideoView_error_title">Hai un problema col videu</string>
     <string name="VideoView_error_text_invalid_progressive_playback">Esti videu nun val pa la tresmisión al preséu.</string>
     <string name="VideoView_error_text_unknown">Nun se pue reproducir esti videu.</string>
@@ -1375,6 +1292,7 @@
     <string name="deleteText">Desaniciar</string>
     <string name="inputMethod">Métodu d\'entrada</string>
     <string name="editTextMenuTitle">Aiciones del testu</string>
+    <string name="input_method_nav_back_button_desc">Atrás</string>
     <string name="low_internal_storage_view_title">L\'espaciu d\'almacenamientu ta escosando</string>
     <string name="low_internal_storage_view_text">Quiciabes dalgunes funciones del sistema nun funcionen</string>
     <string name="low_internal_storage_view_text_no_boot">Nun hai abondu almacenamientu pal sistema. Asegúrate de que tienes 250 MB d\'espaciu llibre y reanicia.</string>
@@ -1474,11 +1392,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_enrollment_powerbutton_intent_title">¿Quies apagar la pantalla?</string>
-    <string name="fp_enrollment_powerbutton_intent_message">Mentanto configurabes la buelga,
-        primiesti\'l botón d\'apagáu.\n\nEsta aición suel apagar la pantalla.</string>
-    <string name="fp_enrollment_powerbutton_intent_positive_button">Desactivar</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">Encaboxar</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>
     <string name="heavy_weight_switcher_title">Escoyeta d\'un xuegu</string>
@@ -1743,10 +1657,6 @@
     <string name="skip_button_label">Saltar</string>
     <string name="no_matches">Nun hai coincidencies</string>
     <string name="find_on_page">Atopar na páxina</string>
-    <plurals name="matches_found">
-        <item quantity="one">1 coincidencia</item>
-        <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> de <xliff:g id="total" example="137">%d</xliff:g></item>
-    </plurals>
     <string name="action_mode_done">Fecho</string>
     <string name="progress_erasing">Desaniciando l\'almacenamientu compartíu\u2026</string>
     <string name="share">Compartir</string>
@@ -1876,10 +1786,6 @@
     <string name="kg_wrong_pattern">El patrón ye incorreutu</string>
     <string name="kg_wrong_password">La contraseña ye incorreuta</string>
     <string name="kg_wrong_pin">El PIN ye incorreutu</string>
-    <plurals name="kg_too_many_failed_attempts_countdown">
-        <item quantity="one">Volvi tentalo en 1 segundu.</item>
-        <item quantity="other">Volvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.</item>
-    </plurals>
     <string name="kg_pattern_instructions">Dibuxa\'l patrón</string>
     <string name="kg_sim_pin_instructions">Introduz el PIN de la SIM</string>
     <string name="kg_pin_instructions">Introduz el PIN</string>
@@ -1964,10 +1870,6 @@
     <string name="accessibility_enable_service_title">¿Quies permitir que
         «<xliff:g id="service" example="TalkBack">%1$s</xliff:g>» tenga\'l control total del
         preséu?</string>
-    <string name="accessibility_enable_service_encryption_warning">Si actives
-        «<xliff:g id="service" example="TalkBack">%1$s</xliff:g>», el preséu nun va usar la pantalla
-        de bloquéu p\'ameyorar el cifráu de datos.
-    </string>
     <string name="accessibility_service_warning_description">El control total ye afayadizu pa
         les aplicaciones que t\'ayuden cola accesibilidá, mas non pa la mayoría d\'elles.
     </string>
@@ -2124,10 +2026,6 @@
     <string name="restr_pin_create_pin">Crea un PIN pa modificar les torgues</string>
     <string name="restr_pin_error_doesnt_match">Los PIN nun concasen. Volvi tentalo.</string>
     <string name="restr_pin_error_too_short">El PIN ye percurtiu. Ha ser de polo menos 4 díxitos.</string>
-    <plurals name="restr_pin_countdown">
-        <item quantity="one">Volvi tentalo en 1 segundu</item>
-        <item quantity="other">Volvi tentalo en <xliff:g id="count">%d</xliff:g> segundos</item>
-    </plurals>
     <string name="restr_pin_try_later">Volvi tentalo dempués</string>
     <string name="immersive_cling_title">Vista a pantalla completa</string>
     <string name="immersive_cling_description">Pa colar, esliza dende lo baxero hasta lo cimero.</string>
@@ -2161,38 +2059,6 @@
     <string name="data_saver_description">P\'ayudar a amenorgar l\'usu de datos, «Aforrador de datos» evita que que les aplicaciones unvien y reciban datos en segundu planu. L\'aplicación que teas usando pue acceder a los datos, mas quiciabes lo faiga con menos frecuencia. Esto quier dicir, por exemplu, que les imáxenes nun van amosase hasta que calques nelles.</string>
     <string name="data_saver_enable_title">¿Quies activar «Aforrador de datos»?</string>
     <string name="data_saver_enable_button">Activar</string>
-    <plurals name="zen_mode_duration_minutes_summary">
-        <item quantity="one">Demientres un minutu (hasta: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Demientres %1$d minutos (hasta: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_summary_short">
-        <item quantity="one">Demientres 1 min (hasta: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Demientres %1$d min (hasta: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_summary">
-        <item quantity="one">Demientres 1 hora (hasta la hora: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Demientres %1$d hores (hasta la hora: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_summary_short">
-        <item quantity="one">Demientres 1 h (hasta: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Demientres %1$d h (hasta: <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes">
-        <item quantity="one">Demientres un minutu</item>
-        <item quantity="other">Demientres %d minutos</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_short">
-        <item quantity="one">Demientres 1 min</item>
-        <item quantity="other">Demientres %d min</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours">
-        <item quantity="one">Demientres 1 hora</item>
-        <item quantity="other">Demientres %d hores</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_short">
-        <item quantity="one">Demientres 1 h</item>
-        <item quantity="other">Demientres %d h</item>
-    </plurals>
     <string name="zen_mode_until">Hasta: <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
     <string name="zen_mode_alarm">Hasta: <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g> (alarma siguiente)</string>
     <string name="zen_mode_forever">Hasta desactivar esta opción</string>
@@ -2232,10 +2098,6 @@
     <string name="notification_messaging_title_template"><xliff:g id="conversation_title" example="Tasty Treat Team">%1$s</xliff:g>: <xliff:g id="sender_name" example="Adrian Baker">%2$s</xliff:g></string>
     <string name="call_notification_answer_video_action">Videu</string>
     <string name="call_notification_decline_action">Refugar</string>
-    <plurals name="selected_count">
-        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> na esbilla</item>
-        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> na esbilla</item>
-    </plurals>
     <string name="default_notification_channel_label">Ensin estaya</string>
     <string name="importance_from_user">Afitesti la importancia d\'estos avisos.</string>
     <string name="importance_from_person">Ye importante pola mor de les persones implicaes.</string>
@@ -2300,10 +2162,6 @@
     <string name="autofill_save_accessibility_title">Guardar pal autorellenu</string>
     <string name="autofill_error_cannot_autofill">El conteníu nun se pue autorellenar</string>
     <string name="autofill_picker_no_suggestions">Nun hai nenguna suxerencia del autorellenu</string>
-    <plurals name="autofill_picker_some_suggestions">
-        <item quantity="one">Una suxerencia del autorellenu</item>
-        <item quantity="other"><xliff:g id="count" example="Two">%1$s</xliff:g> suxerencies del autorellenu</item>
-    </plurals>
     <string name="autofill_save_title">¿Quies guardar el conteníu en: <b><xliff:g id="label" example="MyPass">%1$s</xliff:g></b>?</string>
     <string name="autofill_save_title_with_type">¿Quies guardar «<xliff:g id="type" example="Credit Card">%1$s</xliff:g>» en: <b><xliff:g id="label" example="MyPass">%2$s</xliff:g></b>?</string>
     <string name="autofill_save_title_with_2types">¿Quies guardar «<xliff:g id="type" example="Password">%1$s</xliff:g>» y «<xliff:g id="type" example="Credit Card">%2$s</xliff:g>» en: <b><xliff:g id="label" example="MyPass">%3$s</xliff:g></b>?</string>
@@ -2359,6 +2217,7 @@
     <string name="zen_upgrade_notification_visd_content">Toca pa saber más y camudar los axustes.</string>
     <string name="zen_upgrade_notification_title">«Nun molestar» camudó</string>
     <string name="zen_upgrade_notification_content">Toca pa comprobar qué se bloquió.</string>
+    <string name="review_notification_settings_dismiss">Escartar</string>
     <string name="notification_app_name_system">Sistema</string>
     <string name="notification_app_name_settings">Axustes</string>
     <string name="notification_appops_camera_active">Cámara</string>
@@ -2398,10 +2257,6 @@
     <string name="mime_type_presentation_ext">Presentación <xliff:g id="extension" example="PDF">%1$s</xliff:g></string>
     <string name="bluetooth_airplane_mode_toast">El Bluetooth va siguir habilitáu nel mou avión</string>
     <string name="car_loading_profile">Cargando</string>
-    <plurals name="file_count">
-        <item quantity="one"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ficheru</item>
-        <item quantity="other"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ficheros</item>
-    </plurals>
     <string name="chooser_no_direct_share_targets">Nun hai nenguna persona suxerida cola que compartir</string>
     <string name="chooser_all_apps_button_label">Llista d\'aplicaciones</string>
     <string name="usb_device_resolve_prompt_warn">Esta aplicación nun tien permisu pa grabar audiu, mas podría capturalu pente esti preséu USB.</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 217eb48..627fdb0 100644
--- a/overlay/frameworks/base/core/res/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-cy/strings.xml
@@ -180,14 +180,6 @@
     <string name="low_memory" product="watch">Mae storfa\'r oriawr yn llawn. Rhaid dileu rhai ffeiliau i greu lle.</string>
     <string name="low_memory" product="tv">Mae storfa Android TV yn llawn. Rhaid dileu rhai ffeiliau i greu lle.</string>
     <string name="low_memory" product="default">Mae storfa\'r ffôn yn llawn. Rhaid dileu rhai ffeiliau i greu lle.</string>
-    <plurals name="ssl_ca_cert_warning">
-        <item quantity="zero">Awdurdodau tystysgrifau wedi eu gosod</item>
-        <item quantity="one">Awdurdod tystysgrifau wedi ei osod</item>
-        <item quantity="two">Awdurdod tystysgrifau wedi eu gosod</item>
-        <item quantity="few">Awdurdod tystysgrifau wedi eu gosod</item>
-        <item quantity="many">Awdurdod tystysgrifau wedi eu gosod</item>
-        <item quantity="other">Awdurdod tystysgrifau wedi eu gosod</item>
-    </plurals>
     <string name="ssl_ca_cert_noti_by_unknown">Gan drydydd parti anhysbys</string>
     <string name="ssl_ca_cert_noti_by_administrator">Gan weinyddwr dy broffil gwaith</string>
     <string name="ssl_ca_cert_noti_managed">Gan <xliff:g id="managing_domain">%s</xliff:g></string>
@@ -265,14 +257,6 @@
 Mae\'n bosib y bydd yn anwybyddu rhai adrannau llai pwysig er mwyn bod yn gynt.</string>
     <string name="bugreport_option_full_title">Adroddiad llawn</string>
     <string name="bugreport_option_full_summary">Defnyddia\'r opsiwn hwn ar gyfer yr ymyrraeth leiaf bosib gan y system pan fo\'r ddyfais ddim yn ymateb neu\'n rhedeg yn rhy araf, neu pan wyt ti angen adrodd am bob adran. Nid yw yn caniatáu ychwanegu unrhyw fanylion na sgrinluniau.</string>
-    <plurals name="bugreport_countdown">
-        <item quantity="zero">Caiff sgrinlun ar gyfer adroddiad gwall ei dynnu ymhen <xliff:g id="number">%d</xliff:g> eiliadau.</item>
-        <item quantity="one">Caiff sgrinlun ar gyfer adroddiad gwall ei dynnu ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="two">Caiff sgrinlun ar gyfer adroddiad gwall ei dynnu ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="few">Caiff sgrinlun ar gyfer adroddiad gwall ei dynnu ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="many">Caiff sgrinlun ar gyfer adroddiad gwall ei dynnu ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="other">Caiff sgrinlun ar gyfer adroddiad gwall ei dynnu ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-    </plurals>
     <string name="bugreport_screenshot_success_toast">Tynnwyd sgrinlun gydag adroddiad gwall</string>
     <string name="bugreport_screenshot_failure_toast">Methwyd tynnu sgrinlun gydag adroddiad gwall</string>
     <string name="global_action_toggle_silent_mode">Modd tawel</string>
@@ -325,8 +309,6 @@
     <string name="permgroupdesc_calendar">cyrchu dy galendr</string>
     <string name="permgrouplab_sms">SMS</string>
     <string name="permgroupdesc_sms">gweld ac anfon negeseuon SMS</string>
-    <string name="permgrouplab_storage">Ffeiliau a chyfryngau</string>
-    <string name="permgroupdesc_storage">cael mynediad at luniau, ffeiliau, a chyfryngau ar y ddyfais</string>
     <string name="permgrouplab_microphone">Meicroffon</string>
     <string name="permgroupdesc_microphone">recordio sain</string>
     <string name="permgrouplab_activityRecognition">Gweithgaredd corfforol</string>
@@ -341,6 +323,7 @@
     <string name="permgroupdesc_phone">gwneud a rheoli galwadau ffôn</string>
     <string name="permgrouplab_sensors">Synwyryddion corff</string>
     <string name="permgroupdesc_sensors">cael at ddata synhwyrydd am dy arwyddion bywyd</string>
+    <string name="permgrouplab_notifications">Hysbysiadau</string>
     <string name="capability_title_canRetrieveWindowContent">Adfer cynnwys ffenestr</string>
     <string name="capability_desc_canRetrieveWindowContent">Archwilio cynnwys ffenestr rwyt yn rhyngweithio gyda hi.</string>
     <string name="capability_title_canRequestTouchExploration">Troi Archwilio trwy Gyffwrdd ymlaen</string>
@@ -440,8 +423,6 @@
     <string name="permdesc_writeCallLog" product="tablet">Mae\'n caniatáu yr ap i addasu log galwadau dy lechen, gan gynnwys data am alwadau i mewn ac allan. Gallai apiau maleisus defnyddio hyn i ddileu neu addasu dy log galwadau.</string>
     <string name="permdesc_writeCallLog" product="tv">Mae\'n caniatáu yr ap i addasu log galwadau dy ddyfais Android TV, gan gynnwys data am alwadau i mewn ac allan. Gallai apiau maleisus defnyddio hyn i ddileu neu addasu dy log galwadau.</string>
     <string name="permdesc_writeCallLog" product="default">Mae\'n caniatáu yr ap i addasu log galwadau dy ffôn, gan gynnwys data am alwadau i mewn ac allan. Gallai apiau maleisus defnyddio hyn i ddileu neu addasu dy log galwadau.</string>
-    <string name="permlab_bodySensors">cyrchu synwyryddion corfforol (E.e. monitorau curiad calon)    </string>
-    <string name="permdesc_bodySensors" product="default">Mae\'n caniatáu yr ap i gael at ddata o synwyryddion sy\'n monitro dy gyflwr corfforol, fel dy guriad calon.</string>
     <string name="permlab_readCalendar">Darllen manylion a digwyddiadau calendr</string>
     <string name="permdesc_readCalendar" product="tablet">Gall yr ap hwn ddarllen yr holl ddigwyddiadau calendr wedi eu cadw ar dy lechen a rhannu neu gadw data dy galendr.</string>
     <string name="permdesc_readCalendar" product="tv">Gall yr ap hwn ddarllen yr holl ddigwyddiadau calendr wedi eu cadw ar y ddyfais Android TV a rhannu neu gadw data dy galendr.</string>
@@ -593,10 +574,7 @@
     <string name="biometric_error_generic">Dilysu gwallau</string>
     <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">Canfuwyd ôl bys rhannol</string>
     <string name="fingerprint_acquired_insufficient">Methwyd â phrosesu\'r ôl bys. Rho gynnig arall arni.</string>
-    <string name="fingerprint_acquired_imager_dirty">Glanhau\'r synhwyrydd</string>
-    <string name="fingerprint_acquired_too_fast">Dalia fymryn yn hirach</string>
     <string name="fingerprint_acquired_too_slow">Symudwyd y bys yn rhy araf. Rho gynnig arall arni.</string>
     <string name="fingerprint_acquired_already_enrolled">Rho gynnig ar ôl bys arall</string>
     <string name="fingerprint_acquired_too_bright">Rhy llachar</string>
@@ -903,7 +881,7 @@
     <string name="lockscreen_instructions_when_pattern_enabled">Pwysa Dewislen i ddatgloi neu i wneud galwad brys.</string>
     <string name="lockscreen_instructions_when_pattern_disabled">Pwysa Dewislen i ddatgloi.</string>
     <string name="lockscreen_pattern_instructions">Lluniau\'r patrwm i ddatgloi</string>
-    <string name="lockscreen_emergency_call">Galwad brys</string>
+    <string name="lockscreen_emergency_call">Argyfwng</string>
     <string name="lockscreen_return_to_call">Dychwelyd i\'r alwad</string>
     <string name="lockscreen_pattern_correct">Cywir!</string>
     <string name="lockscreen_pattern_wrong">Ceisia Eto</string>
@@ -1076,7 +1054,6 @@
     <string name="save_password_never">Byth</string>
     <string name="open_permission_deny">Nid oes gennyt ganiatâd i agor y dudalen hon.</string>
     <string name="text_copied">Copïwyd y testun i\'r clipfwrdd.</string>
-    <string name="copied">Copïwyd</string>
     <string name="pasted_from_app">Gludoddd <xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g> o <xliff:g id="source_app_name" example="Chrome">%2$s</xliff:g></string>
     <string name="pasted_from_clipboard">Gludodd <xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g> o\'r clipfwrdd</string>
     <string name="pasted_text">Gludodd <xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g> testun bu i ti ei gopïo</string>
@@ -1107,14 +1084,6 @@
 Pan mae Archwilio trwy Gyffwrdd ymlaen, rwyt yn clywed neu weld disgrifiadau\'r hyn sydd dan dy fys neu ryngweithio gyda\'r ffôn gan wneud ystumiau.</string>
     <string name="oneMonthDurationPast">1 mis yn ôl</string>
     <string name="beforeOneMonthDurationPast">Dros fis yn ôl</string>
-    <plurals name="last_num_days">
-        <item quantity="zero">Y <xliff:g id="count">%d</xliff:g> diwrnodau diwethaf</item>
-        <item quantity="one">Yr <xliff:g id="count">%d</xliff:g> diwrnod diwethaf</item>
-        <item quantity="two">Y <xliff:g id="count">%d</xliff:g> ddiwrnod diwethaf</item>
-        <item quantity="few">Y <xliff:g id="count">%d</xliff:g> diwrnod diwethaf</item>
-        <item quantity="many">Y <xliff:g id="count">%d</xliff:g> diwrnod diwethaf</item>
-        <item quantity="other">Y <xliff:g id="count">%d</xliff:g> diwrnod diwethaf</item>
-    </plurals>
     <string name="last_month">Mis diwethaf</string>
     <string name="older">Hŷn</string>
     <string name="preposition_for_date">ar <xliff:g id="date" example="May 29">%s</xliff:g></string>
@@ -1133,134 +1102,6 @@
     <string name="year">blwyddyn</string>
     <string name="years">blynyddoedd</string>
     <string name="now_string_shortest">nawr</string>
-    <plurals name="duration_minutes_shortest">
-        <item quantity="zero"><xliff:g example="0" id="count">%d</xliff:g>m</item>
-        <item quantity="one"><xliff:g example="0" id="count">%d</xliff:g>m</item>
-        <item quantity="two"><xliff:g example="0" id="count">%d</xliff:g>m</item>
-        <item quantity="few"><xliff:g example="0" id="count">%d</xliff:g>m</item>
-        <item quantity="many"><xliff:g example="0" id="count">%d</xliff:g>m</item>
-        <item quantity="other"><xliff:g example="0" id="count">%d</xliff:g>m</item>
-    </plurals>
-    <plurals name="duration_hours_shortest">
-        <item quantity="zero"><xliff:g example="0" id="count">%d</xliff:g>a</item>
-        <item quantity="one"><xliff:g example="0" id="count">%d</xliff:g>a</item>
-        <item quantity="two"><xliff:g example="0" id="count">%d</xliff:g>a</item>
-        <item quantity="few"><xliff:g example="0" id="count">%d</xliff:g>a</item>
-        <item quantity="many"><xliff:g example="0" id="count">%d</xliff:g>a</item>
-        <item quantity="other"><xliff:g example="0" id="count">%d</xliff:g>a</item>
-    </plurals>
-    <plurals name="duration_days_shortest">
-        <item quantity="zero"><xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="one"><xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="many"><xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>d</item>
-    </plurals>
-    <plurals name="duration_years_shortest">
-        <item quantity="zero"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="one"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="many"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-    </plurals>
-    <plurals name="duration_minutes_shortest_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g>m</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g>m</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g>m</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g>m</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g>m</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g>m</item>
-    </plurals>
-    <plurals name="duration_hours_shortest_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g>a</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g>a</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g>a</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g>a</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g>a</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g>a</item>
-    </plurals>
-    <plurals name="duration_days_shortest_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g>d</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g>d</item>
-    </plurals>
-    <plurals name="duration_years_shortest_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g>b</item>
-    </plurals>
-    <plurals name="duration_minutes_relative">
-        <item quantity="zero"><xliff:g example="2" id="count">%d</xliff:g> munudau yn ôl</item>
-        <item quantity="one"><xliff:g example="2" id="count">%d</xliff:g> munud yn ôl</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> funud yn ôl</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> munud yn ôl</item>
-        <item quantity="many"><xliff:g example="2" id="count">%d</xliff:g> munud yn ôl</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> munud yn ôl</item>
-    </plurals>
-    <plurals name="duration_hours_relative">
-        <item quantity="zero"><xliff:g example="2" id="count">%d</xliff:g> oriau yn ôl</item>
-        <item quantity="one"><xliff:g example="2" id="count">%d</xliff:g> awr yn ôl</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> awr yn ôl</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> awr yn ôl</item>
-        <item quantity="many"><xliff:g example="2" id="count">%d</xliff:g> awr yn ôl</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> awr yn ôl</item>
-    </plurals>
-    <plurals name="duration_days_relative">
-        <item quantity="zero"><xliff:g example="2" id="count">%d</xliff:g> diwrnodau yn ôl</item>
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> diwrnod yn ôl</item>
-        <item quantity="two"><xliff:g example="1" id="count">%d</xliff:g> ddiwrnod yn ôl</item>
-        <item quantity="few"><xliff:g example="1" id="count">%d</xliff:g> diwrnod yn ôl</item>
-        <item quantity="many"><xliff:g example="1" id="count">%d</xliff:g> diwrnod yn ôl</item>
-        <item quantity="other"><xliff:g example="1" id="count">%d</xliff:g> diwrnod yn ôl</item>
-    </plurals>
-    <plurals name="duration_years_relative">
-        <item quantity="zero"><xliff:g example="2" id="count">%d</xliff:g> blynyddoedd yn ôl</item>
-        <item quantity="one"><xliff:g example="2" id="count">%d</xliff:g> flwyddyn yn ôl</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> flynedd yn ôl</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> blynedd yn ôl</item>
-        <item quantity="many"><xliff:g example="2" id="count">%d</xliff:g> blynedd yn ôl</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> mlynedd yn ôl</item>
-    </plurals>
-    <plurals name="duration_minutes_relative_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g> munudau</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g> munud</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g> funud</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g> munud</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g> munud</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g> munud</item>
-    </plurals>
-    <plurals name="duration_hours_relative_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g> oriau</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g> awr</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g> awr</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g> awr</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g> awr</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g> awr</item>
-    </plurals>
-    <plurals name="duration_days_relative_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g> diwrnodau</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g> diwrnod</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g> ddiwrnod</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g> diwrnod</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g> diwrnod</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g> diwrnod</item>
-    </plurals>
-    <plurals name="duration_years_relative_future">
-        <item quantity="zero">ymhen <xliff:g example="2" id="count">%d</xliff:g> blynyddoedd</item>
-        <item quantity="one">ymhen <xliff:g example="2" id="count">%d</xliff:g> flwyddyn</item>
-        <item quantity="two">ymhen <xliff:g example="2" id="count">%d</xliff:g> flynedd</item>
-        <item quantity="few">ymhen <xliff:g example="2" id="count">%d</xliff:g> blynedd</item>
-        <item quantity="many">ymhen <xliff:g example="2" id="count">%d</xliff:g> blynedd</item>
-        <item quantity="other">ymhen <xliff:g example="2" id="count">%d</xliff:g> mlynedd</item>
-    </plurals>
     <string name="VideoView_error_title">Problem fideo</string>
     <string name="VideoView_error_text_invalid_progressive_playback">Nid yw\'r fideo hwn yn ddilys ar gyfer ffrydio i\'r ddyfais hon.</string>
     <string name="VideoView_error_text_unknown">Methu â chwarae\'r fideo hwn.</string>
@@ -1290,6 +1131,7 @@
     <string name="deleteText">Dileu</string>
     <string name="inputMethod">Dull mewnbwn</string>
     <string name="editTextMenuTitle">Gweithredoedd testun</string>
+    <string name="input_method_nav_back_button_desc">Nôl</string>
     <string name="low_internal_storage_view_title">Yn rhedeg yn brin o le storio</string>
     <string name="low_internal_storage_view_text">Mae\'n bosib na fydd rhai swyddogaethau system yn gweithio</string>
     <string name="low_internal_storage_view_text_no_boot">Does dim digon o le ar gyfer y system. Rhaid sicrhau bod o leiaf 250MB yn rhydd yna gellir ail-ddechrau.</string>
@@ -1384,10 +1226,7 @@
     <string name="android_preparing_apk">Yn paratoi <xliff:g id="appname">%1$s</xliff:g>...</string>
     <string name="android_upgrading_starting_apps">Yn dechrau apiau...</string>
     <string name="android_upgrading_complete">Yn cwblhau pethau...</string>
-    <string name="fp_enrollment_powerbutton_intent_title">Troi\'r sgrin i ffwrdd?</string>
-    <string name="fp_enrollment_powerbutton_intent_message">Wrth osod ôl dy fys, pwyswyd y botwm Pŵer.\n\nMae hyn fel arfer yn troi\'r sgrin i ffwrdd.</string>
-    <string name="fp_enrollment_powerbutton_intent_positive_button">Troi i ffwrdd</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">Diddymu</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>
     <string name="heavy_weight_notification_detail">Tapia i ddychwelyd i\'r gêm</string>
     <string name="heavy_weight_switcher_title">Dewis gêm</string>
@@ -1638,14 +1477,6 @@
     <string name="skip_button_label">Neidio</string>
     <string name="no_matches">Dim canlyniadau</string>
     <string name="find_on_page">Canfod yn y dudalen</string>
-    <plurals name="matches_found">
-        <item quantity="zero"><xliff:g id="index" example="2">%d</xliff:g> o <xliff:g id="total" example="137">%d</xliff:g></item>
-        <item quantity="one">1 yn cyd-fynd</item>
-        <item quantity="two"><xliff:g id="index" example="2">%d</xliff:g> o <xliff:g id="total" example="137">%d</xliff:g></item>
-        <item quantity="few"><xliff:g id="index" example="2">%d</xliff:g> o <xliff:g id="total" example="137">%d</xliff:g></item>
-        <item quantity="many"><xliff:g id="index" example="2">%d</xliff:g> o <xliff:g id="total" example="137">%d</xliff:g></item>
-        <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> o <xliff:g id="total" example="137">%d</xliff:g></item>
-    </plurals>
     <string name="action_mode_done">Iawn</string>
     <string name="progress_erasing">Yn dileu\'r storfa a rhennir\u2026</string>
     <string name="share">Rhannu</string>
@@ -1775,14 +1606,6 @@
     <string name="kg_wrong_pattern">Patrwm Anghywir</string>
     <string name="kg_wrong_password">Cyfrinair Anghywir</string>
     <string name="kg_wrong_pin">PIN Anghywir</string>
-    <plurals name="kg_too_many_failed_attempts_countdown">
-        <item quantity="zero">Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliadau.</item>
-        <item quantity="one">Rho gynnig arall arni ymhen 1 eiliad.</item>
-        <item quantity="two">Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="few">Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="many">Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="other">Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliad.</item>
-    </plurals>
     <string name="kg_pattern_instructions">Rho dy batrwm</string>
     <string name="kg_sim_pin_instructions">Rho PIN y SIM</string>
     <string name="kg_pin_instructions">Rho\'r PIN</string>
@@ -1845,7 +1668,6 @@
     <string name="accessibility_shortcut_menu_item_status_on">YMLAEN</string>
     <string name="accessibility_shortcut_menu_item_status_off">I FFWRDD</string>
     <string name="accessibility_enable_service_title">Caniatáu <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i gael rheolaeth lwyr o dy ddyfais?</string>
-    <string name="accessibility_enable_service_encryption_warning">Os wyt yn troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> ymlaen, ni fydd dy ddyfais yn defnyddio\'r sgrin cloi i wella amgryptiad data.</string>
     <string name="accessibility_service_warning_description">Mae rheolaeth lwyr yn briodol ar gyfer apiau sy\u2019n dy helpu gydag anghenion hygyrchedd, ond nid i\u2019r mwyafrif o apiau.</string>
     <string name="accessibility_service_screen_control_title">Gweld a rheoli\u2019r sgrin</string>
     <string name="accessibility_service_screen_control_description">Gall ddarllen yr holl gynnwys ar y sgrin a dangos cynnwys dros ben apiau eraill.</string>
@@ -1993,14 +1815,6 @@
     <string name="restr_pin_create_pin">Creu PIN ar gyfer addasu cyfyngiadau</string>
     <string name="restr_pin_error_doesnt_match">Dyw\'r ddau PIN ddim yr un fath. Rho gynnig arall arni.</string>
     <string name="restr_pin_error_too_short">Mae\'r PIN yn rhy fyr. Mae\'n rhaid bod o leiaf 4 digid.</string>
-    <plurals name="restr_pin_countdown">
-        <item quantity="zero">Rho gynnig arall arni ymhen <xliff:g id="count">%d</xliff:g> eiliadau</item>
-        <item quantity="one">Rho gynnig arall arni ymhen 1 eiliad</item>
-        <item quantity="two">Rho gynnig arall arni ymhen <xliff:g id="count">%d</xliff:g> eiliad</item>
-        <item quantity="few">Rho gynnig arall arni ymhen <xliff:g id="count">%d</xliff:g> eiliad</item>
-        <item quantity="many">Rho gynnig arall arni ymhen <xliff:g id="count">%d</xliff:g> eiliad</item>
-        <item quantity="other">Rho gynnig arall arni ymhen <xliff:g id="count">%d</xliff:g> eiliad</item>
-    </plurals>
     <string name="restr_pin_try_later">Rho gynnig arall arni\'n hwyrach</string>
     <string name="immersive_cling_title">Yn gweld sgrin lawn</string>
     <string name="immersive_cling_description">I adael, llusga i lawr o\'r top.</string>
@@ -2034,70 +1848,6 @@
     <string name="data_saver_description">I helpu lleihau defnydd data, mae Arbedwr Data yn rhwystro rhai apiau rhag anfon neu dderbyn data yn y cefndir. Gall ap gael mynediad at ddata tra ei fod yn cael ei ddefnyddio, ond yn llai aml. Mae hyn yn golygu, er enghraifft, na fydd delweddau efallai yn dangos nes dy fod yn eu tapio nhw.</string>
     <string name="data_saver_enable_title">Rhoi Arbedwr Data ar waith?</string>
     <string name="data_saver_enable_button">Troi ymlaen</string>
-    <plurals name="zen_mode_duration_minutes_summary">
-        <item quantity="zero">Am %1$d munudau (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="one">Am un funud (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Am %1$d funud (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Am %1$d munud (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="many">Am %1$d munud (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Am %1$d munud (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_summary_short">
-        <item quantity="zero">Am %1$d mun (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="one">Am 1 mun (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Am %1$d fun (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Am %1$d mun (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="many">Am %1$d mun (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Am %1$d mun (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_summary">
-        <item quantity="zero">Am %1$d oriau (hyd at <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="one">Am 1 awr (hyd at <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Am %1$d awr (hyd at <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Am %1$d awr (hyd at <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="many">Am %1$d awr (hyd at <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Am %1$d awr (hyd at <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_summary_short">
-        <item quantity="zero">Am %1$d awr (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="one">Am awr (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Am %1$d awr (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Am %1$d awr (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="many">Am %1$d awr (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Am %1$d awr (nes <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes">
-        <item quantity="zero">Am %d munudau</item>
-        <item quantity="one">Am funud</item>
-        <item quantity="two">Am %d funud</item>
-        <item quantity="few">Am %d munud</item>
-        <item quantity="many">Am %d munud</item>
-        <item quantity="other">Am %d munud</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_short">
-        <item quantity="zero">Am %d munudau</item>
-        <item quantity="one">Am funud</item>
-        <item quantity="two">Am %d funud</item>
-        <item quantity="few">Am %d munud</item>
-        <item quantity="many">Am %d munud</item>
-        <item quantity="other">Am %d munud</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours">
-        <item quantity="zero">Am %d oriau</item>
-        <item quantity="one">Am 1 awr</item>
-        <item quantity="two">Am %d awr</item>
-        <item quantity="few">Am %d awr</item>
-        <item quantity="many">Am %d awr</item>
-        <item quantity="other">Am %d awr</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_short">
-        <item quantity="zero">Am %d oriau</item>
-        <item quantity="one">Am 1 awr</item>
-        <item quantity="two">Am %d awr</item>
-        <item quantity="few">Am %d awr</item>
-        <item quantity="many">Am %d awr</item>
-        <item quantity="other">Am %d awr</item>
-    </plurals>
     <string name="zen_mode_until_next_day">Hyd at <xliff:g id="formattedTime" example="Tue, 10 PM">%1$s</xliff:g></string>
     <string name="zen_mode_until">Hyd at <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
     <string name="zen_mode_alarm">Hyd at <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g> (larwm nesaf)</string>
@@ -2145,14 +1895,6 @@
     <string name="call_notification_incoming_text">Galwad i mewn</string>
     <string name="call_notification_ongoing_text">Galwad ar y gweill</string>
     <string name="call_notification_screening_text">Yn sgrinio galwad i mewn</string>
-    <plurals name="selected_count">
-        <item quantity="zero"><xliff:g id="count" example="3">%1$d</xliff:g> wedi\'u dewis</item>
-        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> wedi\'i dewis</item>
-        <item quantity="two"><xliff:g id="count" example="3">%1$d</xliff:g> wedi\'u dewis</item>
-        <item quantity="few"><xliff:g id="count" example="3">%1$d</xliff:g> wedi\'u dewis</item>
-        <item quantity="many"><xliff:g id="count" example="3">%1$d</xliff:g> wedi\'u dewis</item>
-        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> wedi\'u dewis</item>
-    </plurals>
     <string name="default_notification_channel_label">Heb ei gategoreiddio</string>
     <string name="importance_from_user">Rwyt yn gosod pwysigrwydd yr hysbysiadau hyn.</string>
     <string name="importance_from_person">Mae hyn yn bwysig oherwydd y bobol sy\'n cymryd rhan.</string>
@@ -2218,14 +1960,6 @@
     <string name="autofill_save_accessibility_title">Cadw ar gyfer Awtolenwi</string>
     <string name="autofill_error_cannot_autofill">Ni ellir awtolenwi\u2019r cynnwys</string>
     <string name="autofill_picker_no_suggestions">Dim awgrymiadau awtolenwi</string>
-    <plurals name="autofill_picker_some_suggestions">
-        <item quantity="zero"><xliff:g id="count" example="Two">%1$s</xliff:g> awgrymiadau awtolenwi</item>
-        <item quantity="one">Un awgrymiad awtolenwi</item>
-        <item quantity="two"><xliff:g id="count" example="Two">%1$s</xliff:g> awgrymiad awtolenwi</item>
-        <item quantity="few"><xliff:g id="count" example="Two">%1$s</xliff:g> awgrymiad awtolenwi</item>
-        <item quantity="many"><xliff:g id="count" example="Two">%1$s</xliff:g> awgrymiad awtolenwi</item>
-        <item quantity="other"><xliff:g id="count" example="Two">%1$s</xliff:g> awgrymiad awtolenwi</item>
-    </plurals>
     <string name="autofill_save_title">Cadw i <b><xliff:g id="label" example="MyPass">%1$s</xliff:g></b>?</string>
     <string name="autofill_save_title_with_type">Cadw <xliff:g id="type" example="Credit Card">%1$s</xliff:g> i <b><xliff:g id="label" example="MyPass">%2$s</xliff:g></b>?</string>
     <string name="autofill_save_title_with_2types">Cadw <xliff:g id="type" example="Password">%1$s</xliff:g> a <xliff:g id="type" example="Credit Card">%2$s</xliff:g> i <b><xliff:g id="label" example="MyPass">%3$s</xliff:g></b>?</string>
@@ -2281,6 +2015,7 @@
     <string name="zen_upgrade_notification_visd_content">Tapia i ddysgu mwy ac i\'w newid.</string>
     <string name="zen_upgrade_notification_title">Mae Dim Tarfu wedi\'i newid</string>
     <string name="zen_upgrade_notification_content">Tapia i wirio pa beth(au) sydd wedi\'i rhwystro.</string>
+    <string name="review_notification_settings_dismiss">Gwrthod</string>
     <string name="notification_app_name_system">System</string>
     <string name="notification_app_name_settings">Gosodiadau</string>
     <string name="notification_appops_camera_active">Camera</string>
@@ -2325,14 +2060,6 @@
     <string name="mime_type_presentation_ext">Cyflwyniad <xliff:g id="extension" example="PDF">%1$s</xliff:g></string>
     <string name="bluetooth_airplane_mode_toast">Bydd Bluetooth yn aros ymlaen ym modd awyren</string>
     <string name="car_loading_profile">Yn llwytho</string>
-    <plurals name="file_count">
-        <item quantity="zero"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ffeiliau</item>
-        <item quantity="one"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ffeil</item>
-        <item quantity="two"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ffeil</item>
-        <item quantity="few"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ffeil</item>
-        <item quantity="many"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ffeil</item>
-        <item quantity="other"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> ffeil</item>
-    </plurals>
     <string name="chooser_no_direct_share_targets">Dim pobl yr argymhellir i rannu gyda nhw</string>
     <string name="chooser_all_apps_button_label">Rhestr apiau</string>
     <string name="usb_device_resolve_prompt_warn">Dyw\'r hap hwn heb gael caniatâd i recordio ond mi allai gipio sain trwy\'r ddyfais USB hon.</string>
@@ -2368,8 +2095,6 @@
     <string name="resolver_switch_on_work">Tapia i droi ymlaen</string>
     <string name="resolver_no_work_apps_available">Dim apiau gwaith</string>
     <string name="resolver_no_personal_apps_available">Dim apiau personol</string>
-    <string name="miniresolver_open_in_personal">Agor yn <xliff:g id="app" example="YouTube">%s</xliff:g> yn y proffil personol?</string>
-    <string name="miniresolver_open_in_work">Agor yn <xliff:g id="app" example="YouTube">%s</xliff:g> yn y proffil gwaith?</string>
     <string name="miniresolver_use_personal_browser">Defnyddio porwr personol</string>
     <string name="miniresolver_use_work_browser">Defnyddio porwr gwaith</string>
     <string name="PERSOSUBSTATE_SIM_NETWORK_ENTRY">PIN datgloi rhwydwaith SIM</string>
diff --git a/overlay/frameworks/base/core/res/res/values-eo/strings.xml b/overlay/frameworks/base/core/res/res/values-eo/strings.xml
index c1281d7..48131ce 100644
--- a/overlay/frameworks/base/core/res/res/values-eo/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-eo/strings.xml
@@ -133,7 +133,6 @@
     <string name="whichSendApplication">Konigi</string>
     <string name="whichSendApplicationLabel">Konigi</string>
     <string name="whichSendToApplicationLabel">Sendi</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">Nuligi</string>
     <string name="ringtone_unknown">Nekonata</string>
     <string name="sms_control_yes">Permesi</string>
     <string name="sms_control_no">Malpermesi</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 4083e71..e01635f 100644
--- a/overlay/frameworks/base/core/res/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-gd/strings.xml
@@ -176,12 +176,6 @@
     <string name="low_memory" product="watch">Tha stòras an uaireadair làn. Sguab às cuid dhe faidhlichean a shaoradh àite.</string>
     <string name="low_memory" product="tv">Tha stòras uidheam an TBh Android làn. Sguab às cuid dhe faidhlichean a shaoradh àite.</string>
     <string name="low_memory" product="default">Tha stòras an fhòn làn. Sguab às cuid dhe faidhlichean a shaoradh àite.</string>
-    <plurals name="ssl_ca_cert_warning">
-        <item quantity="one">Chaidh ùghdarras teisteanachaidh a stàladh</item>
-        <item quantity="two">Chaidh ùghdarrasan teisteanachaidh a stàladh</item>
-        <item quantity="few">Chaidh ùghdarrasan teisteanachaidh a stàladh</item>
-        <item quantity="other">Chaidh ùghdarrasan teisteanachaidh a stàladh</item>
-    </plurals>
     <string name="ssl_ca_cert_noti_by_unknown">Le treas-phàrtaidh nach aithne dhuinn</string>
     <string name="ssl_ca_cert_noti_by_administrator">Le rianaire pròifil na h-obrach agad</string>
     <string name="ssl_ca_cert_noti_managed">Le <xliff:g id="managing_domain">%s</xliff:g></string>
@@ -264,12 +258,6 @@
     <string name="bugreport_option_full_summary">Cleachd an roghainn seo a chùm buaidh bige air an t-siostam ma bhios maille mhòr
         air an uidheam agad no e gun fhreagairt no ma bhios tu feumach air gach earrann dhen aithris.
         Cha leig e leat barrachd fiosrachaidh a chur ris no barrachd glacaidhean-sgrìn a thogail.</string>
-    <plurals name="bugreport_countdown">
-        <item quantity="one">A’ togail glacadh-sgrìn airson aithris air buga an ceann <xliff:g id="number">%d</xliff:g> diog.</item>
-        <item quantity="two">A’ togail glacadh-sgrìn airson aithris air buga an ceann <xliff:g id="number">%d</xliff:g> dhiog.</item>
-        <item quantity="few">A’ togail glacadh-sgrìn airson aithris air buga an ceann <xliff:g id="number">%d</xliff:g> diogan.</item>
-        <item quantity="other">A’ togail glacadh-sgrìn airson aithris air buga an ceann <xliff:g id="number">%d</xliff:g> diog.</item>
-    </plurals>
     <string name="bugreport_screenshot_success_toast">Chaidh glacadh-sgrìn a thogail leis an aithris air buga</string>
     <string name="bugreport_screenshot_failure_toast">Cha deach leinn glacadh-sgrìn a thogail leis an aithris air buga</string>
     <string name="global_action_toggle_silent_mode">Am modh sàmhach</string>
@@ -323,8 +311,6 @@
     <string name="permgroupdesc_calendar">an mìosachan agad inntrigeadh</string>
     <string name="permgrouplab_sms">SMS</string>
     <string name="permgroupdesc_sms">teachdaireachdan SMS a chur ’s a shealltainn</string>
-    <string name="permgrouplab_storage">Faidhlichean is meadhanan</string>
-    <string name="permgroupdesc_storage">na dealbhan, meadhanan is faidhlichean air an uidheam agad inntrigeadh</string>
     <string name="permgrouplab_microphone">Micreofon</string>
     <string name="permgroupdesc_microphone">fuaim a chlàradh</string>
     <string name="permgrouplab_activityRecognition">Gnìomhachd bodhaige</string>
@@ -337,6 +323,7 @@
     <string name="permgroupdesc_phone">gairmean fòn a chur ’s a stiùireadh</string>
     <string name="permgrouplab_sensors">Mothaichearan bodhaige</string>
     <string name="permgroupdesc_sensors">dàta mhothaichearan mu do bheò inntrigeadh</string>
+    <string name="permgrouplab_notifications">Brathan</string>
     <string name="capability_title_canRetrieveWindowContent">Faighinn susbaint uinneige</string>
     <string name="capability_desc_canRetrieveWindowContent">Susbaint na h-uinneige ris a bheil thu
         a sgrùdadh.</string>
@@ -489,10 +476,6 @@
       Faodaidh aplacaidean droch-rùnach seo a chleachdadh airson loga nan gairmean agad a shuathadh bàn no atharrachadh.</string>
     <string name="permdesc_writeCallLog" product="default">Leigidh seo leis an aplacaid gun atharraich i      loga nan gairmean air an fhòn agad, a’ gabhail a-staigh dàta mu gairmean a-steach is a-mach.
       Faodaidh aplacaidean droch-rùnach seo a chleachdadh airson loga nan gairmean agad a shuathadh bàn no atharrachadh.</string>
-    <string name="permlab_bodySensors">inntrigeadh do mhothaichearan bodhaig (can monatair reat a’ chridhe)
-    </string>
-    <string name="permdesc_bodySensors" product="default">Leigidh seo leis an aplacaid dàta o mhothaichearan inntrigeadh
-    a chumas sùil air cor do bhodhaige, can dè cho luath ’s a bhuaileas do chridhe.</string>
     <string name="permlab_readCalendar">Tachartasan is mion-fhiosrachadh a’ mhìosachain a leughadh</string>
     <string name="permdesc_readCalendar" product="tablet">’S urrainn dhan aplacaid seo a h-uile tachartas mìosachain a chaidh a stòradh air an tablaid agad a leughadh agus dàta a’ mhìosachain agad a cho-roinneadh no a shàbhaladh.</string>
     <string name="permdesc_readCalendar" product="tv">’S urrainn dhan aplacaid seo a h-uile tachartas mìosachain a chaidh a stòradh air an uidheam TBh Android agad a leughadh agus dàta a’ mhìosachain agad a cho-roinneadh no a shàbhaladh.</string>
@@ -962,7 +945,7 @@
     <string name="lockscreen_instructions_when_pattern_enabled">Brùth air “Clàr-taice” airson a’ ghlas a thoirt dheth no gairm-èiginn a chur.</string>
     <string name="lockscreen_instructions_when_pattern_disabled">Brùth air “Clàr-taice” airson a’ ghlas a thoirt dheth.</string>
     <string name="lockscreen_pattern_instructions">Tarraing pàtran airson a’ ghlas a thoirt dheth</string>
-    <string name="lockscreen_emergency_call">Gairm-èiginn</string>
+    <string name="lockscreen_emergency_call">Èiginn</string>
     <string name="lockscreen_return_to_call">Till dhan ghairm</string>
     <string name="lockscreen_pattern_correct">Ceart!</string>
     <string name="lockscreen_pattern_wrong">Feuch ris a-rithist</string>
@@ -1196,7 +1179,6 @@
     <string name="save_password_never">Chan ann idir</string>
     <string name="open_permission_deny">Chan eil cead agad an duilleag seo fhosgladh.</string>
     <string name="text_copied">Chaidh lethbhreac dhen teacsa a chur air an stòr-bhòrd.</string>
-    <string name="copied">Chaidh lethbhreac dheth a dhèanamh</string>
     <string name="more_item_label">Barrachd</string>
     <string name="prepend_shortcut_label">Clàr-taice+</string>
     <string name="menu_meta_shortcut_label">Meta+</string>
@@ -1224,12 +1206,6 @@
         no cleachdaidh tu gluasadan airson eadar-ghnìomhan a ghabhail leis an fhòn.</string>
     <string name="oneMonthDurationPast">Mìos air ais</string>
     <string name="beforeOneMonthDurationPast">Ro mhìos air ais</string>
-    <plurals name="last_num_days">
-        <item quantity="one">An <xliff:g id="count">%d</xliff:g> latha seo chaidh</item>
-        <item quantity="two">An <xliff:g id="count">%d</xliff:g> latha seo chaidh</item>
-        <item quantity="few">Na <xliff:g id="count">%d</xliff:g> làithean seo chaidh</item>
-        <item quantity="other">Na <xliff:g id="count">%d</xliff:g> latha seo chaidh</item>
-    </plurals>
     <string name="last_month">Am mìos seo chaidh</string>
     <string name="older">Nas sine</string>
     <string name="preposition_for_date"><xliff:g id="date" example="May 29">%s</xliff:g></string>
@@ -1248,102 +1224,6 @@
     <string name="year">bliadhna</string>
     <string name="years">bliadhna</string>
     <string name="now_string_shortest">an-dràsta</string>
-    <plurals name="duration_minutes_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>m</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g>m</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g>m</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>m</item>
-    </plurals>
-    <plurals name="duration_hours_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>u</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g>u</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g>u</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>u</item>
-    </plurals>
-    <plurals name="duration_days_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>l</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g>l</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g>l</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>l</item>
-    </plurals>
-    <plurals name="duration_years_shortest">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g>b</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g>b</item>
-    </plurals>
-    <plurals name="duration_minutes_shortest_future">
-        <item quantity="one">an <xliff:g example="1" id="count">%d</xliff:g>mhion</item>
-        <item quantity="two">an <xliff:g example="2" id="count">%d</xliff:g>mhion.</item>
-        <item quantity="few">an <xliff:g example="2" id="count">%d</xliff:g>mion.</item>
-        <item quantity="other">an <xliff:g example="2" id="count">%d</xliff:g>mhion</item>
-    </plurals>
-    <plurals name="duration_hours_shortest_future">
-        <item quantity="one">an <xliff:g example="1" id="count">%d</xliff:g>uair</item>
-        <item quantity="two">an <xliff:g example="2" id="count">%d</xliff:g>uair</item>
-        <item quantity="few">an <xliff:g example="2" id="count">%d</xliff:g>uair.</item>
-        <item quantity="other">an <xliff:g example="2" id="count">%d</xliff:g>uair</item>
-    </plurals>
-    <plurals name="duration_days_shortest_future">
-        <item quantity="one">an <xliff:g example="1" id="count">%d</xliff:g>là</item>
-        <item quantity="two">an <xliff:g example="2" id="count">%d</xliff:g>là</item>
-        <item quantity="few">an <xliff:g example="2" id="count">%d</xliff:g>là.</item>
-        <item quantity="other">an <xliff:g example="2" id="count">%d</xliff:g>là</item>
-    </plurals>
-    <plurals name="duration_years_shortest_future">
-        <item quantity="one">an <xliff:g example="1" id="count">%d</xliff:g>bhl</item>
-        <item quantity="two">an <xliff:g example="2" id="count">%d</xliff:g>bhl.</item>
-        <item quantity="few">an <xliff:g example="2" id="count">%d</xliff:g>bl.</item>
-        <item quantity="other">an <xliff:g example="2" id="count">%d</xliff:g>bhl</item>
-    </plurals>
-    <plurals name="duration_minutes_relative">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> mhionaid air ais</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> mhionaid air ais</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> mionaidean air ais</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> mionaid air ais</item>
-    </plurals>
-    <plurals name="duration_hours_relative">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> uair a thìde air ais</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> uair a thìde air ais</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> uairean a thìde air ais</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> uair a thìde air ais</item>
-    </plurals>
-    <plurals name="duration_days_relative">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> latha air ais</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> latha air ais</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> làithean air ais</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> latha air ais</item>
-    </plurals>
-    <plurals name="duration_years_relative">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> bhliadhna air ais</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> bhliadhna air ais</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> bliadhnaichean air ais</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> bliadhna air ais</item>
-    </plurals>
-    <plurals name="duration_minutes_relative_future">
-        <item quantity="one">an ceann <xliff:g example="1" id="count">%d</xliff:g> mhionaid</item>
-        <item quantity="two">an ceann <xliff:g example="2" id="count">%d</xliff:g> mhionaid</item>
-        <item quantity="few">an ceann <xliff:g example="2" id="count">%d</xliff:g> mionaidean</item>
-        <item quantity="other">an ceann <xliff:g example="2" id="count">%d</xliff:g> mionaid</item>
-    </plurals>
-    <plurals name="duration_hours_relative_future">
-        <item quantity="one">an ceann <xliff:g example="1" id="count">%d</xliff:g> uair a thìde</item>
-        <item quantity="two">an ceann <xliff:g example="2" id="count">%d</xliff:g> uair a thìde</item>
-        <item quantity="few">an ceann <xliff:g example="2" id="count">%d</xliff:g> uairean a thìde</item>
-        <item quantity="other">an ceann <xliff:g example="2" id="count">%d</xliff:g> uair a thìde</item>
-    </plurals>
-    <plurals name="duration_days_relative_future">
-        <item quantity="one">an ceann <xliff:g example="1" id="count">%d</xliff:g> latha</item>
-        <item quantity="two">an ceann <xliff:g example="2" id="count">%d</xliff:g> latha</item>
-        <item quantity="few">an ceann <xliff:g example="2" id="count">%d</xliff:g> làithean</item>
-        <item quantity="other">an ceann <xliff:g example="2" id="count">%d</xliff:g> latha</item>
-    </plurals>
-    <plurals name="duration_years_relative_future">
-        <item quantity="one">an ceann <xliff:g example="1" id="count">%d</xliff:g> bhliadhna</item>
-        <item quantity="two">an ceann <xliff:g example="2" id="count">%d</xliff:g> bhliadhna</item>
-        <item quantity="few">an ceann <xliff:g example="2" id="count">%d</xliff:g> bliadhnaichean</item>
-        <item quantity="other">an ceann <xliff:g example="2" id="count">%d</xliff:g> bliadhna</item>
-    </plurals>
     <string name="VideoView_error_title">Duilgheadasan leis a’ video</string>
     <string name="VideoView_error_text_invalid_progressive_playback">Chan eil a’ video seo dligheach airson sruthadh dhan uidheam seo.</string>
     <string name="VideoView_error_text_unknown">Cha ghabh a’ video seo a chluich.</string>
@@ -1373,6 +1253,7 @@
     <string name="deleteText">Sguab às</string>
     <string name="inputMethod">Modh an ion-chuir</string>
     <string name="editTextMenuTitle">Gnìomhan teacsa</string>
+    <string name="input_method_nav_back_button_desc">Air ais</string>
     <string name="low_internal_storage_view_title">Tha an stòras gann</string>
     <string name="low_internal_storage_view_text">Dh’fhaoidte nach obair gach gleus an t-siostaim mar bu chòir</string>
     <string name="low_internal_storage_view_text_no_boot">Cha fhoghainn an stòras dhan t-siostam. Dèan cinnteach gu bheil 250MB a dh’àite saor agad is ath-thòisich.</string>
@@ -1472,8 +1353,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_enrollment_powerbutton_intent_positive_button">Cuir dheth</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">Sguir 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>
     <string name="heavy_weight_switcher_title">Tagh geama</string>
@@ -1733,12 +1613,6 @@
     <string name="skip_button_label">Leum thairis air</string>
     <string name="no_matches">Gun mhaids</string>
     <string name="find_on_page">Lorg air an duilleag</string>
-    <plurals name="matches_found">
-        <item quantity="one"><xliff:g id="index" example="2">%d</xliff:g> à <xliff:g id="total" example="137">%d</xliff:g></item>
-        <item quantity="two"><xliff:g id="index" example="2">%d</xliff:g> à <xliff:g id="total" example="137">%d</xliff:g></item>
-        <item quantity="few"><xliff:g id="index" example="2">%d</xliff:g> à <xliff:g id="total" example="137">%d</xliff:g></item>
-        <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> à <xliff:g id="total" example="137">%d</xliff:g></item>
-    </plurals>
     <string name="action_mode_done">Deiseil</string>
     <string name="progress_erasing">A’ suathadh bàn an stòrais cho-roinnte\u2026</string>
     <string name="share">Co-roinn</string>
@@ -1868,12 +1742,6 @@
     <string name="kg_wrong_pattern">Pàtran ceàrr</string>
     <string name="kg_wrong_password">Facal-faire ceàrr</string>
     <string name="kg_wrong_pin">PIN ceàrr</string>
-    <plurals name="kg_too_many_failed_attempts_countdown">
-        <item quantity="one">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> diog.</item>
-        <item quantity="two">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> dhiog.</item>
-        <item quantity="few">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> diogan.</item>
-        <item quantity="other">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> diog.</item>
-    </plurals>
     <string name="kg_pattern_instructions">Tarraing am pàtran agad</string>
     <string name="kg_sim_pin_instructions">Cuir a-steach PIN an t-SIM</string>
     <string name="kg_pin_instructions">Cuir a-steach am PIN</string>
@@ -1957,10 +1825,6 @@
     <string name="accessibility_enable_service_title">Am faigh
          <xliff:g id="service" example="TalkBack">%1$s</xliff:g> làn-smachd air an
         uidheam agad?</string>
-    <string name="accessibility_enable_service_encryption_warning">Ma chuireas tu 
-<xliff:g id="service" example="TalkBack">%1$s</xliff:g> air, cha chleachd an t-uidheam agad glas na sgrìn
-        agad airson piseach a thoir air        crioptachadh an dàta.
-    </string>
     <string name="accessibility_service_warning_description">Tha làn-smachd iomchaidh do dh’aplacaidean
        a chuidicheas leis an t-so-ruigsinneachd ach chan eil e iomchaidh dhan mhòrchuid a dh’aplacaidean.
     </string>
@@ -2105,12 +1969,6 @@
     <string name="restr_pin_create_pin">Cruthaich PIN airson cuingeachaidhean atharrachadh</string>
     <string name="restr_pin_error_doesnt_match">Chan eil an dà chòd PIN co-ionnann. Feuch ris a-rithist.</string>
     <string name="restr_pin_error_too_short">Tha am PIN ro ghoirid. Feumaidh co-dhiù 4 àireamhan a bhith ann.</string>
-    <plurals name="restr_pin_countdown">
-        <item quantity="one">Feuch ris a-rithist an ceann <xliff:g id="count">%d</xliff:g> diog</item>
-        <item quantity="two">Feuch ris a-rithist an ceann <xliff:g id="count">%d</xliff:g> dhiog.</item>
-        <item quantity="few">Feuch ris a-rithist an ceann <xliff:g id="count">%d</xliff:g> diogan.</item>
-        <item quantity="other">Feuch ris a-rithist an ceann <xliff:g id="count">%d</xliff:g> dhiog</item>
-    </plurals>
     <string name="restr_pin_try_later">Feuch ris a-rithist an ceann greis</string>
     <string name="immersive_cling_title">’Ga shealltainn air an làn-sgrìn</string>
     <string name="immersive_cling_description">Airson am modh fhàgail, grad-shlaighd sìos on bhàrr.</string>
@@ -2142,54 +2000,6 @@
     <string name="data_saver_description">Ach an caith thu nas lugha a dhàta, bacaidh caomhnaiche an dàta cuid a dh’aplacaidean o dhàta a chur no fhaighinn sa chùlaibh. ’S urrainn do dh’aplacaid a bhios tu ris dàta inntrigeadh ach dh’fhaoidte nach dèan i cho tric e. Is ciall dha seo nach dèid cuid a dhealbhan a shealltainn mus doir thu gnogag orra, mar eisimpleir.</string>
     <string name="data_saver_enable_title">A bheil tu airson caomhnaiche an dàta a chur air?</string>
     <string name="data_saver_enable_button">Cuir air</string>
-    <plurals name="zen_mode_duration_minutes_summary">
-        <item quantity="one">Fad %1$d mhionaid (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Fad %1$d mhionaid (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Fad %1$d mionaidean (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Fad %1$d mionaid (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_summary_short">
-        <item quantity="one">Fad %1$d mhion (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Fad %1$d mhion (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Fad %1$d mion (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Fad %1$d mion (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_summary">
-        <item quantity="one">Fad %1$d uair a thìde (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Fad %1$d uair a thìde (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Fad %1$d uairean a thìde (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Fad %1$d uair a thìde (gu ruige <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_summary_short">
-        <item quantity="one">Fad %1$d uair (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="two">Fad %1$d uair (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="few">Fad %1$d uair (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Fad %1$d uair (gu <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes">
-        <item quantity="one">Fad %d mhionaid</item>
-        <item quantity="two">Fad %d mhionaid</item>
-        <item quantity="few">Fad %d mionaidean</item>
-        <item quantity="other">Fad %d mionaid</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_short">
-        <item quantity="one">Fad %d mhion</item>
-        <item quantity="two">Fad %d mhion</item>
-        <item quantity="few">Fad %d mion</item>
-        <item quantity="other">Fad %d mion</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours">
-        <item quantity="one">Fad %d uair a thìde</item>
-        <item quantity="two">Fad %d uair a thìde</item>
-        <item quantity="few">Fad %d uairean a thìde</item>
-        <item quantity="other">Fad %d uair a thìde</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_short">
-        <item quantity="one">Fad %d uair</item>
-        <item quantity="two">Fad %d uair</item>
-        <item quantity="few">Fad %d uair</item>
-        <item quantity="other">Fad %d uair</item>
-    </plurals>
     <string name="zen_mode_until">Gu ruige <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
     <string name="zen_mode_alarm">Gu ruige <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g> (an ath-chaismeachd)</string>
     <string name="zen_mode_forever">Gus an cuir thu dheth e</string>
@@ -2229,12 +2039,6 @@
     <string name="notification_messaging_title_template"><xliff:g id="conversation_title" example="Tasty Treat Team">%1$s</xliff:g>: <xliff:g id="sender_name" example="Adrian Baker">%2$s</xliff:g></string>
     <string name="call_notification_answer_video_action">Video</string>
     <string name="call_notification_decline_action">Diùlt</string>
-    <plurals name="selected_count">
-        <item quantity="one">Chaidh <xliff:g id="count" example="1">%1$d</xliff:g> a thaghadh</item>
-        <item quantity="two">Chaidh <xliff:g id="count" example="3">%1$d</xliff:g> a thaghadh</item>
-        <item quantity="few">Chaidh <xliff:g id="count" example="3">%1$d</xliff:g> a thaghadh</item>
-        <item quantity="other">Chaidh <xliff:g id="count" example="3">%1$d</xliff:g> a thaghadh</item>
-    </plurals>
     <string name="default_notification_channel_label">Gun seòrsachadh</string>
     <string name="importance_from_user">Shuidhich thu cudromach nam brathan seo.</string>
     <string name="importance_from_person">Tha seo cudromach ri linn nan daoine a bhios ’na lùib.</string>
@@ -2299,12 +2103,6 @@
     <string name="autofill_save_accessibility_title">Sàbhail a chùm fèin-lìonaidh</string>
     <string name="autofill_error_cannot_autofill">Gabhaidh an t-susbaint fèin-lìonadh</string>
     <string name="autofill_picker_no_suggestions">Chan eil moladh fèin-lìonaidh ann</string>
-    <plurals name="autofill_picker_some_suggestions">
-        <item quantity="one">Tha <xliff:g id="count" example="Two">%1$s</xliff:g> mholadh fèin-lìonaidh ann</item>
-        <item quantity="two">Tha <xliff:g id="count" example="Two">%1$s</xliff:g> mholadh fèin-lìonaidh ann</item>
-        <item quantity="few">Tha <xliff:g id="count" example="Two">%1$s</xliff:g> molaidhean fèin-lìonaidh ann</item>
-        <item quantity="other">Tha <xliff:g id="count" example="Two">%1$s</xliff:g> moladh fèin-lìonaidh ann</item>
-    </plurals>
     <string name="autofill_save_title">An sàbhail thu gu <b><xliff:g id="label" example="MyPass">%1$s</xliff:g></b> e?</string>
     <string name="autofill_save_title_with_type">An sàbhail thu <xliff:g id="type" example="Credit Card">%1$s</xliff:g> gu <b><xliff:g id="label" example="MyPass">%2$s</xliff:g></b>?</string>
     <string name="autofill_save_title_with_2types">An sàbhail thu <xliff:g id="type" example="Password">%1$s</xliff:g> ’s <xliff:g id="type" example="Credit Card">%2$s</xliff:g> gu <b><xliff:g id="label" example="MyPass">%3$s</xliff:g></b>?</string>
@@ -2396,12 +2194,6 @@
     <string name="mime_type_presentation_ext">Taisbeanadh <xliff:g id="extension" example="PDF">%1$s</xliff:g></string>
     <string name="bluetooth_airplane_mode_toast">Bidh Bluetooth ’ga chumail air sa mhodh itealain</string>
     <string name="car_loading_profile">’Ga luchdadh</string>
-    <plurals name="file_count">
-        <item quantity="one"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> fhaidhle</item>
-        <item quantity="two"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> fhaidhle</item>
-        <item quantity="few"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> faidhlichean</item>
-        <item quantity="other"><xliff:g id="file_name">%s</xliff:g> + <xliff:g id="count">%d</xliff:g> faidhle</item>
-    </plurals>
     <string name="chooser_no_direct_share_targets">Cha deach daoine a mholadh airson a cho-roinneadh leotha</string>
     <string name="chooser_all_apps_button_label">Liosta nan aplacaidean</string>
     <string name="usb_device_resolve_prompt_warn">Cha d’ fhuair an aplacaid seo cead clàraidh ach b’ urrainn dhi fuaim a ghlacadh leis an uidheam USB seo.</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 3bab497..cdc1278 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
@@ -152,7 +152,6 @@
     <string name="permgroupdesc_calendar">kcem ɣer umitay</string>
     <string name="permgrouplab_sms">SMS</string>
     <string name="permgroupdesc_sms">Azen, tsekneḍ-d tibratin SMS</string>
-    <string name="permgroupdesc_storage">Kcem ar tewlafin, tibidyutin akked yifayluyen n tmacint</string>
     <string name="permgrouplab_microphone">Asawaḍ</string>
     <string name="permgroupdesc_microphone">Asekles n yimesla</string>
     <string name="permgrouplab_camera">Takamiṛat</string>
@@ -279,7 +278,7 @@
     <string name="sipAddressTypeWork">Axeddim</string>
     <string name="sipAddressTypeOther">Wayeḍ</string>
     <string name="lockscreen_carrier_default">Ulac ameẓlu</string>
-    <string name="lockscreen_emergency_call">Isawalen uɛjilen</string>
+    <string name="lockscreen_emergency_call">Amerwas</string>
     <string name="lockscreen_return_to_call">Uɣal ɣer usiwel</string>
     <string name="lockscreen_pattern_wrong">Ɛṛeḍ tikelt nniḍen</string>
     <string name="lockscreen_password_wrong">Ɛṛeḍ tikelt nniḍen</string>
@@ -326,7 +325,6 @@
     <string name="save_password_remember">Cfu</string>
     <string name="save_password_never">Weṛǧin</string>
     <string name="text_copied">Aḍris yettwanɣel ɣef afus.</string>
-    <string name="copied">Yenɣel</string>
     <string name="more_item_label">Ugar</string>
     <string name="menu_meta_shortcut_label">Méta+</string>
     <string name="menu_space_shortcut_label">tallunt</string>
@@ -365,6 +363,7 @@
     <string name="autofill">Taččart tawurmant</string>
     <string name="addToDictionary">Rnu ar umawal</string>
     <string name="deleteText">Kkes</string>
+    <string name="input_method_nav_back_button_desc">Tuɣalin</string>
     <string name="ok">IH</string>
     <string name="cancel">Sefsex</string>
     <string name="yes">IH</string>
@@ -387,8 +386,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_enrollment_powerbutton_intent_positive_button">Sens</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">Sefsex</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>
     <string name="volume_alarm">Imesli n tsusliyin</string>
diff --git a/overlay/frameworks/base/core/res/res/values-ku/strings.xml b/overlay/frameworks/base/core/res/res/values-ku/strings.xml
index 8d045d1..a7822b9 100644
--- a/overlay/frameworks/base/core/res/res/values-ku/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-ku/strings.xml
@@ -701,6 +701,7 @@
     <string name="deleteText">سڕینه‌وه‌</string>
     <string name="inputMethod">تێكردن ڕێگە</string>
     <string name="editTextMenuTitle">چالاکی دەق</string>
+    <string name="input_method_nav_back_button_desc">گەڕانەوە</string>
     <string name="low_internal_storage_view_title">بیرگەی بۆشایی خەریکە نامێنێت</string>
     <string name="low_internal_storage_view_text">هەمان کرداری سیستەم لەوانەیە ئیش نەکات</string>
     <string name="app_running_notification_title"><xliff:g id="app_name">%1$s</xliff:g>
@@ -745,7 +746,6 @@
         <xliff:g id="number" example="123">%2$d</xliff:g>.</string>
     <string name="android_upgrading_starting_apps">دەستپێکردنی بەرنامەکان.</string>
     <string name="android_upgrading_complete">تەواوبوونی بووت.</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">هەڵوەشاندنەوە</string>
     <string name="heavy_weight_notification"><xliff:g id="app">%1$s</xliff:g> کارکردن</string>
     <string name="sendText">فرمانێک هەڵبژێرە بۆ نووسراوە</string>
     <string name="volume_ringtone">قەبارەی دەنگی زەنگ لێدەر</string>
@@ -842,10 +842,6 @@
     <string name="skip_button_label">تێپەڕاندن</string>
     <string name="no_matches">هیچ ئەنجامێک نیە</string>
     <string name="find_on_page">دۆزینەوە لە پەڕە</string>
-    <plurals name="matches_found">
-        <item quantity="one">1 هاوتا</item>
-        <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> لە <xliff:g id="total" example="137">%d</xliff:g></item>
-    </plurals>
     <string name="action_mode_done">تەواو</string>
     <string name="share">هاوبه‌شیکردن</string>
     <string name="find">دۆزینەوە</string>
@@ -1086,10 +1082,6 @@
     <string name="restr_pin_create_pin">PIN دروست بکە بۆ گۆڕینی بەسترانەوەکان</string>
     <string name="restr_pin_error_doesnt_match">PIN ناگونجێت. دوبارە هەوڵبدەرەوە.</string>
     <string name="restr_pin_error_too_short">PIN زۆر کورتە. ئەبێ لانیکەم 4 ژمارە بێت.</string>
-    <plurals name="restr_pin_countdown">
-        <item quantity="one">دوبارە هەوڵبدەرەوە لە 1 چرکەی تر</item>
-        <item quantity="other">دوبارە هەوڵبدەرەوە  لە <xliff:g id="count">%d</xliff:g> چرکەکان</item>
-    </plurals>
     <string name="restr_pin_try_later">دواتر دووبارە هەوڵبدە</string>
     <string name="confirm_battery_saver">باشه‌</string>
     <string name="zen_mode_feature_name">مەمشێوێنە</string>
diff --git a/overlay/frameworks/base/core/res/res/values-lb/strings.xml b/overlay/frameworks/base/core/res/res/values-lb/strings.xml
index a5ce3dd..c514f92 100644
--- a/overlay/frameworks/base/core/res/res/values-lb/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-lb/strings.xml
@@ -231,7 +231,6 @@
     <string name="permlab_writeCallLog">Urufflëscht änneren</string>
     <string name="permdesc_writeCallLog" product="tablet">Erlaabt der App, d\'Urufflëscht vum Tablet z\'änneren, inklusiv Daten iwwer erakommend an erausgoend Uriff. Béisaarteg Appe kéinten dës Berechtegung benotze fir d\'Daten ouni däi Wëssen ze läschen oder z\'änneren.</string>
     <string name="permdesc_writeCallLog" product="default">Erlaabt der App, d\'Urufflëscht vum Telefon z\'änneren, inklusiv Daten iwwer erakommend an erausgoend Uriff. Béisaarteg Appe kéinten dës Berechtegung benotze fir d\'Daten ouni däi Wëssen ze läschen oder z\'änneren.</string>
-    <string name="permdesc_bodySensors" product="default">Erlaabt der App, op d\'Date vu Sensoren zouzegräifen, déi deng kierperlech Verfaassung iwwerwaachen, z. B. däi Puls.</string>
     <string name="permlab_writeCalendar">Kalenner-Rendezvousen dobäisetzen oder änneren an E-Mailen u Gäscht ouni d\'Wësse vun de Benotzer schécken</string>
     <string name="permlab_accessLocationExtraCommands">Op zousätzlech Serviceproviderbefeeler fir de Standuert zougräifen</string>
     <string name="permlab_modifyAudioSettings">Tounastellungen änneren</string>
@@ -700,6 +699,7 @@
     <string name="deleteText">Läschen</string>
     <string name="inputMethod">Method fir anzeginn</string>
     <string name="editTextMenuTitle">Textaktiounen</string>
+    <string name="input_method_nav_back_button_desc">Zréck</string>
     <string name="low_internal_storage_view_title">De Späicher huet geschwë keng Plaz méi</string>
     <string name="low_internal_storage_view_text">E puer Systemfunktioune funktionéiere vläicht net</string>
     <string name="low_internal_storage_view_text_no_boot">Net genuch Späicher fir de System. Stell sécher, datt s de 250MB fräi Späicherplaz hues a start nei.</string>
@@ -761,7 +761,6 @@
     <string name="android_upgrading_apk">Optiméierung vun der App <xliff:g id="number" example="123">%1$d</xliff:g> / <xliff:g id="number" example="123">%2$d</xliff:g>.</string>
     <string name="android_upgrading_starting_apps">Appe gi gestart.</string>
     <string name="android_upgrading_complete">Start gëtt ofgeschloss.</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">Ofbriechen</string>
     <string name="heavy_weight_notification"><xliff:g id="app">%1$s</xliff:g> leeft</string>
     <string name="sendText">Aktioun fir Text auswielen</string>
     <string name="volume_ringtone">Schelltounlautstäerkt</string>
@@ -868,10 +867,6 @@
     <string name="skip_button_label">Iwwersprangen</string>
     <string name="no_matches">Keng Treffer</string>
     <string name="find_on_page">Op der Säit fannen</string>
-    <plurals name="matches_found">
-        <item quantity="one">1 Treffer</item>
-        <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> vu(n) <xliff:g id="total" example="137">%d</xliff:g></item>
-    </plurals>
     <string name="action_mode_done">Fäerdeg</string>
     <string name="share">Deelen</string>
     <string name="find">Sichen</string>
@@ -1116,10 +1111,6 @@
     <string name="restr_pin_create_pin">PIN fir d\'Ännerung vun Aschränkungen uleeën</string>
     <string name="restr_pin_error_doesnt_match">D\'PINe stëmmen net iwwereneen. Probéier nees w.e.g..</string>
     <string name="restr_pin_error_too_short">De PIN ass ze kuerz. E muss mindestens 4 Zifferen hunn.</string>
-    <plurals name="restr_pin_countdown">
-        <item quantity="one">Probéier nees an 1 Sekonn</item>
-        <item quantity="other">Probéier nees a(n) <xliff:g id="count">%d</xliff:g> Sekonnen</item>
-    </plurals>
     <string name="restr_pin_try_later">Probéier méi spéit nees</string>
     <string name="done_label">Fäerdeg</string>
     <string name="hour_picker_description">Kreesfërmege Regeler fir Stonnen</string>
@@ -1136,14 +1127,6 @@
     <string name="lock_to_app_unlock_password">E Passwuert froe fir e Schierm fräizeginn</string>
     <string name="confirm_battery_saver">OK</string>
     <string name="data_saver_enable_button">Uschalten</string>
-    <plurals name="zen_mode_duration_minutes_summary">
-        <item quantity="one">Fir eng Minutt (bis <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Fir %1$d Minutten (bis <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes">
-        <item quantity="one">Fir eng Minutt</item>
-        <item quantity="other">Fir %d Minutten</item>
-    </plurals>
     <string name="zen_mode_until">Bis <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
     <string name="toolbar_collapse_description">Zouklappen</string>
     <string name="zen_mode_feature_name">Net stéieren</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 0c4a2ee..1f63b4c 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,14 +216,13 @@
     <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 e media</string>
-    <string name="permgroupdesc_storage">atzèdere a fotografias, cuntenutos multimediales e archìvios in su dispositivu</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>
     <string name="permgrouplab_phone">Telèfonu</string>
     <string name="permgroupdesc_phone">faghe e gesti mutidas</string>
     <string name="permgroupdesc_sensors">atzede a is datos sensores de is signos vitales</string>
+    <string name="permgrouplab_notifications">Notìficas</string>
     <string name="capability_title_canRetrieveWindowContent">Recùpera su cuntenutu de sa ventana</string>
     <string name="capability_desc_canRetrieveWindowContent">Ispetziona su cuntenutu de una ventana cun sa chi ses interagende.</string>
     <string name="capability_title_canRequestTouchExploration">Allue Explore by Touch</string>
@@ -337,10 +336,6 @@
     <string name="permdesc_writeCallLog" product="tv">Permitit a s\'aplicatzione de modificare su registru de mutidas de custu dispositivu Android TV, incluidos datos subra mutidas in intrada e in essida. Is aplicatziones malas ddu diant pòdere impreare pro cantzellare o modificare su registru de mutidas tuo.</string>
     <string name="permdesc_writeCallLog" product="default">Permitit a s\'aplicatzione de modificare su registru de mutidas de su telèfonu tuo, incluidos datos subra mutidas in intrada e in essida.
         Is aplicatziones malas ddu diant pòdere impreare pro cantzellare o modificare su registru de mutidas tuo.</string>
-    <string name="permlab_bodySensors">atzèdere a sensores de corpus (comente mesuradores de frecuèntzia cardìaca)
-    </string>
-    <string name="permdesc_bodySensors" product="default">Permitit a s\'aplicatzione de atzèdere a datos dae sensores
-    chi ti controllant is cunditziones fìsicas, che a sa frecuèntzia cardìaca.</string>
     <string name="permlab_writeCalendar">agiùnghere o modificare eventos de su calendàriu e imbiare posta eletrònica a persones invitadas chene chi sa persone mere ddu iscat.</string>
     <string name="permlab_accessLocationExtraCommands">atzèdere a cumandos in prus de su frunidore de positzione</string>
     <string name="permdesc_accessLocationExtraCommands">Permitit a s\'aplicatzione de atzèdere
@@ -694,7 +689,7 @@
     <string name="lockscreen_instructions_when_pattern_enabled">Incarca Menù pro isblocare o fàghere una mutida de emergèntzia.</string>
     <string name="lockscreen_instructions_when_pattern_disabled">Incarca Menù pro isblocare.</string>
     <string name="lockscreen_pattern_instructions">Disinna sa cumbinada pro isblocare</string>
-    <string name="lockscreen_emergency_call">Mutida de emergèntzia</string>
+    <string name="lockscreen_emergency_call">Emergèntzia</string>
     <string name="lockscreen_return_to_call">Torra a sa mutida</string>
     <string name="lockscreen_pattern_correct">Giustu!</string>
     <string name="lockscreen_pattern_wrong">Torra·bi a proare</string>
@@ -877,10 +872,6 @@
        su pòddighe tuo o fàghere gestos pro interagire cun su telèfonu.</string>
     <string name="oneMonthDurationPast">1 mese a oe</string>
     <string name="beforeOneMonthDurationPast">In antis de 1 mese a oe</string>
-    <plurals name="last_num_days">
-        <item quantity="one">Ùrtima <xliff:g id="count">%d</xliff:g> die</item>
-        <item quantity="other">Ùrtimas <xliff:g id="count">%d</xliff:g> dies</item>
-    </plurals>
     <string name="last_month">Su mese passadu</string>
     <string name="older">Prus betzu</string>
     <string name="preposition_for_date">su <xliff:g id="date" example="May 29">%s</xliff:g></string>
@@ -923,6 +914,7 @@
     <string name="deleteText">Cantzella</string>
     <string name="inputMethod">Mètodu de intrada</string>
     <string name="editTextMenuTitle">Atziones de su testu</string>
+    <string name="input_method_nav_back_button_desc">In segus</string>
     <string name="low_internal_storage_view_title">Su logu pro s\'archiviatzione est acabbende</string>
     <string name="low_internal_storage_view_text">Carchi funtzionalidade de sistema diat pòdere non funtzionare</string>
     <string name="low_internal_storage_view_text_no_boot">Non b\'at bastante logu pro su sistema. Segura·ti de tènnere 250MB de logu e torra a aviare.</string>
@@ -975,7 +967,6 @@
     <string name="android_preparing_apk">Aprontende <xliff:g id="appname">%1$s</xliff:g>.</string>
     <string name="android_upgrading_starting_apps">Aviende aplicatziones.</string>
     <string name="android_upgrading_complete">Agabbende s\'aviu</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">Annulla</string>
     <string name="heavy_weight_notification"><xliff:g id="app">%1$s</xliff:g> in esecutzione</string>
     <string name="dump_heap_notification"><xliff:g id="proc">%1$s</xliff:g> at passadu su lìmite de sa
         memòria</string>
@@ -1113,10 +1104,6 @@
     <string name="skip_button_label">Brinca</string>
     <string name="no_matches">Peruna currispondèntzia</string>
     <string name="find_on_page">Agata in sa pàgina</string>
-    <plurals name="matches_found">
-        <item quantity="one">1 currispondèntzia</item>
-        <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> of <xliff:g id="total" example="137">%d</xliff:g></item>
-    </plurals>
     <string name="action_mode_done">Fatu</string>
     <string name="share">Cumpartzidura</string>
     <string name="find">Agata</string>
@@ -1370,10 +1357,6 @@
     <string name="restr_pin_create_pin">Crea unu PIN pro modificare is lìmites</string>
     <string name="restr_pin_error_doesnt_match">Is PIN non currispondent. Torra a proare.</string>
     <string name="restr_pin_error_too_short">Su PIN est tropu curtzu. Depet tènnere a su mancu 4 caràteres.</string>
-    <plurals name="restr_pin_countdown">
-        <item quantity="one">Torra a proare tra 1 segundu</item>
-        <item quantity="other">Torra a proare tra <xliff:g id="count">%d</xliff:g> segundos</item>
-    </plurals>
     <string name="restr_pin_try_later">Torra a proare a pustis</string>
     <string name="immersive_cling_title">Visualizende ischermu intreu</string>
     <string name="immersive_cling_description">Pro essire, trìsina a bassu dae susu.</string>
@@ -1397,30 +1380,6 @@
     <string name="lock_to_app_unlock_pattern">Pedi una cumbinada de isblocu in antis de isblocare</string>
     <string name="lock_to_app_unlock_password">Pedi una crae in antis de isblocare</string>
     <string name="confirm_battery_saver">AB</string>
-    <plurals name="zen_mode_duration_minutes_summary">
-        <item quantity="one">Pro unu minutu (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Pro %1$d minutos (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_summary_short">
-        <item quantity="one">Pro 1 min (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Pro %1$d min (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_summary_short">
-        <item quantity="one">Pro 1 ora (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-        <item quantity="other">Pro %1$d oras (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes">
-        <item quantity="one">Pro unu minutu</item>
-        <item quantity="other">Pro %d minutos</item>
-    </plurals>
-    <plurals name="zen_mode_duration_minutes_short">
-        <item quantity="one">Pro 1 min</item>
-        <item quantity="other">Pro %d min</item>
-    </plurals>
-    <plurals name="zen_mode_duration_hours_short">
-        <item quantity="one">Pro 1 ora</item>
-        <item quantity="other">Pro %d oras</item>
-    </plurals>
     <string name="zen_mode_until">Finas a <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
     <string name="zen_mode_alarm">Finas a <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g> (isvèglia imbeniente)</string>
     <string name="zen_mode_forever_dnd">Finas a cando disativas No istorbes</string>
@@ -1442,10 +1401,6 @@
     <string name="floating_toolbar_close_overflow_description">Serra su menù overflow</string>
     <string name="notification_inbox_ellipsis">\u2026</string>
     <string name="call_notification_decline_action">Refuda</string>
-    <plurals name="selected_count">
-        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> seletzionadu</item>
-        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> seletzionados</item>
-    </plurals>
     <string name="locale_search_menu">Chirca</string>
     <string name="app_suspended_title">S\'aplicatzione no est a disponimentu</string>
     <string name="app_suspended_default_message">        <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> no est a disponimentu immoe. Custu ddu gestit <xliff:g id="app_name" example="Settings">%2$s</xliff:g>.
diff --git a/overlay/frameworks/base/core/res/res/values-su/strings.xml b/overlay/frameworks/base/core/res/res/values-su/strings.xml
index 56a0c10..45b3b7a 100644
--- a/overlay/frameworks/base/core/res/res/values-su/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-su/strings.xml
@@ -190,7 +190,6 @@
     <string name="permgroupdesc_calendar">aksés kalénder anjeun</string>
     <string name="permgrouplab_sms">SMS</string>
     <string name="permgroupdesc_sms">kirim sarta tempo talatah SMS</string>
-    <string name="permgroupdesc_storage">aksés foto, média, sarta koropak na parangkat anjeun</string>
     <string name="permgrouplab_microphone">Mikrofon</string>
     <string name="permgroupdesc_microphone">rékam audio</string>
     <string name="permgrouplab_camera">Kaméra</string>
diff --git a/overlay/frameworks/base/core/res/res/values-ug/strings.xml b/overlay/frameworks/base/core/res/res/values-ug/strings.xml
index db5617f..c26c1ea 100644
--- a/overlay/frameworks/base/core/res/res/values-ug/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-ug/strings.xml
@@ -636,6 +636,7 @@
     <string name="deleteText">ئۆچۈر</string>
     <string name="inputMethod">كىرگۈزگۈچ</string>
     <string name="editTextMenuTitle">تېكىست مەشغۇلاتى</string>
+    <string name="input_method_nav_back_button_desc">قايت</string>
     <string name="low_internal_storage_view_title">ساقلىغۇچ تۈگەي دەپ قالدى</string>
     <string name="low_internal_storage_view_text">سىستېمىنىڭ بەزى ئىقتىدارلىرى ئىشلىمەسلىكى مۇمكىن</string>
     <string name="app_running_notification_title"><xliff:g id="APP_NAME">%1$s</xliff:g> ئىجرا قىلىنىۋاتىدۇ.</string>
@@ -675,7 +676,6 @@
     <string name="android_upgrading_apk"><xliff:g id="NUMBER_1">%2$d</xliff:g> ئەپتىن <xliff:g id="NUMBER_0">%1$d</xliff:g> نى ئەلالاشتۇرۇۋاتىدۇ.</string>
     <string name="android_upgrading_starting_apps">ئەپنى قوزغىتىۋاتىدۇ.</string>
     <string name="android_upgrading_complete">قوزغىتىشنى تاماملاۋاتىدۇ.</string>
-    <string name="fp_enrollment_powerbutton_intent_negative_button">ۋاز كەچ</string>
     <string name="heavy_weight_notification"><xliff:g id="APP">%1$s</xliff:g> ئىجرا قىلىنىۋاتىدۇ</string>
     <string name="sendText">تېكىستكە ئېلىپ بېرىلىدىغان مەشغۇلاتنى تاللاڭ</string>
     <string name="volume_ringtone">قوڭغۇراق ئاۋازى</string>
diff --git a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
index 149f8eb..9b5e0e2 100644
--- a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
+++ b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
@@ -27,7 +27,6 @@
     <string name="device_encryption_backup_text">Introduz abaxo la contraseña de cifráu del preséu. Esta contraseña tamién s\'usa pa cifrar l\'archivu de les copies de seguranza.</string>
     <string name="backup_enc_password_text">Introduz la contraseña que vas usar pa cifrar los datos de la copia de seguranza. Si dexes baleru\'l campu, úsase esta contraseña:</string>
     <string name="backup_enc_password_optional">Si quies cifrar los datos de la copia de seguranza, introduz abaxo una contraseña:</string>
-    <string name="backup_enc_password_required">Darréu que\'l preséu ta cifráu, tienes de cifrar la to copia de seguranza. Introduz abaxo la contraseña:</string>
     <string name="restore_enc_password_text">Si los datos de restauración tán cifraos, introduz la contraseña abaxo:</string>
     <string name="toast_backup_started">Aniciando la copia de seguranza…</string>
     <string name="toast_backup_ended">La copia de seguranza finó</string>
diff --git a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-cy/strings.xml b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-cy/strings.xml
index 45d17a5..ec1754c 100644
--- a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-cy/strings.xml
@@ -27,7 +27,6 @@
     <string name="device_encryption_backup_text">Rho gyfrinair amgryptiad dy ddyfais yma. Bydd hyn hefyd yn cael ei ddefnyddio i amgryptio\'r copi archif wrth gefn.</string>
     <string name="backup_enc_password_text">Rho gyfrinair i\'w ddefnyddio ar gyfer amgryptio\'r data wrth gefn. Os yw hyn yn cael ei adael yn wag, caiff dy gyfrinair cyfredol ei ddefnyddio:</string>
     <string name="backup_enc_password_optional">Os wyt eisiau amgryptio holl ddata\'r copi wrth gefn, rho gyfrinair isod:</string>
-    <string name="backup_enc_password_required">Gan fod dy ddyfais wedi ei amgryptio, mae\'n rhaid felly hefyd amgryptio dy gopi wrth gefn. Rho gyfrinair isod:</string>
     <string name="restore_enc_password_text">Os yw\'r data i\'w adfer wedi ei amgryptio, rho\'r cyfrinair isod:</string>
     <string name="toast_backup_started">Yn dechrau cadw copi wrth gefn...</string>
     <string name="toast_backup_ended">Wedi cwblhau cadw copi wrth gefn</string>
diff --git a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-gd/strings.xml b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-gd/strings.xml
index 79e034a..550d069 100644
--- a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-gd/strings.xml
@@ -27,7 +27,6 @@
     <string name="device_encryption_backup_text">Cuir a-steach am facal-faire airson crioptachadh an uidheim agad gu h-ìosal. Thèid seo a chleachdadh cuideachd airson tasg-lann an lethbhric-ghlèidhidh agad a chrioptachadh.</string>
     <string name="backup_enc_password_text">Cuir a-steach facal-faire airson dàta an lethbhric-ghlèidhidh shlàin a chrioptachadh. Ma dh’fhàgas tu seo bàn, thèid facal-faire làithreach nan lethbhreacan-glèidhidh agad a chleachdadh:</string>
     <string name="backup_enc_password_optional">Nam bu mhiann leat dàta an lethbhric-ghlèidhidh shlàin a chrioptachadh, cuir a-steach facal-faire gu h-ìosal:</string>
-    <string name="backup_enc_password_required">On a tha an t-uidheam agad crioptaichte, feumaidh tu an lethbhreac-glèidhidh a chrioptachadh cuideachd. Cuir a-steach facal-faire gu h-ìosal:</string>
     <string name="restore_enc_password_text">Ma tha dàta an aisig crioptaichte, cuir a-steach am facal-faire gu h-ìosal:</string>
     <string name="toast_backup_started">A’ tòiseachadh air an lethbhreac-ghlèidhidh…</string>
     <string name="toast_backup_ended">Tha an lethbhreac-glèidhidh deiseil</string>
diff --git a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-kab-rDZ/strings.xml b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-kab-rDZ/strings.xml
index 5847c2d..b0e636e 100644
--- a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-kab-rDZ/strings.xml
+++ b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-kab-rDZ/strings.xml
@@ -27,7 +27,6 @@
     <string name="device_encryption_backup_text">Ttxil sekcem awal uffir n usegeleh n ibenk illan ddaw. aya ad isttwaseqdec daɣen i uwgeleh n tarcivt n uḥraz.</string>
     <string name="backup_enc_password_text">Ttxil sekcem awal uffir ara tesqedceḍ i uwgeleh n isefka n uḥraz. ma teǧǧiḍ aya, awal uffir amiaran n tuɣalin ara ttwasqedcen:</string>
     <string name="backup_enc_password_optional">Ma tebɣiḍ awgeleh isefka n uḥraz taččarant, sekcem awal uffir n ddaw:</string>
-    <string name="backup_enc_password_required">Skud ibenk ittwawgeleh, ilaq daɣen awgeleh n uḥraz. Ttxil sekcem awal uffir n ddaw:</string>
     <string name="restore_enc_password_text">Ma yella ttwawgelehen isefka n tuɣalin, ttxil sekcem awal uffir n ddaw:</string>
     <string name="toast_backup_started">Aḥraz yekker...</string>
     <string name="toast_backup_ended">Aḥraz yemmed</string>
diff --git a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ku/strings.xml b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ku/strings.xml
index 37badb6..029f5a7 100644
--- a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ku/strings.xml
+++ b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-ku/strings.xml
@@ -27,7 +27,6 @@
     <string name="device_encryption_backup_text">تکایه تێپه‌ڕه‌وشه‌ی ئامێره‌ ڕه‌مزکراوه‌که‌ت له‌ خواره‌وه‌بنوسه‌. ئه‌مه‌ ده‌توانرێت بۆ ڕه‌مزکردنی ئه‌رشیفی پاراستنیش به‌کار بهێنرێت.</string>
     <string name="backup_enc_password_text">تکایه‌ تێپه‌ڕه‌وشه‌یه‌ک بنوسه‌ بۆ به‌کارهێنانی به‌ هێماکردنی پاراستنی ته‌واوی داتاکان. ئه‌گه‌ر ئه‌مه‌ به‌ به‌تاڵیی جێ بهێڵرێت، دوایین تێپه‌ڕه‌وشه‌ی پاراستنت به‌کارده‌هێنرێت:</string>
     <string name="backup_enc_password_optional">ئه‌گه‌ر ده‌ته‌وێت ته‌واوی پاراستنی داتاکان به‌ هێما بکه‌یت، تێپه‌ڕه‌وشه‌یه‌ک له‌ خواره‌وه‌ بنوسه‌:</string>
-    <string name="backup_enc_password_required">لەوەتەی ئامێرەکەت پارێزراوە، تۆ پێویستیت بە هەڵگرتنی داتاکانتە. تکایە ژمارەی تێپەڕەوشە لێبدە:</string>
     <string name="restore_enc_password_text">ئه‌گه‌ر داتای گه‌ڕاندنه‌وه‌ به‌ هێما کراوه‌، تکایه‌ تێپه‌ڕه‌وشه‌که‌ له‌ خواره‌وه‌ بنوسه‌:</string>
     <string name="toast_backup_started">پاراستن ده‌ستپێده‌کات...</string>
     <string name="toast_backup_ended">پاراستن ته‌واو بوو</string>
diff --git a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-lb/strings.xml b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-lb/strings.xml
index 6312227..cea0df1 100644
--- a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-lb/strings.xml
+++ b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-lb/strings.xml
@@ -27,7 +27,6 @@
     <string name="device_encryption_backup_text">Gëff w.e.g. d\'Passwuert fir d\'Entschlësselung vun dengem Apparat an. Dat Passwuert gëtt och benotzt fir d\'Sécherungsarchiv ze verschlësselen.</string>
     <string name="backup_enc_password_text">Gëff w.e.g. e Passwuert a fir d\'Verschlësselung vun de gesécherten Daten. Falls et eidel ass, gëtt däin aktuellt Sécherungspasswuert benotzt:</string>
     <string name="backup_enc_password_optional">Falls du deng Datesécherung wëlls verschlësselen, gëff e Passwuert an:</string>
-    <string name="backup_enc_password_required">Well däin Apparat verschlësselt ass, muss du och deng Sécherung verschlësselen. Gëff w.e.g. e Passwuert an:</string>
     <string name="restore_enc_password_text">Falls d\'Erëmhierstellungsdate verschlësselt sinn, gëff d\'Passwuert an:</string>
     <string name="toast_backup_started">Sécherung start...</string>
     <string name="toast_backup_ended">Sécherung ofgeschoss</string>
diff --git a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-sc-rIT/strings.xml b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-sc-rIT/strings.xml
index 6fee448..5d5d8ec 100644
--- a/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-sc-rIT/strings.xml
+++ b/overlay/frameworks/base/packages/BackupRestoreConfirmation/res/values-sc-rIT/strings.xml
@@ -27,7 +27,6 @@
     <string name="device_encryption_backup_text">Inserta sa crae de sa tzifradura de su dispositivu in suta. S\'at a impreare puru pro tzifrare s\'archìviu de sa còpia de seguresa.</string>
     <string name="backup_enc_password_text">Inserta una crae de impreare pro tzifrare is datos de sa còpia de seguresa integrale. Si ddu lassas bòidu, s\'at a impreare sa crae tua atuale de sa còpia de seguresa:</string>
     <string name="backup_enc_password_optional">Si boles tzifrare is datos de sa còpia de seguresa integrale, inserta una crae in suta:</string>
-    <string name="backup_enc_password_required">Dae chi su dispositivu tuo est tzifradu, depes tzifrare sa còpia de seguresa. Inserta una crae in suta:</string>
     <string name="restore_enc_password_text">Si is datos ripristinados sunt tzifrados, inserta sa crae in suta:</string>
     <string name="toast_backup_started">Cumintzende sa còpia de seguresa...</string>
     <string name="toast_backup_ended">Còpia de seguresa agabbada</string>
diff --git a/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-ast-rES/strings.xml b/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-ast-rES/strings.xml
index 7d73ce7..ac34314 100644
--- a/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-ast-rES/strings.xml
+++ b/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-ast-rES/strings.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label">Xestor de preseos complementarios</string>
-    <string name="profile_name_generic">preséu</string>
     <string name="profile_name_watch">reló</string>
+    <string name="profile_name_generic">preséu</string>
     <string name="consent_yes">Permitir</string>
     <string name="consent_no">Nun permitir</string>
 </resources>
diff --git a/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-cy/strings.xml b/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-cy/strings.xml
index ed653f0..fb9e74d 100644
--- a/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-cy/strings.xml
@@ -15,11 +15,9 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label">Rheolwr Cymar Ddyfais</string>
+    <string name="profile_name_watch">oriawr</string>
     <string name="chooser_title">Dewisa <xliff:g id="profile_name" example="watch">%1$s</xliff:g> i gael ei reoli gan &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%2$s</xliff:g>&lt;/strong&gt;</string>
     <string name="profile_name_generic">dyfais</string>
-    <string name="profile_name_watch">oriawr</string>
-    <string name="confirmation_title">Caniatáu &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; i reoli dy &lt;strong&gt;<xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g>&lt;/strong&gt;</string>
-    <string name="profile_summary">Mae angen yr ap hwn i reoli dy <xliff:g id="profile_name" example="watch">%1$s</xliff:g>. <xliff:g id="privileges_discplaimer" example="Android Wear will get access to your Notifications, Calendar and Contacts.">%2$s</xliff:g></string>
     <string name="consent_yes">Caniatáu</string>
     <string name="consent_no">Peidio â chaniatáu</string>
 </resources>
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 b0f328d..223a9e4 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
@@ -19,7 +19,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wifi_fail_to_scan">Nun se puen buscar redes</string>
+    <string name="wifi_security_short_wep">WEP</string>
+    <string name="wifi_security_short_wpa">WPA</string>
+    <string name="wifi_security_short_wpa2">WPA2</string>
+    <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+    <string name="wifi_security_short_eap">802.1x</string>
     <string name="wifi_security_none">Nada</string>
+    <string name="wifi_security_wep">WEP</string>
+    <string name="wifi_security_passpoint">Passpoint</string>
     <string name="wifi_remembered">Guardóse</string>
     <string name="wifi_disconnected">Desconectóse</string>
     <string name="wifi_disabled_generic">Desactivóse</string>
@@ -125,10 +132,6 @@
     <string name="bluetooth_talkback_headphone">Auriculares</string>
     <string name="bluetooth_talkback_input_peripheral">Periféricu d\'entrada</string>
     <string name="bluetooth_talkback_bluetooth">Bluetooth</string>
-    <string name="bluetooth_hearingaid_left_pairing_message">Empareyando al audífonu esquierdu\u2026</string>
-    <string name="bluetooth_hearingaid_right_pairing_message">Empareyando al audífonu derechu\u2026</string>
-    <string name="bluetooth_hearingaid_left_battery_level">Esquierdu - <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> de batería</string>
-    <string name="bluetooth_hearingaid_right_battery_level">Derechu - <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> de batería</string>
     <string name="accessibility_wifi_off">Señal Wi-Fi: desactivóse.</string>
     <string name="accessibility_no_wifi">Señal Wi-Fi: desconectóse.</string>
     <string name="accessibility_wifi_one_bar">Señal Wi-Fi: una barra.</string>
@@ -147,7 +150,6 @@
     <string name="tether_settings_title_usb_bluetooth">Tethering</string>
     <string name="tether_settings_title_all">Tethering y puntu Wi-Fi</string>
     <string name="managed_user_title">Toles aplic. llaborales</string>
-    <string name="user_guest">Convidáu</string>
     <string name="unknown">Desconozse</string>
     <string name="running_process_item_user_label">Usuariu: <xliff:g id="user_name">%1$s</xliff:g></string>
     <string name="launch_defaults_some">Afitáronse dalgunos valores predeterminaos</string>
@@ -295,7 +297,7 @@
     <string name="wifi_display_certification_summary">Amuesa les opciones de la certificación de visualización ensin filos</string>
     <string name="wifi_verbose_logging_summary">Aumenta\'l nivel de rexistru de la Wi\u2011Fi y amuesa\'l RSSI de los SSID nel selector Wi\u2011Fi</string>
     <string name="wifi_scan_throttling_summary">Amenorga\'l consumu d\'enerxía y ameyora\'l rindimientu de la rede</string>
-    <string name="wifi_enhanced_mac_randomization_summary">Cuando esti mou s\'activa, la direición MAC d\'esti preséu pue camudar cada vegada que se conecte a una rede que tenga activada la opción pa que la MAC s\'esbille al debalu.</string>
+    <string name="wifi_non_persistent_mac_randomization_summary">Cuando esti mou s\'activa, la direición MAC d\'esti preséu pue camudar cada vegada que se conecte a una rede que tenga activada la opción pa que la MAC s\'esbille al debalu.</string>
     <string name="wifi_metered_label">Con llende de datos</string>
     <string name="wifi_unmetered_label">Ensin llende de datos</string>
     <string name="select_logd_size_title">Tamaños del búfer de Logger</string>
@@ -421,15 +423,6 @@
     <string name="select_webview_provider_title">Implementación de WebView</string>
     <string name="select_webview_provider_dialog_title">Implementación de WebView</string>
     <string name="select_webview_provider_toast_text">Esta escoyeta yá nun ye válida. Volvi tentalo.</string>
-    <string name="convert_to_file_encryption">Convertir al cifráu basáu en ficheros</string>
-    <string name="convert_to_file_encryption_enabled">Convertir\u2026</string>
-    <string name="convert_to_file_encryption_done">Yá se cifró</string>
-    <string name="title_convert_fbe">Convirtiendo al cifráu basáu en ficheros</string>
-    <string name="convert_to_fbe_warning">        Convetir la partición de datos al cifráu basáu en ficheros.\n
-        ¡¡Alvertencia!! Esta aición va desaniciar tolos datos.\n
-        La característica ta n\'estáu alfa y pue funcionar incorreutamente.\n
-        Primi «Desaniciar y convertir\u2026» pa siguir.</string>
-    <string name="button_convert_fbe">Desaniciar y convertir\u2026</string>
     <string name="picture_color_mode">Mou de color de la imaxe</string>
     <string name="picture_color_mode_desc">Usa sRGB</string>
     <string name="daltonizer_mode_disabled">Desactivóse</string>
@@ -508,10 +501,6 @@
     <string name="ims_reg_status_not_registered">"Nun se rexistró"</string>
     <string name="status_unavailable">Nun ta disponible</string>
     <string name="wifi_status_mac_randomized">La direición MAC esbillase al debalu</string>
-    <plurals name="wifi_tether_connected_summary">
-        <item quantity="one">%1$d preséu conectáu</item>
-        <item quantity="other">%1$d preseos conectaos</item>
-    </plurals>
     <string name="accessibility_manual_zen_more_time">Más tiempu.</string>
     <string name="accessibility_manual_zen_less_time">Menos tiempu.</string>
     <string name="cancel">Encaboxar</string>
@@ -531,7 +520,7 @@
     <string name="zen_mode_duration_always_prompt_title">Entrugar siempres</string>
     <string name="zen_mode_forever">Hasta desactivar esta opción</string>
     <string name="time_unit_just_now">Puramente agora</string>
-    <string name="media_transfer_this_device_name">Altavoz del teléfonu</string>
+    <string name="media_transfer_this_device_name" product="default">Esti teléfonu</string>
     <string name="media_transfer_this_phone">Esti teléfonu</string>
     <string name="profile_connect_timeout_subtext">Hebo un problema al conectar. Apaga y volvi prender el preséu</string>
     <string name="media_transfer_wired_device_name">Preséu d\'audiu con cable</string>
@@ -574,7 +563,6 @@
     <string name="user_nickname">Nomatu</string>
     <string name="guest_new_guest">Amestar un convidáu</string>
     <string name="guest_exit_guest">Quitar al convidáu</string>
-    <string name="guest_nickname">Convidáu</string>
     <string name="cached_apps_freezer_device_default">Comportamientu predetermináu</string>
     <string name="cached_apps_freezer_disabled">Desactivóse</string>
     <string name="cached_apps_freezer_enabled">Activóse</string>
@@ -593,4 +581,5 @@
     <string name="data_connection_lte_plus">LTE+</string>
     <string name="data_connection_5ge_html" translate="false"> &lt;i&gt;5G &lt;small&gt;E&lt;/small&gt;&lt;/i&gt; </string>
     <string name="data_connection_carrier_wifi">W+</string>
+    <string name="keyboard_layout_default_label">Por defeutu</string>
 </resources>
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 3a3fff4..0f5035c 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
@@ -19,7 +19,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wifi_fail_to_scan">Methu â sganio am rwydweithau</string>
+    <string name="wifi_security_short_wep">WEP</string>
+    <string name="wifi_security_short_wpa">WPA</string>
+    <string name="wifi_security_short_wpa2">WPA2</string>
+    <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+    <string name="wifi_security_short_eap">802.1x</string>
     <string name="wifi_security_none">Dim</string>
+    <string name="wifi_security_wep">WEP</string>
+    <string name="wifi_security_passpoint">Passpoint</string>
     <string name="wifi_remembered">Wedi ei gofio</string>
     <string name="wifi_disconnected">Heb gysylltu</string>
     <string name="wifi_disabled_generic">Wedi\'i analluogi</string>
@@ -83,7 +90,6 @@
     <string name="bluetooth_profile_a2dp">Sain cyfryngau</string>
     <string name="bluetooth_profile_headset">Galwadau ffôn</string>
     <string name="bluetooth_profile_opp">Trosglwyddo ffeiliau</string>
-    <string name="bluetooth_profile_broadcast">Darlledu</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>
@@ -91,7 +97,6 @@
     <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>
-    <string name="bluetooth_profile_vcp">Rheolaeth sain</string>
     <string name="bluetooth_profile_a2dp_high_quality">Sain HD: <xliff:g id="codec_name">%1$s</xliff:g></string>
     <string name="bluetooth_profile_a2dp_high_quality_unknown_codec">Sain HD</string>
     <string name="bluetooth_profile_hearing_aid">Teclynnau Cymorth Clyw</string>
@@ -125,14 +130,9 @@
     <string name="bluetooth_talkback_headset">Clustffonau</string>
     <string name="bluetooth_talkback_phone">Ffôn</string>
     <string name="bluetooth_talkback_imaging">Delweddu</string>
-    <string name="bluetooth_talkback_group">Dyfeisiau\'r Grŵp</string>
     <string name="bluetooth_talkback_headphone">Clustffonau</string>
     <string name="bluetooth_talkback_input_peripheral">Perifferol Mewnbwn</string>
     <string name="bluetooth_talkback_bluetooth">Bluetooth</string>
-    <string name="bluetooth_hearingaid_left_pairing_message">Yn paru â theclyn clyw\'r chwith\u2026</string>
-    <string name="bluetooth_hearingaid_right_pairing_message">Yn paru â theclyn clyw\'r dde\u2026</string>
-    <string name="bluetooth_hearingaid_left_battery_level">Chwith - <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> batri</string>
-    <string name="bluetooth_hearingaid_right_battery_level">De - <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> batri</string>
     <string name="accessibility_wifi_off">Wi-fi i ffwrdd.</string>
     <string name="accessibility_no_wifi">Wi-fi heb gysylltu.</string>
     <string name="accessibility_wifi_one_bar">Un bar W-Fi.</string>
@@ -151,7 +151,6 @@
     <string name="tether_settings_title_usb_bluetooth">Tenynnu</string>
     <string name="tether_settings_title_all">Tenynnu a llecyn Wi-Fi</string>
     <string name="managed_user_title">Pob ap gwaith</string>
-    <string name="user_guest">Gwestai</string>
     <string name="unknown">Anhysybys</string>
     <string name="running_process_item_user_label">Defnyddiwr: <xliff:g id="user_name">%1$s</xliff:g></string>
     <string name="launch_defaults_some">Rhai rhagosodiadau wedi\'u gosod</string>
@@ -264,7 +263,7 @@
     <string name="wifi_display_certification">Tystysgrifio dangosyddion diwifr</string>
     <string name="wifi_verbose_logging">Galluogi Logio Wi\u2011Fi Geiriog</string>
     <string name="wifi_scan_throttling">Throtlo sganio am Wi\u2011Fi</string>
-    <string name="wifi_enhanced_mac_randomization">MAC amharaus ar hap drwy Wi\u2011Fi</string>
+    <string name="wifi_non_persistent_mac_randomization">MAC amharaus ar hap drwy Wi\u2011Fi</string>
     <string name="mobile_data_always_on">Data symudol yn weithredol o hyd</string>
     <string name="tethering_hardware_offload">Cyflymiad caledwedd tenynnu</string>
     <string name="bluetooth_show_devices_without_names">Dangos dyfeisiau Bluetooth heb enwau</string>
@@ -297,7 +296,7 @@
     <string name="wifi_display_certification_summary">Dangos dewisiadau ar gyfer tystysgrifo dangosyddion di-wifr</string>
     <string name="wifi_verbose_logging_summary">Cynyddu lefel logio Wi\u2011Fi, gan ddangos fesul SSID RSSI yn Dewisydd Wi\u2011Fi</string>
     <string name="wifi_scan_throttling_summary">Mae\'n lleihau defnydd batri ac yn gwella perfformiad rhwydwaith</string>
-    <string name="wifi_enhanced_mac_randomization_summary">Pan fydd y modd hwn wedi\'i alluogi, gall gyfeiriad MAC y ddyfais hon newid bob tro y mae\'n cysylltu â rhwydwaith sydd â hap MAC ymlaen.</string>
+    <string name="wifi_non_persistent_mac_randomization_summary">Pan fydd y modd hwn wedi\'i alluogi, gall gyfeiriad MAC y ddyfais hon newid bob tro y mae\'n cysylltu â rhwydwaith sydd â hap MAC ymlaen.</string>
     <string name="wifi_metered_label">Wedi\'i mesur</string>
     <string name="wifi_unmetered_label">Heb ei mesur</string>
     <string name="select_logd_size_title">Meintiau byfferau logwyr</string>
@@ -425,15 +424,6 @@
     <string name="select_webview_provider_title">Rhoi WebView ar waith</string>
     <string name="select_webview_provider_dialog_title">Gosod WebView i weithredu</string>
     <string name="select_webview_provider_toast_text">Dyw\'r dewis hwn ddim yn ddilys bellach. Ceisia eto.</string>
-    <string name="convert_to_file_encryption">Trosi i amgypriad ffeil</string>
-    <string name="convert_to_file_encryption_enabled">Trosi\u2026</string>
-    <string name="convert_to_file_encryption_done">Ffeil eisoes wedi\'i hamgryptio</string>
-    <string name="title_convert_fbe">Yn trosi i amgryptiad yn seiliedig ar ffeil</string>
-    <string name="convert_to_fbe_warning">Trosi rhaniad data i amgryptiad yn seiliedig ar ffeil.\n
-!!Rhybudd!! Bydd hyn yn dileu dy holl ddata.\n
-Mae\'r nodwedd hon dal yn fersiwn alffa, ac felly mae\'n bosib na fydd yn gweithio\'n gywir.\n
-Gwasga \'Clirio a Throsi\' i barhau.</string>
-    <string name="button_convert_fbe">Clirio a throsi\u2026</string>
     <string name="picture_color_mode">Modd lliw darlun</string>
     <string name="picture_color_mode_desc">Defnyddio sRGB</string>
     <string name="daltonizer_mode_disabled">Wedi\'i analluogi</string>
@@ -442,12 +432,6 @@
     <string name="daltonizer_mode_protanomaly">Protoanomaledd (coch-gwyrdd)</string>
     <string name="daltonizer_mode_tritanomaly">Trithoanomaledd (glas-melyn)</string>
     <string name="accessibility_display_daltonizer_preference_title">Cywiriad lliw</string>
-    <string name="accessibility_display_daltonizer_preference_subtitle"><![CDATA[        Addasu sut y mae lliwiau yn ymddangos ar dy ddyfais. Gall fod yn ddefnyddiol pan fyddi eisiau:<br/><br/>
-        <ol>
-            <li>&nbsp;Gweld lliwiau yn fwy cywir</li>
-            <li>&nbsp;Cael gwared â lliwiau i dy helpu i ffocysu</li>
-        </ol>
-        ]]></string>
     <string name="daltonizer_type_overridden">Mae\'n cael ei or-reoli gan <xliff:g id="title" example="Simulate color space">%1$s</xliff:g></string>
     <string name="power_remaining_settings_home_page"><xliff:g id="percentage" example="10%">%1$s</xliff:g> - <xliff:g id="time_string" example="1 hour left based on your usage">%2$s</xliff:g></string>
     <string name="power_remaining_duration_only">Tua <xliff:g id="time_remaining">%1$s</xliff:g> yn weddill</string>
@@ -517,14 +501,6 @@
     <string name="ims_reg_status_not_registered">"Heb gofrestru"</string>
     <string name="status_unavailable">Dim ar gael</string>
     <string name="wifi_status_mac_randomized">MAC wedi\'i osod ar hap</string>
-    <plurals name="wifi_tether_connected_summary">
-        <item quantity="zero">%1$d dyfais wedi\'u cysylltu</item>
-        <item quantity="one">%1$d dyfais wedi\'i chysylltu</item>
-        <item quantity="two">%1$d ddyfais wedi\'u cysylltu</item>
-        <item quantity="few">%1$d dyfais wedi\'u cysylltu</item>
-        <item quantity="many">%1$d dyfais wedi\'u cysylltu</item>
-        <item quantity="other">%1$d dyfais wedi\'u cysylltu</item>
-    </plurals>
     <string name="accessibility_manual_zen_more_time">Mwy o amser.</string>
     <string name="accessibility_manual_zen_less_time">Llai o amser.</string>
     <string name="cancel">Diddymu</string>
@@ -550,7 +526,7 @@
     <string name="zen_mode_duration_always_prompt_title">Gofyn bob tro</string>
     <string name="zen_mode_forever">Nes dy fod yn ei ddiffodd</string>
     <string name="time_unit_just_now">Jyst nawr</string>
-    <string name="media_transfer_this_device_name">Seinydd y ffôn</string>
+    <string name="media_transfer_this_device_name" product="default">Y ffôn hwn</string>
     <string name="media_transfer_this_phone">Y ffôn hwn</string>
     <string name="profile_connect_timeout_subtext">Problem cysylltu. Diffodda\'r ddyfais a\'i throi nôl ymlaen</string>
     <string name="media_transfer_wired_device_name">Dyfais sain gwifredig</string>
@@ -595,7 +571,6 @@
     <string name="guest_new_guest">Ychwanegu gwestai</string>
     <string name="guest_exit_guest">Tynnu gwestai</string>
     <string name="guest_reset_guest">Ailosod gwestai</string>
-    <string name="guest_nickname">Gwestai</string>
     <string name="guest_reset_guest_dialog_title">Ailosod gwestai?</string>
     <string name="guest_reset_guest_confirm_button">Ailosod</string>
     <string name="guest_resetting">Yn ailosod gwestai\u2026</string>
@@ -637,4 +612,5 @@
     <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="keyboard_layout_default_label">Arferol</string>
 </resources>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-eo/strings.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-eo/strings.xml
index 6d51b13..2b7b03e 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-eo/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-eo/strings.xml
@@ -18,13 +18,18 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_security_short_wep">WEP</string>
+    <string name="wifi_security_short_wpa">WPA</string>
+    <string name="wifi_security_short_wpa2">WPA2</string>
+    <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+    <string name="wifi_security_short_eap">802.1x</string>
+    <string name="wifi_security_wep">WEP</string>
+    <string name="wifi_security_passpoint">Passpoint</string>
     <string name="wifi_remembered">Konservita</string>
     <string name="wifi_disconnected">Malkonektita</string>
     <string name="bluetooth_disconnected">Malkonektita</string>
     <string name="bluetooth_pairing_decline">Nuligi</string>
     <string name="data_usage_uninstalled_apps">Forigitaj aplikaĵoj</string>
     <string name="data_usage_uninstalled_apps_users">Forigitaj aplikaĵoj kaj uzantoj</string>
-    <string name="user_guest">Gasto</string>
     <string name="cancel">Nuligi</string>
-    <string name="guest_nickname">Gasto</string>
 </resources>
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 d208b58..fd3c220 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-gd/strings.xml
@@ -125,10 +125,6 @@
     <string name="bluetooth_talkback_headphone">Cluais-fhòn</string>
     <string name="bluetooth_talkback_input_peripheral">Uidheam-taice ion-chuir</string>
     <string name="bluetooth_talkback_bluetooth">Bluetooth</string>
-    <string name="bluetooth_hearingaid_left_pairing_message">A’ paidhreachadh an inneil-chlaisneachd chlì\u2026</string>
-    <string name="bluetooth_hearingaid_right_pairing_message">A’ paidhreachadh an inneil-chlaisneachd dheis\u2026</string>
-    <string name="bluetooth_hearingaid_left_battery_level">Deas – <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> a bhataraidh</string>
-    <string name="bluetooth_hearingaid_right_battery_level">Clì – <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> a bhataraidh</string>
     <string name="accessibility_wifi_off">Tha WiFi dheth.</string>
     <string name="accessibility_no_wifi">Chaidh WiFi a dhì-cheangal.</string>
     <string name="accessibility_wifi_one_bar">Tha bàr a-mhàin air WiFi.</string>
@@ -147,7 +143,6 @@
     <string name="tether_settings_title_usb_bluetooth">Teadhrachadh</string>
     <string name="tether_settings_title_all">Teadhrachadh ⁊ hotspot so-ghiùlan</string>
     <string name="managed_user_title">Aplacaidean uile na h-obrach</string>
-    <string name="user_guest">Aoigh</string>
     <string name="unknown">Neo-aithnichte</string>
     <string name="running_process_item_user_label">Cleachdaiche: <xliff:g id="user_name">%1$s</xliff:g></string>
     <string name="launch_defaults_some">Chaidh cuid a bhun-roghainnean a shuidheachadh</string>
@@ -295,7 +290,7 @@
     <string name="wifi_display_certification_summary">Seall roghainnean airson teisteanas an uidheim-thaisbeanaidh gun uèir</string>
     <string name="wifi_verbose_logging_summary">Meudaich ìre logaidh WiFi, seall gach SSID RSSI an urra san roghnaichear WiFi</string>
     <string name="wifi_scan_throttling_summary">Ìslichidh seo traoghadh a’ bhataraidh ⁊ bheir e piseach air dèanadas an lìonraidh</string>
-    <string name="wifi_enhanced_mac_randomization_summary">Nuair a bhios am modh seo an comas, dh’fhaoidte gun atharraich seòladh MAC an uidheim gach turas a nì e ceangal ri lìonra aig a bheil MAC tuaireamach an comas.</string>
+    <string name="wifi_non_persistent_mac_randomization_summary">Nuair a bhios am modh seo an comas, dh’fhaoidte gun atharraich seòladh MAC an uidheim gach turas a nì e ceangal ri lìonra aig a bheil MAC tuaireamach an comas.</string>
     <string name="wifi_metered_label">Meadaraichte</string>
     <string name="wifi_unmetered_label">Neo-mheadaraichte</string>
     <string name="select_logd_size_title">Meudan bufair nan loga</string>
@@ -420,15 +415,6 @@
     <string name="select_webview_provider_title">Buileachadh seallaidh-lìn</string>
     <string name="select_webview_provider_dialog_title">Suidhich buileachadh an t-seallaidh-lìn</string>
     <string name="select_webview_provider_toast_text">Chan eil an roghainn seo dligheach tuilleadh. Feuch ris a-rithist.</string>
-    <string name="convert_to_file_encryption">Iompaich gu crioptachadh fhaidhlichean</string>
-    <string name="convert_to_file_encryption_enabled">Iompaich\u2026</string>
-    <string name="convert_to_file_encryption_done">Tha crioptachadh fhaidhlichean air mu thràth</string>
-    <string name="title_convert_fbe">Iompachadh gu crioptachadh stèidhichte air faidhlichean</string>
-    <string name="convert_to_fbe_warning">        Iompaich am pàirteachadh dàta gu crioptachadh stèidhichte air faidhlichean.\n
-        !!Rabhadh!! Suathaidh seo bàn an dàta agad uile.\n
-        Chan e ach dreachd alpha dhen ghleus a tha seo agus dh’fhaoidte nach obraich e mar bu chòir.\n
-        Brùth air “Suath bàn is iompaich\u2026” airson leantainn air adhart.</string>
-    <string name="button_convert_fbe">Suath bàn is iompaich\u2026</string>
     <string name="picture_color_mode">Modh dathan nan dealbhan</string>
     <string name="picture_color_mode_desc">Cleachd sRGB</string>
     <string name="daltonizer_mode_disabled">À comas</string>
@@ -504,12 +490,6 @@
     <string name="ims_reg_status_not_registered">"Gun chlàradh"</string>
     <string name="status_unavailable">Chan eil seo ri fhaighinn</string>
     <string name="wifi_status_mac_randomized">Tha MAC air thuaiream agad</string>
-    <plurals name="wifi_tether_connected_summary">
-        <item quantity="one">Chaidh %1$d uidheam a cheangal</item>
-        <item quantity="two">Chaidh %1$d uidheam a cheangal</item>
-        <item quantity="few">Chaidh %1$d uidheaman a cheangal</item>
-        <item quantity="other">Chaidh %1$d uidheam a cheangal</item>
-    </plurals>
     <string name="accessibility_manual_zen_more_time">Barrachd ùine.</string>
     <string name="accessibility_manual_zen_less_time">Nas lugha de dh’ùine.</string>
     <string name="cancel">Sguir dheth</string>
@@ -527,7 +507,6 @@
     <string name="zen_mode_duration_always_prompt_title">Faighnich dhìom gach turas</string>
     <string name="zen_mode_forever">Gus an cuir thu dheth e</string>
     <string name="time_unit_just_now">An-dràsta fhèin</string>
-    <string name="media_transfer_this_device_name">Glaodhaire an fhòn</string>
     <string name="profile_connect_timeout_subtext">Tha duilgheadas leis a’ cheangal. Cuir an t-uidheam dheth ⁊ air a-rithist</string>
     <string name="media_transfer_wired_device_name">Uidheam fuaime uèirichte</string>
     <string name="help_label">Taic ⁊ beachd thugainn</string>
@@ -567,11 +546,11 @@
     <string name="user_switch_to_user">Geàrr leum gu <xliff:g id="user_name" example="John Doe">%s</xliff:g></string>
     <string name="guest_new_guest">Cuir aoigh ris</string>
     <string name="guest_exit_guest">Thoir an t-aoigh air falbh</string>
-    <string name="guest_nickname">Aoigh</string>
     <string name="cached_apps_freezer_device_default">Bun-roghainn an uidheim</string>
     <string name="cached_apps_freezer_disabled">À comas</string>
     <string name="cached_apps_freezer_enabled">An comas</string>
     <string name="cached_apps_freezer_reboot_dialog_text">Feumaidh tu an t-uidheam agad ath-thòiseachadh gus an t-atharrachadh seo a chur an sàs. Ath-thòisich an-dràsta no sguir dheth.</string>
     <string name="media_transfer_wired_usb_device_name">Cluais-fhòn uèirichte</string>
     <string name="wifi_hotspot_switch_off_text">Dheth</string>
+    <string name="keyboard_layout_default_label">Bun-roghainn</string>
 </resources>
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 79ced4d..69eeec3 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
@@ -42,7 +42,6 @@
     <string name="data_usage_uninstalled_apps">Isnasen ittwakksen</string>
     <string name="data_usage_uninstalled_apps_users">Isnasen d iseqdacen ittwakksen</string>
     <string name="tether_settings_title_usb">Beṭṭu n tuqqna USB</string>
-    <string name="user_guest">Inebgi</string>
     <string name="unknown">Arussin</string>
     <string name="running_process_item_user_label">Aseqdac:<xliff:g id="document_name">%1$s</xliff:g></string>
     <string name="tts_default_pitch_title">Pas</string>
@@ -116,7 +115,7 @@
     <string name="zen_interruption_level_priority">Tazwart kan</string>
     <string name="zen_mode_duration_settings_title">Tanzagt</string>
     <string name="time_unit_just_now">Tura kan</string>
-    <string name="guest_nickname">Inebgi</string>
     <string name="cached_apps_freezer_disabled">Insa</string>
     <string name="wifi_hotspot_switch_off_text">Insa</string>
+    <string name="keyboard_layout_default_label">Akk-a kan</string>
 </resources>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values-ug/strings.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-ug/strings.xml
index 67bf019..ba2a14a 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-ug/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-ug/strings.xml
@@ -19,5 +19,10 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wifi_fail_to_scan">تورنى تەكشۈرەلمەيدۇ</string>
+    <string name="wifi_security_short_wep">WEP</string>
+    <string name="wifi_security_short_wpa">WPA</string>
+    <string name="wifi_security_short_wpa2">WPA2</string>
+    <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+    <string name="wifi_security_short_eap">802.1x</string>
     <string name="wifi_security_none">يوق</string>
 </resources>
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 47c34b2..d9dbde4 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
@@ -50,10 +50,6 @@
     <string name="kg_wrong_pattern">El patrón ye incorreutu</string>
     <string name="kg_wrong_password">La contraseña ye incorreuta</string>
     <string name="kg_wrong_pin">El PIN ye incorreutu</string>
-    <plurals name="kg_too_many_failed_attempts_countdown">
-        <item quantity="one">Volvi tentalo en 1 segundu.</item>
-        <item quantity="other">Volvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.</item>
-    </plurals>
     <string name="kg_sim_pin_instructions">Introduz el PIN de la SIM.</string>
     <string name="kg_sim_pin_instructions_multi">Introduz el PIN de la SIM de: <xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>.</string>
     <string name="kg_sim_lock_esim_instructions"><xliff:g id="previous_msg" example="Enter SIM PIN.">%1$s</xliff:g> Desactiva la eSIM pa usar el preséu ensin serviciu móvil.</string>
@@ -95,7 +91,6 @@
     <string name="kg_prompt_reason_timeout_password">Tienes d\'introducir la contraseña pa tener más seguranza</string>
     <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_fingerprint_not_recognized">Nun se reconoz</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>
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 f98ff5c..63fa3fb 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
@@ -50,14 +50,6 @@
     <string name="kg_wrong_pattern">Patrwm anghywir</string>
     <string name="kg_wrong_password">Cyfrinair anghywir</string>
     <string name="kg_wrong_pin">PIN Anghywir</string>
-    <plurals name="kg_too_many_failed_attempts_countdown">
-        <item quantity="zero">Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliadau.</item>
-        <item quantity="one">Rho gynnig arall arni mewn 1 eiliad.</item>
-        <item quantity="two">Rho gynnig arall arni mewn <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="few">Rho gynnig arall arni mewn <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="many">Rho gynnig arall arni mewn <xliff:g id="number">%d</xliff:g> eiliad.</item>
-        <item quantity="other">Rho gynnig arall arni mewn <xliff:g id="number">%d</xliff:g> eiliad.</item>
-    </plurals>
     <string name="kg_sim_pin_instructions">Rho PIN y SIM</string>
     <string name="kg_sim_pin_instructions_multi">Rho\'r PIN SIM ar gyfer \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\"</string>
     <string name="kg_sim_lock_esim_instructions"><xliff:g id="previous_msg" example="Enter SIM PIN.">%1$s</xliff:g> Analluoga eSIM i ddefnyddio\'r ddyfais heb wasanaeth ffôn symudol.</string>
@@ -107,7 +99,6 @@
     <string name="kg_prompt_reason_timeout_password">Rhaid rhoi\'r cyfrinair fel cam diogelwch ychwanegol</string>
     <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_fingerprint_not_recognized">Dim yn ei adnabod</string>
     <string name="kg_face_not_recognized">Dim yn ei adnabod</string>
     <string name="kg_face_sensor_privacy_enabled">I ddefnydio Datgloi ag Wyneb, tro <b>mynediad at y Camera</b> ymlaen yn Gosodiadau &gt; Preifatrwydd</string>
     <plurals name="kg_password_default_pin_message">
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 35421a2..58e7647 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
@@ -50,12 +50,6 @@
     <string name="kg_wrong_pattern">Pàtran ceàrr</string>
     <string name="kg_wrong_password">Facal-faire ceàrr</string>
     <string name="kg_wrong_pin">PIN ceàrr</string>
-    <plurals name="kg_too_many_failed_attempts_countdown">
-        <item quantity="one">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> diog.</item>
-        <item quantity="two">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> dhiog.</item>
-        <item quantity="few">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> diogan.</item>
-        <item quantity="other">Feuch ris a-rithist an ceann <xliff:g id="number">%d</xliff:g> diog.</item>
-    </plurals>
     <string name="kg_sim_pin_instructions">Cuir a-steach PIN an t-SIM.</string>
     <string name="kg_sim_pin_instructions_multi">Cuir a-steach PIN an t-SIM airson “<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>”.</string>
     <string name="kg_sim_lock_esim_instructions"><xliff:g id="previous_msg" example="Enter SIM PIN.">%1$s</xliff:g> Cuir an eSIM à comas airson an t-uidheam a chleachdadh às aonais seirbheis mobile.</string>
@@ -101,7 +95,6 @@
     <string name="kg_prompt_reason_timeout_password">Tha facal-faire riatanach a chùm barrachd tèarainteachd</string>
     <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_fingerprint_not_recognized">Gun aithneachadh</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
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 a698148..2f37615 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
@@ -18,14 +18,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label">IU del sistema</string>
-    <string name="battery_low_title">La batería pue escosar pronto</string>
+    <string name="battery_low_title">¿Quies activar l\'aforrador d\'enerxía?</string>
     <string name="battery_low_percent_format">Queda\'l <xliff:g id="percentage">%s</xliff:g></string>
     <string name="invalid_charger_title">Nun se pue cargar per USB</string>
     <string name="invalid_charger_text">Usa\'l cargador que vieno col preséu</string>
     <string name="battery_saver_confirmation_title">¿Quies activar l\'aforrador d\'enerxía?</string>
     <string name="battery_saver_confirmation_title_generic">Tocante al aforrador d\'enerxía</string>
     <string name="battery_saver_confirmation_ok">Activar</string>
-    <string name="battery_saver_start_action">Activar l\'aforrador d\'enerxía</string>
+    <string name="battery_saver_start_action">Activar</string>
+    <string name="battery_saver_dismiss_action">Non, gracies</string>
     <string name="status_bar_settings_auto_rotation">Voltéu de pantalla automáticu</string>
     <string name="usb_device_permission_prompt">¿Quies permitir que «<xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g>» acceda a «<xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g>»?</string>
     <string name="usb_device_permission_prompt_warn">¿Quies permitir que «<xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g>» acceda a «<xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g>»?\nEsta aplicación nun tien permisu pa grabar, mas podría capturar audiu pente esti preséu USB.</string>
@@ -129,10 +130,6 @@
     <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile">Si vuelves introducir mal el patrón, va desaniciase\'l perfil llaboral xunto colos sos datos.</string>
     <string name="biometric_dialog_last_pin_attempt_before_wipe_profile">Si vuelves introducir mal el PIN, va desaniciase\'l perfil llaboral xunto colos sos datos.</string>
     <string name="biometric_dialog_last_password_attempt_before_wipe_profile">Si vuelves introducir mal la contraseña, va desaniciase\'l perfil llaboral xunto colos sos datos.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_device">Ficiéronse milenta intentos incorreutos. Van desaniciase los datos d\u2019esti preséu.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_user">Ficiéronse milenta intentos incorreutos. Va desaniciase esti usuariu.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_profile">Ficiéronse milenta intentos incorreutos. Va desaniciase esti perfil llaboral xunto colos sos datos.</string>
-    <string name="biometric_dialog_now_wiping_dialog_dismiss">Escartar</string>
     <string name="fingerprint_dialog_touch_sensor">Toca\'l sensor de buelgues</string>
     <string name="accessibility_fingerprint_dialog_fingerprint_icon">Iconu de buelga</string>
     <string name="accessibility_bluetooth_connected">Conectóse\'l Bluetooth.</string>
@@ -157,33 +154,15 @@
     <string name="accessibility_desc_lock_screen">Pantalla de bloquéu.</string>
     <string name="accessibility_desc_work_lock">Pantalla de bloquéu del perfil llaboral</string>
     <string name="accessibility_desc_close">Zarrar</string>
-    <string name="accessibility_quick_settings_wifi_changed_off">Inhabilitóse\'l Wi-Fi.</string>
-    <string name="accessibility_quick_settings_wifi_changed_on">Habilitóse\'l Wi-Fi.</string>
-    <string name="accessibility_quick_settings_airplane_changed_off">Desactivóse\'l mou avión.</string>
-    <string name="accessibility_quick_settings_airplane_changed_on">Activóse\'l mou avión.</string>
     <string name="accessibility_quick_settings_dnd_none_on">silenciu total</string>
     <string name="accessibility_quick_settings_dnd_alarms_on">namás alarmes</string>
     <string name="accessibility_quick_settings_dnd">Nun molestar.</string>
-    <string name="accessibility_quick_settings_dnd_changed_off">Desactivóse «Nun molestar».</string>
-    <string name="accessibility_quick_settings_dnd_changed_on">Activóse «Nun molestar».</string>
     <string name="accessibility_quick_settings_bluetooth">Bluetooth.</string>
     <string name="accessibility_quick_settings_bluetooth_on">Bluetooth habilitáu.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_off">Inhabilitóse\'l Bluetoooth.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_on">Habilitóse\'l Bluetooth.</string>
-    <string name="accessibility_quick_settings_location_changed_off">Desactiváronse los informes de llocalización.</string>
-    <string name="accessibility_quick_settings_location_changed_on">Activáronse los informes de llocalización.</string>
     <string name="accessibility_quick_settings_alarm">Programóse l\'alarma pa la hora <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_more_time">Más tiempu.</string>
     <string name="accessibility_quick_settings_less_time">Menos tiempu.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_off">Apagóse la llinterna.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_on">Prendióse la llinterna.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_off">Desactivóse la inversión de color.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_on">Activóse la inversión de color.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_off">Desactivóse\'l puntu Wi-Fi.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_on">Activóse\'l puntu Wi-Fi.</string>
     <string name="accessibility_casting_turned_off">La tresmisión de la pantalla paró.</string>
-    <string name="accessibility_quick_settings_data_saver_changed_off">Desactivóse l\'aforrador de datos.</string>
-    <string name="accessibility_quick_settings_data_saver_changed_on">Activóse l\'aforrador de datos.</string>
     <string name="accessibility_brightness">Brillu de la pantalla</string>
     <string name="data_usage_disabled_dialog_mobile_title">Los datos móviles tán en posa</string>
     <string name="data_usage_disabled_dialog_title">Los datos tán en posa</string>
@@ -225,7 +204,6 @@
     <string name="quick_settings_cast_detail_empty_text">Nun hai nengún preséu disponible</string>
     <string name="quick_settings_cast_no_wifi">La Wi\u2011Fi nun ta conectada</string>
     <string name="quick_settings_brightness_dialog_title">Brillu</string>
-    <string name="quick_settings_more_settings">Más axustes</string>
     <string name="quick_settings_done">Fecho</string>
     <string name="quick_settings_close_user_panel">Zarrar</string>
     <string name="quick_settings_connected">Conectóse</string>
@@ -287,17 +265,11 @@
 prioridá</string>
     <string name="interruption_level_alarms_twoline">Namás\nalarmes</string>
     <string name="accessibility_multi_user_switch_switcher">Cambiar d\'usuariu</string>
-    <string name="user_add_user">Amestar un usuariu</string>
-    <string name="user_new_user_name">Usuariu nuevu</string>
-    <string name="guest_exit_guest_dialog_title">¿Quies quitar al convidáu?</string>
     <string name="guest_exit_guest_dialog_message">Van desaniciase toles aplicaciones y tolos datos d\'esta sesión.</string>
-    <string name="guest_exit_guest_dialog_remove">Quitar</string>
     <string name="guest_wipe_session_title">¡Volvi afayate, convidáu!</string>
     <string name="guest_wipe_session_message">¿Quies siguir cola sesión?</string>
     <string name="guest_wipe_session_wipe">Volver comenzar</string>
     <string name="guest_wipe_session_dontwipe">Sí, siguir</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">¿Quies amestar un usuariu?</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">Cuando amiestes un usuariu, esti tien de configurar el so espaciu.\n\nCualesquier usuariu pue anovar les aplicaciones de los demás usuarios. </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>
@@ -323,19 +295,11 @@
     <string name="empty_shade_text">Nun hai avisos</string>
     <string name="quick_settings_disclosure_management_monitoring">La to organización ye propietaria d\'esti preséu y pue supervisar el tránsitu de rede</string>
     <string name="quick_settings_disclosure_named_management_monitoring">«<xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g>» ye la propietaria d\'esti preséu y pue supervisar el tránsitu de rede</string>
-    <string name="quick_settings_disclosure_management_named_vpn">Esti preséu pertenez a la to organización y ta conectáu a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>»</string>
-    <string name="quick_settings_disclosure_named_management_named_vpn">Esti preséu pertenez a «<xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g>» y ta conectáu a «<xliff:g id="vpn_app" example="Foo VPN App">%2$s</xliff:g>»</string>
     <string name="quick_settings_disclosure_management">Esti preséu pertenez a la to organización</string>
     <string name="quick_settings_disclosure_named_management">Esti preséu pertenez a «<xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g>»</string>
-    <string name="quick_settings_disclosure_management_vpns">Esti preséu pertenez a la to organización y ta conectáu a redes VPN</string>
-    <string name="quick_settings_disclosure_named_management_vpns">Esti preséu pertenez a «<xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g>» y ta conectáu a redes VPN</string>
     <string name="quick_settings_disclosure_managed_profile_monitoring">La to organización pue supervisar el tránsitu de rede del perfil de trabayu</string>
     <string name="quick_settings_disclosure_named_managed_profile_monitoring">«<xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g>» pue supervisar el tránsitu de rede del perfil de trabayu</string>
     <string name="quick_settings_disclosure_monitoring">La rede pue tar supervisada</string>
-    <string name="quick_settings_disclosure_vpns">Esti preséu ta conectáu a redes VPN</string>
-    <string name="quick_settings_disclosure_managed_profile_named_vpn">El perfil llaboral ta conectáu a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>»</string>
-    <string name="quick_settings_disclosure_personal_profile_named_vpn">El perfil personal ta conectáu a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>»</string>
-    <string name="quick_settings_disclosure_named_vpn">Esti preséu ta conectáu a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>»</string>
     <string name="monitoring_title_device_owned">Supervisión de preseos</string>
     <string name="monitoring_subtitle_vpn">VPN</string>
     <string name="monitoring_subtitle_network_logging">Rexistru de la rede</string>
@@ -347,10 +311,6 @@
     <string name="monitoring_description_managed_profile_ca_certificate">La to organización instaló una entidá certificadora nel perfil llaboral. Ye posible que se supervise o modifique\'l tráficu de rede seguru.</string>
     <string name="monitoring_description_ca_certificate">Instalóse una entidá certificadora nesti preséu. Ye posible que se supervise o modifique\'l tráficu de rede seguru.</string>
     <string name="monitoring_description_management_network_logging">L\'alministrador activó\'l rexistru de rede, que supervisa\'l tránsitu del preséu.</string>
-    <string name="monitoring_description_named_vpn">Conectéstite a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>», que pue supervisar la to actividá na rede, como los correos electrónicos, les aplicaciones y los sitios web.</string>
-    <string name="monitoring_description_two_named_vpns">Conectéstite a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>» y a «<xliff:g id="vpn_app" example="Bar VPN App">%2$s</xliff:g>», que puen supervisar la to actividá na rede, como los correos electrónicos, les aplicaciones y los sitios web.</string>
-    <string name="monitoring_description_managed_profile_named_vpn">El perfil llaboral ta conectáu a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>», que pue supervisar la to actividá na rede, como los correos electrónicos, les aplicaciones y los sitios web.</string>
-    <string name="monitoring_description_personal_profile_named_vpn">El perfil personal ta conectáu a «<xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g>», que pue supervisar la to actividá na rede, como los correos electrónicos, les aplicaciones y los sitios web.</string>
     <string name="monitoring_description_vpn_settings">Abrir los axustes de la VPN</string>
     <string name="legacy_vpn_name">VPN</string>
     <string name="keyguard_indication_trust_unlocked">TrustAgent desbloquió\'l preséu</string>
@@ -414,7 +374,6 @@
     <string name="zen_alarm_warning">Nun vas sentir la próxima alarma (<xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g>)</string>
     <string name="alarm_template">Hora: <xliff:g id="when" example="7:00 AM">%1$s</xliff:g></string>
     <string name="alarm_template_far">Día: <xliff:g id="when" example="Fri 7:00 AM">%1$s</xliff:g></string>
-    <string name="accessibility_quick_settings_detail">Axustes rápidos, «<xliff:g id="title" example="Wi-Fi">%s</xliff:g>».</string>
     <string name="accessibility_status_bar_hotspot">Puntu Wi-Fi</string>
     <string name="accessibility_managed_profile">Perfil llaboral</string>
     <string name="tuner_warning_title">Diversión namás pa dalgunes persones</string>
@@ -597,7 +556,6 @@
     <string name="accessibility_quick_settings_collapse">Zarrar los axustes rápidos.</string>
     <string name="accessibility_quick_settings_user">Anicióse sesión como <xliff:g name="user" example="John">%s</xliff:g></string>
     <string name="data_connection_no_internet">Nun hai internet</string>
-    <string name="accessibility_quick_settings_open_details">Abrir los detalles.</string>
     <string name="accessibility_quick_settings_open_settings">Abrir los axustes de: <xliff:g name="page" example="Bluetooth">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_edit">Editar l\'orde de los axustes.</string>
     <string name="accessibility_quick_settings_page">Páxina <xliff:g name="current_page" example="1">%1$d</xliff:g> de <xliff:g name="num_pages" example="2">%2$d</xliff:g></string>
@@ -703,6 +661,7 @@
     <string name="controls_dialog_title">Amiestu a los controles de preseos</string>
     <string name="controls_dialog_ok">Amestar</string>
     <string name="controls_dialog_message">«<xliff:g id="app" example="System UI">%s</xliff:g>» suxer esti control</string>
+    <string name="controls_settings_dialog_neutral_button">Non, gracies</string>
     <string name="controls_pin_use_alphanumeric">El PIN contién lletres o símbolos</string>
     <string name="controls_pin_verify">Verifica «<xliff:g id="device" example="Backdoor lock">%s</xliff:g>»</string>
     <string name="controls_pin_wrong">El PIN ye incorreutu</string>
@@ -712,11 +671,14 @@
     <string name="controls_structure_tooltip">Esliza pa ver más</string>
     <string name="controls_seeding_in_progress">Cargando les recomendaciones</string>
     <string name="controls_media_title">Multimedia</string>
-    <string name="controls_media_dismiss_button">Escartar</string>
+    <string name="controls_media_dismiss_button">Anubrir</string>
     <string name="controls_media_resume">Siguir</string>
     <string name="controls_media_settings_button">Axustes</string>
     <string name="controls_media_seekbar_description"><xliff:g id="elapsed_time" example="1:30">%1$s</xliff:g> de <xliff:g id="total_time" example="3:00">%2$s</xliff:g></string>
+    <string name="controls_media_button_play">Reproducir</string>
+    <string name="controls_media_button_pause">Posar</string>
     <string name="controls_media_smartspace_rec_title">Reproducir</string>
+    <string name="media_transfer_undo">Desfacer</string>
     <string name="controls_error_timeout">Inactivu. Revisa l\'aplicación</string>
     <string name="controls_error_removed">Nun s\'atopó</string>
     <string name="controls_error_removed_title">El control nun ta disponible</string>
@@ -730,8 +692,8 @@
     <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_connect_failed">Nun se pudo conectar. Volvi tentalo.</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>
     <string name="recent_conversations">Conversaciones de recién</string>
@@ -752,4 +714,9 @@
     <string name="mobile_data_connection_active">Conectóse</string>
     <string name="turn_on_wifi">Wi\u2011Fi</string>
     <string name="tap_a_network_to_connect">Toca una rede pa conectate</string>
+    <string name="qs_tile_request_dialog_add">Amestar una caxella</string>
+    <string name="fgs_manager_app_item_stop_button_label">Parar</string>
+    <string name="clipboard_edit_text_done">Fecho</string>
+    <string name="clipboard_overlay_window_name">Cartafueyu</string>
+    <string name="add">Amestar</string>
 </resources>
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 9f76a15..08a223e 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
@@ -18,14 +18,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label">Rhyngwyneb y System</string>
-    <string name="battery_low_title">Gall y batri rhedeg allan yn fuan</string>
+    <string name="battery_low_title">Troi\'r Arbedwr Batri ymlaen?</string>
     <string name="battery_low_percent_format"><xliff:g id="percentage">%s</xliff:g> yn weddill</string>
     <string name="invalid_charger_title">Methu â gwefru trwy USB</string>
     <string name="invalid_charger_text">Defnyddia\'r gwefrydd daeth gyda dy ddyfais</string>
     <string name="battery_saver_confirmation_title">Troi\'r Arbedwr Batri ymlaen?</string>
     <string name="battery_saver_confirmation_title_generic">Ynghylch Arbedwr Batri</string>
     <string name="battery_saver_confirmation_ok">Troi ymlaen</string>
-    <string name="battery_saver_start_action">Troi\'r Arbedwr Batri ymlaen</string>
+    <string name="battery_saver_start_action">Troi ymlaen</string>
+    <string name="battery_saver_dismiss_action">Dim diolch</string>
     <string name="status_bar_settings_auto_rotation">Troi\'r sgrin yn awtomatig</string>
     <string name="usb_device_permission_prompt">Caniatáu <xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g> i gael mynediad at <xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g>?</string>
     <string name="usb_device_permission_prompt_warn">Caniatáu <xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g> i gael mynediad at <xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g>?\nNid yw\'r ap hwn wedi cael caniatâd i recordio ond gallai gipio sain trwy\'r ddyfais USB hon.</string>
@@ -144,10 +145,6 @@
     <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile">Os fyddi wedi rhoi\'r patrwm anghywir ar yr ymgais nesaf, bydd data\'r ddyfais hon yn cael ei dileu.</string>
     <string name="biometric_dialog_last_pin_attempt_before_wipe_profile">Os fyddi wedi rhoi\'r PIN anghywir ar yr ymgais nesaf, bydd data\'r ddyfais hon yn cael ei dileu.</string>
     <string name="biometric_dialog_last_password_attempt_before_wipe_profile">Os fyddi wedi rhoi\'r cyfrinair anghywir ar yr ymgais nesaf, bydd data\'r ddyfais hon yn cael ei dileu.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_device">Bu gormod o ymdrechion anghywir. Bydd data\'r ddyfais hon yn cael ei ddileu.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_user">Bu gormod o ymdrechion anghywir. Bydd y defnyddiwr hwn yn cael ei ddileu.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_profile">Bu gormod o ymdrechion anghywir. Bydd y proffil gwaith hwn yn cael ei ddileu.</string>
-    <string name="biometric_dialog_now_wiping_dialog_dismiss">Diystyru</string>
     <string name="fingerprint_dialog_touch_sensor">Cyffyrdda\'r synhwyrydd ôl bys</string>
     <string name="accessibility_fingerprint_dialog_fingerprint_icon">Eicon ôl bys</string>
     <string name="fingerprint_dialog_use_fingerprint_instead">Methu adnabod wyneb. Defnyddia ôl bys yn lle.</string>
@@ -174,33 +171,15 @@
     <string name="accessibility_desc_lock_screen">Sgrin cloi</string>
     <string name="accessibility_desc_work_lock">Sgrin cloi gwaith</string>
     <string name="accessibility_desc_close">Cau</string>
-    <string name="accessibility_quick_settings_wifi_changed_off">Wi-Fi wedi\'i ddiffodd.</string>
-    <string name="accessibility_quick_settings_wifi_changed_on">Wi-Fi ymlaen.</string>
-    <string name="accessibility_quick_settings_airplane_changed_off">Modd awyren wedi\'i ddiffodd.</string>
-    <string name="accessibility_quick_settings_airplane_changed_on">Modd awyren ymlaen.</string>
     <string name="accessibility_quick_settings_dnd_none_on">distawrwydd llwyr</string>
     <string name="accessibility_quick_settings_dnd_alarms_on">larymau yn unig</string>
     <string name="accessibility_quick_settings_dnd">Dim Tarfu.</string>
-    <string name="accessibility_quick_settings_dnd_changed_off">Dim Tarfu wedi\'i ddiffodd.</string>
-    <string name="accessibility_quick_settings_dnd_changed_on">Dim Tarfu wedi\'i droi ymlaen.</string>
     <string name="accessibility_quick_settings_bluetooth">Bluetooth</string>
     <string name="accessibility_quick_settings_bluetooth_on">Bluetooth ymlaen.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_off">Bluetooth wedi\'i ddiffodd.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_on">Bluetooth wedi\'i droi ymlaen.</string>
-    <string name="accessibility_quick_settings_location_changed_off">Ni fydd adroddiadau yn cynnwys manylion lleoliad y ddyfais.</string>
-    <string name="accessibility_quick_settings_location_changed_on">Bydd adroddiadau yn cynnwys lleoliad y ddyfais.</string>
     <string name="accessibility_quick_settings_alarm">Larwm wedi\'i osod ar gyfer <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_more_time">Rhagor o amser.</string>
     <string name="accessibility_quick_settings_less_time">Llai o amser.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_off">Fflacholau wedi\'i ddiffodd.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_on">Fflacholau wedi\'i droi ymlaen.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_off">Mae gwrthdroad lliwiau i ffwrdd.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_on">Mae gwrthdroad lliwiau ymlaen.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_off">Mae\'r llecyn symudol wedi\'i droi ffwrdd.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_on">Mae\'r llecyn symudol wedi\'i droi ymlaen.</string>
     <string name="accessibility_casting_turned_off">Mae bwrw\'r sgrin wedi stopio.</string>
-    <string name="accessibility_quick_settings_data_saver_changed_off">Diffoddwyd Arbedwr Data.</string>
-    <string name="accessibility_quick_settings_data_saver_changed_on">Rhoddwyd Arbedwr Data ar waith.</string>
     <string name="accessibility_brightness">Disgleirdeb y dangosydd</string>
     <string name="data_usage_disabled_dialog_mobile_title">Mae data symudol wedi\'i atal</string>
     <string name="data_usage_disabled_dialog_title">Mae data wedi\'i atal</string>
@@ -254,7 +233,6 @@
     <string name="quick_settings_cast_no_wifi">Wi\u2011Fi heb gysylltu</string>
     <string name="quick_settings_brightness_dialog_title">Disgleirdeb</string>
     <string name="quick_settings_inversion_label">Gwrthdroad lliwiau</string>
-    <string name="quick_settings_more_settings">Rhagor o osodiadau</string>
     <string name="quick_settings_more_user_settings">Gosodiadau defnyddiwr</string>
     <string name="quick_settings_done">Cwblhau</string>
     <string name="quick_settings_close_user_panel">Cau</string>
@@ -315,7 +293,12 @@
     <string name="notification_tap_again">Tapia eto i agor</string>
     <string name="tap_again">Tapia eto</string>
     <string name="keyguard_unlock">Llusga i fyny i agor</string>
-    <string name="keyguard_unlock_press">Pwysa i\'w agor</string>
+    <string-array name="udfps_accessibility_touch_hints">
+        <item>Symud i\'r chwith</item>
+        <item>Symud i lawr</item>
+        <item>Symud i\'r dde</item>
+        <item>Symud i fyny</item>
+    </string-array>
     <string name="keyguard_retry">Llusga i fyny i geisio eto</string>
     <string name="require_unlock_for_nfc">Datgloi i ddefnyddio NFC</string>
     <string name="do_disclosure_generic">Mae\'r ddyfais hon yn perthyn i dy sefydliad</string>
@@ -336,17 +319,11 @@
     <string name="keyguard_indication_charging_time_fast"><xliff:g id="percentage">%2$s</xliff:g> • Yn gwefru\'n gyflym • Yn llawn mewn <xliff:g id="charging_time_left" example="4 hr, 2 min">%1$s</xliff:g></string>
     <string name="keyguard_indication_charging_time_slowly"><xliff:g id="percentage">%2$s</xliff:g> • Yn gwefru\'n araf • Yn llawn mewn <xliff:g id="charging_time_left" example="4 hr, 2 min">%1$s</xliff:g></string>
     <string name="accessibility_multi_user_switch_switcher">Newid defnyddiwr</string>
-    <string name="user_add_user">Ychwanegu defnyddiwr</string>
-    <string name="user_new_user_name">Defnyddiwr newydd</string>
-    <string name="guest_exit_guest_dialog_title">Tynnu\'r gwestai?</string>
     <string name="guest_exit_guest_dialog_message">Caiff holl apiau a data\'r sesiwn hon eu dileu.</string>
-    <string name="guest_exit_guest_dialog_remove">Tynnu</string>
     <string name="guest_wipe_session_title">Croeso nôl, gwestai!</string>
     <string name="guest_wipe_session_message">Wyt ti am barhau gyda dy sesiwn?</string>
     <string name="guest_wipe_session_wipe">Dechrau eto</string>
     <string name="guest_wipe_session_dontwipe">Ydw, parhau</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">Ychwanegu defnyddiwr newydd?</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">Pan fydd defnyddiwr newydd yn cael ei ychwanegu, bydd angen i\'r person hwnnw osod ei ofod.\n\nGall unrhyw ddefnyddiwr ddiweddaru apiau ar gyfer pob defnyddiwr arall. </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>
@@ -378,20 +355,12 @@
     <string name="quick_settings_disclosure_management_monitoring">Dy sefydliad di sydd berchen y ddyfais hon ac efallai y bydd yn monitro traffig rhwydwaith</string>
     <string name="quick_settings_disclosure_named_management_monitoring"><xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> sydd berchen y ddyfais hon a gall fonitro traffig rhwydwaith</string>
     <string name="quick_settings_financed_disclosure_named_management">Darperir y ddyfais hon gan <xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g></string>
-    <string name="quick_settings_disclosure_management_named_vpn">Mae\'r ddyfais hon yn perthyn i dy sefydliad ac mae wedi\'i chysylltu â  <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_named_management_named_vpn">Mae\'r ddyfais hon yn perthyn i <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> ac mae wedi\'i chysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%2$s</xliff:g></string>
     <string name="quick_settings_disclosure_management">Mae\'r ddyfais hon yn perthyn i dy sefydliad</string>
     <string name="quick_settings_disclosure_named_management">Mae\'r ddyfais hon yn perthyn i <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_management_vpns">Mae\'r ddyfais hon yn perthyn i dy sefydliad ac mae wedi\'i chysylltu â VPN</string>
-    <string name="quick_settings_disclosure_named_management_vpns">Mae\'r ddyfais hon yn perthyn i <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> ac mae wedi\'i chysylltu â VPN</string>
     <string name="quick_settings_disclosure_managed_profile_monitoring">Gall dy sefydliad fonitro traffig rhwydwaith yn dy broffil gwaith</string>
     <string name="quick_settings_disclosure_named_managed_profile_monitoring">Gall <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> fonitro traffig rhwydwaith yn dy broffil gwaith</string>
     <string name="quick_settings_disclosure_managed_profile_network_activity">Mae gweithgaredd rhwydwaith y proffil gwaith yn weladwy i dy weinyddwr TG</string>
     <string name="quick_settings_disclosure_monitoring">Mae\'n bosib caiff y rhwydwaith ei fonitro</string>
-    <string name="quick_settings_disclosure_vpns">Mae\'r ddyfais hon wedi\'i chysylltu â VPN</string>
-    <string name="quick_settings_disclosure_managed_profile_named_vpn">Mae dy broffil gwaith wedi\'i gysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_personal_profile_named_vpn">Mae dy broffil personol wedi\'i gysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_named_vpn">Mae\'r ddyfais hon wedi\'i chysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
     <string name="monitoring_title_financed_device">Darperir y ddyfais hon gan <xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g></string>
     <string name="monitoring_title_device_owned">Rheolaeth dyfais</string>
     <string name="monitoring_subtitle_vpn">VPN</string>
@@ -407,10 +376,6 @@
     <string name="monitoring_description_ca_certificate">Mae awdurdod tystysgrif wedi ei osod ar y ddyfais hon. Gall fod dy draffig rhwydwaith diogel yn cael ei fonitro neu ei addasu.</string>
     <string name="monitoring_description_management_network_logging">Mae dy weinyddwr wedi rhoi logio rhwydwaith ar waith. Mae hyn yn monitro traffig ar dy ddyfais.</string>
     <string name="monitoring_description_managed_profile_network_logging">Mae dy weinyddwr wedi troi logio rhwydwaith ymlaen, sy\'n monitro traffig yn dy broffil gwaith ond nid yn dy broffil personol.</string>
-    <string name="monitoring_description_named_vpn">Rwyt wedi cysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> ac mae\'n medru monitro gweithgareddau dy rwydwaith, gan gynnwys e-bost, apiau a gwefannau.</string>
-    <string name="monitoring_description_two_named_vpns">Rwyt wedi cysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> a <xliff:g id="vpn_app" example="Bar VPN App">%2$s</xliff:g>, ac maen nhw\'n medru monitro gweithgareddau dy rwydwaith, gan gynnwys e-bost, apiau a gwefannau.</string>
-    <string name="monitoring_description_managed_profile_named_vpn">Mae dy broffil gwaith wedi cysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> ac mae\'n medru monitro gweithgareddau dy rwydwaith, gan gynnwys e-bost, apiau a gwefannau.</string>
-    <string name="monitoring_description_personal_profile_named_vpn">Mae dy broffil personol wedi cysylltu â <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> ac mae\'n medru monitro gweithgareddau dy rwydwaith, gan gynnwys e-bost, apiau a gwefannau.</string>
     <string name="monitoring_description_vpn_settings">Agor gosodiadau VPN</string>
     <string name="monitoring_description_parental_controls">Rheolir y ddyfais hon gan dy riant. Gall dy riant weld a rheoli gwybodaeth fel yr apiau rwyt yn eu defnyddio, dy leoliad, a dy amser yn defnyddio\'r ddyfais.</string>
     <string name="legacy_vpn_name">VPN</string>
@@ -472,7 +437,6 @@
     <string name="wallet_title">Waled</string>
     <string name="wallet_empty_state_label">Gosoda nawr i wneud taliadau mwy cyflym a diogel gyda dy ffôn</string>
     <string name="wallet_app_button_label">Dangos y cwbl</string>
-    <string name="wallet_secondary_label_no_card">Ychwanegu cerdyn</string>
     <string name="wallet_secondary_label_updating">Yn diweddaru</string>
     <string name="wallet_secondary_label_device_locked">Datgloi i\'w ddefnyddio</string>
     <string name="wallet_error_generic">Roedd problem yn cael dy gardiau. Rho gynnig arall arni\'n hwyrach.</string>
@@ -483,7 +447,6 @@
     <string name="zen_alarm_warning">Ni fyddi\'n clywed dy larwm nesaf tan <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string>
     <string name="alarm_template">am <xliff:g id="when" example="7:00 AM">%1$s</xliff:g></string>
     <string name="alarm_template_far">am <xliff:g id="when" example="Gwener 7:00 AM">%1$s</xliff:g></string>
-    <string name="accessibility_quick_settings_detail">Gosodiadau cyflym, <xliff:g id="title" example="Wi-Fi">%s </xliff:g>.</string>
     <string name="accessibility_status_bar_hotspot">Llecyn Wi-Fi</string>
     <string name="accessibility_managed_profile">Proffil gwaith</string>
     <string name="tuner_warning_title">Yn hwyl i rai ond nid i bawb</string>
@@ -693,7 +656,6 @@
     <string name="accessibility_quick_settings_user">Wedi mewngofnodi fel <xliff:g name="user" example="John">%s</xliff:g></string>
     <string name="accessibility_quick_settings_choose_user_action">dewisa ddefnyddiwr</string>
     <string name="data_connection_no_internet">Dim rhyngrwyd</string>
-    <string name="accessibility_quick_settings_open_details">Agor manylion</string>
     <string name="accessibility_quick_settings_open_settings">Agor gosodiadau <xliff:g name="page" example="Bluetooth">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_edit">Golygu trefn y gosodiadau</string>
     <string name="accessibility_quick_settings_power_menu">Dewislen pŵer</string>
@@ -825,6 +787,7 @@
     <string name="controls_dialog_ok">Ychwanegu</string>
     <string name="controls_dialog_message">Awgrymwyd gan <xliff:g id="app" example="System UI">%s</xliff:g></string>
     <string name="controls_tile_locked">Dyfais dan glo</string>
+    <string name="controls_settings_dialog_neutral_button">Dim diolch</string>
     <string name="controls_pin_use_alphanumeric">Mae\'r PIN yn cynnwys llythrennau neu symbolau</string>
     <string name="controls_pin_verify">Gwiria <xliff:g id="device" example="Backdoor lock">%s</xliff:g></string>
     <string name="controls_pin_wrong">PIN anghywir</string>
@@ -834,17 +797,19 @@
     <string name="controls_structure_tooltip">Llusgo i weld mwy</string>
     <string name="controls_seeding_in_progress">Argymhellion llwytho</string>
     <string name="controls_media_title">Cyfryngau</string>
-    <string name="controls_media_close_session">Cuddio\'r sesiwn cyfryngau hon?</string>
     <string name="controls_media_active_session">Ni ellir cuddio\'r sesiwn cyfryngau cyfredol.</string>
-    <string name="controls_media_dismiss_button">Diystyru</string>
+    <string name="controls_media_dismiss_button">Cuddio</string>
     <string name="controls_media_resume">Parhau</string>
     <string name="controls_media_settings_button">Gosodiadau</string>
     <string name="controls_media_playing_item_description">Mae <xliff:g id="song_name" example="Daily mix">%1$s</xliff:g> gan <xliff:g id="artist_name" example="Various artists">%2$s</xliff:g> yn chwarae o <xliff:g id="app_label" example="Spotify">%3$s</xliff:g></string>
     <string name="controls_media_seekbar_description"><xliff:g id="elapsed_time" example="1:30">%1$s</xliff:g> o <xliff:g id="total_time" example="3:00">%2$s</xliff:g></string>
+    <string name="controls_media_button_play">Chwarae</string>
+    <string name="controls_media_button_pause">Seibio</string>
     <string name="controls_media_smartspace_rec_title">Chwarae</string>
     <string name="controls_media_smartspace_rec_description">Agor <xliff:g id="app_label" example="Spotify">%1$s</xliff:g></string>
     <string name="controls_media_smartspace_rec_item_description">Chwarae <xliff:g id="song_name" example="Daily mix">%1$s</xliff:g> gan <xliff:g id="artist_name" example="Various artists">%2$s</xliff:g> o <xliff:g id="app_label" example="Spotify">%3$s</xliff:g></string>
     <string name="controls_media_smartspace_rec_item_no_artist_description">Chwarae <xliff:g id="song_name" example="Daily mix">%1$s</xliff:g> o <xliff:g id="app_label" example="Spotify">%2$s</xliff:g></string>
+    <string name="media_transfer_undo">Dad-wneud</string>
     <string name="controls_error_timeout">Anactif, gwiria\'r ap</string>
     <string name="controls_error_removed">Heb ganfod</string>
     <string name="controls_error_removed_title">Nid yw\'r rheolydd ar gael</string>
@@ -859,8 +824,8 @@
     <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_connect_failed">Methwyd â chysylltu. Ceisia eto.</string>
     <string name="media_output_dialog_pairing_new">Paru â dyfais newydd</string>
+    <string name="media_output_broadcast_dialog_save">Cadw</string>
     <string name="build_number_clip_data_label">Rhif adeiledd</string>
     <string name="build_number_copy_toast">Wedi copïo rhif adeiledd i\'r clipfwrdd.</string>
     <string name="basic_status">Agor sgwrs</string>
@@ -925,5 +890,11 @@
     <string name="to_switch_networks_disconnect_ethernet">I newid rhwydwaith, datgysyllta ether-rwyd</string>
     <string name="wifi_scan_notify_message">I wella profiad gyda\'r ddyfais, gall apiau a gwasanaethau dal i sganio am rwydweithiau Wi\u2011Fi unrhyw bryd, hyd yn oed pan fo Wi\u2011Fi i ffwrdd. Gellir newid hyn yng ngosodiadau sganio am Wi\u2011Fi. <annotation id="link">Newid</annotation></string>
     <string name="turn_off_airplane_mode">Troi modd awyren i ffwrdd</string>
+    <string name="qs_tile_request_dialog_add">Ychwanegu teilsen</string>
     <string name="qs_user_switch_dialog_title">Dewis defnyddiwr</string>
+    <string name="fgs_manager_app_item_stop_button_label">Stopio</string>
+    <string name="clipboard_edit_text_done">Cwblhau</string>
+    <string name="clipboard_text_hidden">Tapia i weld</string>
+    <string name="clipboard_overlay_window_name">Clipfwrdd</string>
+    <string name="add">Ychwanegu</string>
 </resources>
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 3d5068a..694bdce 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml
@@ -24,8 +24,6 @@
     <string name="quick_settings_location_label">Loko</string>
     <string name="quick_settings_user_title">Uzanto</string>
     <string name="quick_settings_close_user_panel">Fermi</string>
-    <string name="user_new_user_name">Nova uzanto</string>
-    <string name="guest_exit_guest_dialog_remove">Forigi</string>
     <string name="user_remove_user_remove">Forigi</string>
     <string name="notification_section_header_alerting">Sciigoj</string>
     <string name="status_bar_airplane">Aviadila reĝimo</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 9f4fa07..7fdf37f 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml
@@ -18,14 +18,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label">Eadar-aghaidh an t-siostaim</string>
-    <string name="battery_low_title">Dh’fhaoidte gum bi am bataraidh falamh a dh’aithghearr</string>
+    <string name="battery_low_title">A bheil tu airson caomhnaiche a’ bhataraidh a chur air?</string>
     <string name="battery_low_percent_format"><xliff:g id="percentage">%s</xliff:g> air fhàgail</string>
     <string name="invalid_charger_title">Chan urrainn dhuinn a theàirrdseadh slighe USB.</string>
     <string name="invalid_charger_text">Cleachd an teàirrdsear a thàinig an cois an uidheim agad.</string>
     <string name="battery_saver_confirmation_title">A bheil tu airson caomhnaiche a’ bhataraidh a chur air?</string>
     <string name="battery_saver_confirmation_title_generic">Mu chaomhnaiche a’ bhataraidh</string>
     <string name="battery_saver_confirmation_ok">Cuir air</string>
-    <string name="battery_saver_start_action">Cuir air caomhnaiche a’ bhataraidh</string>
+    <string name="battery_saver_start_action">Cuir air</string>
+    <string name="battery_saver_dismiss_action">Cha chuir mi seo an comas</string>
     <string name="status_bar_settings_auto_rotation">Cuairtich an sgrìn gu fèin-obrachail</string>
     <string name="usb_device_permission_prompt">Am faod <xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g> <xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g> inntrigeadh?</string>
     <string name="usb_device_permission_prompt_warn">Am faod <xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g> <xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g> inntrigeadh?\nCha d’ fhuair an aplacaid seo cead clàraidh ach b’ urrainn dhi fuaim a ghlacadh leis an uidheam USB seo.</string>
@@ -128,10 +129,6 @@
     <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile">Ma chuireas tu a-steach pàtran ceàrr a-rithist, thèid pròifil na h-obrach agad ’s an dàta aice a sguabadh às.</string>
     <string name="biometric_dialog_last_pin_attempt_before_wipe_profile">Ma chuireas tu a-steach PIN ceàrr a-rithist, thèid pròifil na h-obrach agad ’s an dàta aice a sguabadh às.</string>
     <string name="biometric_dialog_last_password_attempt_before_wipe_profile">Ma chuireas tu a-steach facal-faire ceàrr a-rithist, thèid pròifil na h-obrach agad ’s an dàta aice a sguabadh às.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_device">Chaidh cus oidhirpean cearra a dhèanamh. Thèid dàta an uidheim seo a sguabadh às.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_user">Chaidh cus oidhirpean cearra a dhèanamh. Thèid an cleachdaiche seo a sguabadh às.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_profile">Chaidh cus oidhirpean cearra a dhèanamh. Thèid pròifil na h-obrach seo ’s an dàta aice a sguabadh às.</string>
-    <string name="biometric_dialog_now_wiping_dialog_dismiss">Leig seachad</string>
     <string name="fingerprint_dialog_touch_sensor">Suath ri mothaichear nan lorgan-meòir</string>
     <string name="accessibility_fingerprint_dialog_fingerprint_icon">Ìomhaigheag na luirge-meòir</string>
     <string name="accessibility_bluetooth_connected">Chaidh Bluetooth a cheangal.</string>
@@ -156,33 +153,15 @@
     <string name="accessibility_desc_lock_screen">An sgrìn-ghlasaidh.</string>
     <string name="accessibility_desc_work_lock">Sgrìn-ghlasaidh na h-obrach</string>
     <string name="accessibility_desc_close">Dùin</string>
-    <string name="accessibility_quick_settings_wifi_changed_off">Tha WiFi dheth.</string>
-    <string name="accessibility_quick_settings_wifi_changed_on">Tha WiFi air.</string>
-    <string name="accessibility_quick_settings_airplane_changed_off">Chaidh am modh itealain a chur dheth.</string>
-    <string name="accessibility_quick_settings_airplane_changed_on">Chaidh am modh itealain a chur air.</string>
     <string name="accessibility_quick_settings_dnd_none_on">tost slàn</string>
     <string name="accessibility_quick_settings_dnd_alarms_on">caismeachdan a-mhàin</string>
     <string name="accessibility_quick_settings_dnd">Na bris a-steach orm.</string>
-    <string name="accessibility_quick_settings_dnd_changed_off">Chaidh “Na bris a-steach orm” a chur dheth.</string>
-    <string name="accessibility_quick_settings_dnd_changed_on">Chaidh “Na bris a-steach orm” a chur air.</string>
     <string name="accessibility_quick_settings_bluetooth">Bluetooth.</string>
     <string name="accessibility_quick_settings_bluetooth_on">Tha Bluetooth air.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_off">Chaidh Bluetooth a chur dheth.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_on">Chaidh Bluetooth a chur air.</string>
-    <string name="accessibility_quick_settings_location_changed_off">Chaidh aithriseadh an ionaid a chur dheth.</string>
-    <string name="accessibility_quick_settings_location_changed_on">Chaidh aithriseadh an ionaid a chur air.</string>
     <string name="accessibility_quick_settings_alarm">Chaidh caismeachd a shuidheachadh air <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_more_time">Barrachd ùine.</string>
     <string name="accessibility_quick_settings_less_time">Nas lugha de dh’ùine.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_off">Chaidh an leus  a chur dheth.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_on">Chaidh an leus a chur air.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_off">Chaidh ais-thionndadh nan dathan a chur dheth.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_on">Chaidh ais-thionndadh nan dathan a chur air.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_off">Chaidh am mobile hotspot a chur dheth.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_on">Chaidh am mobile hotspot a chur air.</string>
     <string name="accessibility_casting_turned_off">Chaidh stad a chur air tilgeil na sgrìn.</string>
-    <string name="accessibility_quick_settings_data_saver_changed_off">Chaidh caomhnaiche an dàta a chur dheth.</string>
-    <string name="accessibility_quick_settings_data_saver_changed_on">Chaidh caomhnaiche an dàta a chur air.</string>
     <string name="accessibility_brightness">Soilleireachd na sgrìn</string>
     <string name="data_usage_disabled_dialog_mobile_title">Chaidh an dàta mobile a chur ’na stad</string>
     <string name="data_usage_disabled_dialog_title">Chaidh an dàta a chur ’na stad</string>
@@ -226,7 +205,6 @@
     <string name="quick_settings_cast_detail_empty_text">Chan eil uidheam ri làimh</string>
     <string name="quick_settings_cast_no_wifi">Cha deach WiFi a cheangal</string>
     <string name="quick_settings_brightness_dialog_title">Soilleireachd</string>
-    <string name="quick_settings_more_settings">Barrachd roghainnean</string>
     <string name="quick_settings_done">Deiseil</string>
     <string name="quick_settings_close_user_panel">Dùin</string>
     <string name="quick_settings_connected">Ceangailte</string>
@@ -288,17 +266,11 @@
     <string name="interruption_level_priority_twoline">Le prìomhachas\na-mhàin</string>
     <string name="interruption_level_alarms_twoline">Caismeachdan\na-mhàin</string>
     <string name="accessibility_multi_user_switch_switcher">Geàrr leum gu cleachdaiche eile</string>
-    <string name="user_add_user">Cuir cleachdaiche ris</string>
-    <string name="user_new_user_name">Cleachdaiche ùr</string>
-    <string name="guest_exit_guest_dialog_title">An doir thu an t-aoigh air falbh?</string>
     <string name="guest_exit_guest_dialog_message">Thèid a h-uile aplacaid is dàta san t-seisean seo a sguabadh às.</string>
-    <string name="guest_exit_guest_dialog_remove">Thoir air falbh</string>
     <string name="guest_wipe_session_title">Fàilte air ais, aoigh!</string>
     <string name="guest_wipe_session_message">An lean thu air an t-seisean agad?</string>
     <string name="guest_wipe_session_wipe">Tòisich às ùr</string>
     <string name="guest_wipe_session_dontwipe">Leanaidh</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">An cuir thu cleachdaiche ùr ris?</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">Nuair a chuireas tu cleachdaiche ùr ris, feumaidh an neach sin an rùm aca a shuidheachadh\n\n’S urrainn do chleachdaiche sam bith na h-aplacaidean ùrachadh airson a h-uile cleachdaiche eile. </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>
@@ -326,19 +298,11 @@
     <string name="empty_shade_text">Gun bhrath</string>
     <string name="quick_settings_disclosure_management_monitoring">’S ann leis a’ bhuidheann agad a tha an t-uidheam seo agus faodaidh iad sùil a chumail air trafaig an lìonraidh</string>
     <string name="quick_settings_disclosure_named_management_monitoring">’S ann le <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> a tha an t-uidheam seo agus faodaidh iad sùil a chumail air trafaig an lìonraidh</string>
-    <string name="quick_settings_disclosure_management_named_vpn">’S ann leis a’ buidheann agad a tha an t-uidheam seo agus tha e ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_named_management_named_vpn">’S ann le &lt;xliff:g id="organization_name" example="Foo, Inc."&gt;%1$s a tha an t-uidheam seo agus tha e ceangailte ri &lt;xliff:g id="vpn_app" example="Foo VPN App"&gt;%2$s&lt;/xliff:g&gt;</string>
     <string name="quick_settings_disclosure_management">’S ann leis a’ buidheann agad a tha an t-uidheam seo</string>
     <string name="quick_settings_disclosure_named_management">Tha an t-uidheam seo le <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_management_vpns">’S ann leis a’ buidheann agad a tha an t-uidheam seo agus tha e ceangailte ri VPN</string>
-    <string name="quick_settings_disclosure_named_management_vpns">’S ann le <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> a tha an t-uidheam seo agus tha e ceangailte ri VPN</string>
     <string name="quick_settings_disclosure_managed_profile_monitoring">Faodaidh am buidheann agad sùil a chumail air trafaig an lìonraidh ann am pròifil na h-obrach agad</string>
     <string name="quick_settings_disclosure_named_managed_profile_monitoring">Faodaidh <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> sùil a chumail air trafaig an lìonraidh ann am pròifil na h-obrach agad</string>
     <string name="quick_settings_disclosure_monitoring">Dh’fhaoidte gun cumar sùil air an lìonra</string>
-    <string name="quick_settings_disclosure_vpns">Tha an t-uidheam seo ceangailte ri VPN</string>
-    <string name="quick_settings_disclosure_managed_profile_named_vpn">Tha pròifil na h-obrach agad ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_personal_profile_named_vpn">Tha a’ phròifil phearsanta agad ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_named_vpn">Tha an t-uidheam seo ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
     <string name="monitoring_title_device_owned">Stiùireadh uidheaman</string>
     <string name="monitoring_subtitle_vpn">VPN</string>
     <string name="monitoring_subtitle_network_logging">Logadh lìonraidh</string>
@@ -350,10 +314,6 @@
     <string name="monitoring_description_managed_profile_ca_certificate">Stàlaich am buidheann agad ùghdarras theisteanasan ann am pròifil na h-obrach agad. Dh’fhaoidte gun cùm iad sùil air trafaig thèarainte an lìonraidh agad no gun atharraich iad i.</string>
     <string name="monitoring_description_ca_certificate">Chaidh ùghdarras theisteanasan a stàladh air an uidheam seo. Dh’fhaoidte gun cumar sùil air trafaig thèarainte an lìonraidh agad no gun dèid a h-atharrachadh.</string>
     <string name="monitoring_description_management_network_logging">Chuir an rianaire agad logadh lìonraidh an comas agus cumaidh sin sùil air trafaig an uidheim agad.</string>
-    <string name="monitoring_description_named_vpn">Tha thu ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> a dh’fhaodas sùil a chumail air a’ ghnìomhachd lìonraidh agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn.</string>
-    <string name="monitoring_description_two_named_vpns">Tha thu ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> agus <xliff:g id="vpn_app" example="Bar VPN App">%2$s</xliff:g> a dh’fhaodas sùil a chumail air a’ ghnìomhachd lìonraidh agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn.</string>
-    <string name="monitoring_description_managed_profile_named_vpn">Tha pròifil na h-obrach agad ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> a dh’fhaodas sùil a chumail air a’ ghnìomhachd lìonraidh agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn.</string>
-    <string name="monitoring_description_personal_profile_named_vpn">Tha a’ phròifil phearsanta agad ceangailte ri <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g> a dh’fhaodas sùil a chumail air a’ ghnìomhachd lìonraidh agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn.</string>
     <string name="monitoring_description_vpn_settings">Fosgail roghainnean a’ VPN</string>
     <string name="legacy_vpn_name">VPN</string>
     <string name="keyguard_indication_trust_unlocked">’Ga chumail fosgailte le àidseant earbsa</string>
@@ -416,7 +376,6 @@
     <string name="zen_alarm_warning">Cha chluinn thu an ath-chaismeachd agad aig <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string>
     <string name="alarm_template">aig <xliff:g id="when" example="7:00 AM">%1$s</xliff:g></string>
     <string name="alarm_template_far"><xliff:g id="when" example="Fri 7:00 AM">%1$s</xliff:g></string>
-    <string name="accessibility_quick_settings_detail">Grad-roghainnean, <xliff:g id="title" example="Wi-Fi">%s</xliff:g>.</string>
     <string name="accessibility_status_bar_hotspot">Hotspot</string>
     <string name="accessibility_managed_profile">Pròifil na h-obrach</string>
     <string name="tuner_warning_title">Chan eil seo tlachdmhor ach do chuid</string>
@@ -601,7 +560,6 @@
     <string name="accessibility_quick_settings_collapse">Dùin na grad-roghainnean.</string>
     <string name="accessibility_quick_settings_user">Chlàraich thu a-steach mar <xliff:g name="user" example="John">%s</xliff:g></string>
     <string name="data_connection_no_internet">Gun eadar-lìon</string>
-    <string name="accessibility_quick_settings_open_details">Fosgail am mion-fhiosrachadh.</string>
     <string name="accessibility_quick_settings_open_settings">Fosgail roghainnean <xliff:g name="page" example="Bluetooth">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_edit">Deasaich òrdugh nan roghainnean.</string>
     <string name="accessibility_quick_settings_page">Duilleag <xliff:g name="current_page" example="1">%1$d</xliff:g> à <xliff:g name="num_pages" example="2">%2$d</xliff:g></string>
@@ -709,6 +667,7 @@
     <string name="controls_dialog_title">Cuir ri uidheaman-smachd do dh’uidheaman</string>
     <string name="controls_dialog_ok">Cuir ris</string>
     <string name="controls_dialog_message">’Ga mholadh le <xliff:g id="app" example="System UI">%s</xliff:g></string>
+    <string name="controls_settings_dialog_neutral_button">Cha chuir mi seo an comas</string>
     <string name="controls_pin_use_alphanumeric">Tha litrichean no samhlaidhean sa PIN</string>
     <string name="controls_pin_verify">Dearbh <xliff:g id="device" example="Backdoor lock">%s</xliff:g></string>
     <string name="controls_pin_wrong">PIN ceàrr</string>
@@ -718,10 +677,13 @@
     <string name="controls_structure_tooltip">Grad-shlaighd barrachd fhaicinn</string>
     <string name="controls_seeding_in_progress">A’ luchdadh nam molaidhean</string>
     <string name="controls_media_title">Meadhanan</string>
-    <string name="controls_media_dismiss_button">Leig seachad</string>
+    <string name="controls_media_dismiss_button">Cuir am falach</string>
     <string name="controls_media_resume">Lean air</string>
     <string name="controls_media_settings_button">Roghainnean</string>
+    <string name="controls_media_button_play">Cluich</string>
+    <string name="controls_media_button_pause">Cuir ’na stad</string>
     <string name="controls_media_smartspace_rec_title">Cluich</string>
+    <string name="media_transfer_undo">Neo-dhèan</string>
     <string name="controls_error_timeout">Neo-ghnìomhach, thoir sùil air an aplacaid</string>
     <string name="controls_error_removed">Cha deach a lorg</string>
     <string name="controls_error_removed_title">Chan eil an t-uidheam-smachd ri fhaighinn</string>
@@ -735,10 +697,15 @@
     <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_connect_failed">Cha deach leis a’ cheangal. Feuch ris a-rithist.</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>
     <string name="mobile_data_settings_title">Dàta mobile</string>
     <string name="mobile_data_connection_active">Ceangailte</string>
+    <string name="qs_tile_request_dialog_add">Cuir leacag ris</string>
+    <string name="fgs_manager_app_item_stop_button_label">Cuir stad air</string>
+    <string name="clipboard_edit_text_done">Deiseil</string>
+    <string name="clipboard_overlay_window_name">Stòr-bhòrd</string>
+    <string name="add">Cuir ris</string>
 </resources>
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 bd3cc9a..7d2922a 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
@@ -20,6 +20,8 @@
     <string name="app_label">Anagarw UI</string>
     <string name="battery_low_percent_format"><xliff:g id="percentage">%s</xliff:g> i d-yeqqimen</string>
     <string name="battery_saver_confirmation_ok">Rmed</string>
+    <string name="battery_saver_start_action">Rmed</string>
+    <string name="battery_saver_dismiss_action">Uhu tannemmit</string>
     <string name="label_view">Wali</string>
     <string name="usb_debugging_allow">Sireg</string>
     <string name="wifi_debugging_allow">Sireg</string>
@@ -47,7 +49,6 @@
     <string name="biometric_dialog_try_again">Ɛṛeḍ tikelt nniḍen</string>
     <string name="biometric_dialog_face_icon_description_idle">Ttxilek ɛreḍ tikkelt nniḍen</string>
     <string name="biometric_dialog_face_icon_description_confirmed">Yettwasentem</string>
-    <string name="biometric_dialog_now_wiping_dialog_dismiss">Suref</string>
     <string name="accessibility_bluetooth_connected">Bluetooth iqqen.</string>
     <string name="accessibility_not_connected">Ur iqqin ara.</string>
     <string name="data_connection_roaming">Ambiwel</string>
@@ -56,11 +57,7 @@
     <string name="accessibility_desc_quick_settings">Iɣewwaṛen iruraden.</string>
     <string name="accessibility_desc_lock_screen">Agdil usewḥel.</string>
     <string name="accessibility_desc_close">Mdel</string>
-    <string name="accessibility_quick_settings_wifi_changed_off">Wifi yensa.</string>
-    <string name="accessibility_quick_settings_wifi_changed_on">Wifi irmed.</string>
     <string name="accessibility_quick_settings_bluetooth_on">Bluetooth irmed.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_off">Bluetooth yensa.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_on">Bluetooth irmed.</string>
     <string name="accessibility_quick_settings_more_time">Ugar n wakud.</string>
     <string name="data_usage_disabled_dialog_enable">Kemmel</string>
     <string name="quick_settings_bluetooth_secondary_label_audio">Imesli</string>
@@ -70,7 +67,6 @@
     <string name="quick_settings_user_title">Aseqdac</string>
     <string name="quick_settings_cast_device_default_name">Ibenk war isem</string>
     <string name="quick_settings_brightness_dialog_title">Abruṛeq</string>
-    <string name="quick_settings_more_settings">Iγewwaṛen nniḍen</string>
     <string name="quick_settings_done">Immed</string>
     <string name="quick_settings_close_user_panel">Mdel</string>
     <string name="quick_settings_connected">Iqqen</string>
@@ -85,8 +81,6 @@
     <string name="interruption_level_priority">Tazwart kan</string>
     <string name="interruption_level_alarms">Aṭenṭen kan</string>
     <string name="accessibility_multi_user_switch_switcher">Beddel aseqdac</string>
-    <string name="user_add_user">Rnu aseqdac</string>
-    <string name="guest_exit_guest_dialog_remove">Kkes</string>
     <string name="guest_wipe_session_wipe">Ales tanekra</string>
     <string name="user_remove_user_remove">Kkes</string>
     <string name="clear_all_notifications_text">Sfeḍ akk</string>
@@ -214,10 +208,18 @@
     <string name="privacy_type_microphone">Asawaḍ</string>
     <string name="music_controls_no_title">Ulac azwel</string>
     <string name="controls_favorite_other_zone_header">Wayeḍ</string>
-    <string name="controls_media_dismiss_button">Suref</string>
+    <string name="controls_settings_dialog_neutral_button">Uhu tannemmit</string>
+    <string name="controls_media_dismiss_button">Ffer</string>
     <string name="controls_media_resume">Kemmel</string>
     <string name="controls_media_settings_button">Iɣewwaṛen</string>
+    <string name="controls_media_button_play">Urar</string>
+    <string name="controls_media_button_pause">Steɛfu</string>
     <string name="controls_media_smartspace_rec_title">Urar</string>
+    <string name="media_transfer_undo">Err-d</string>
+    <string name="media_output_broadcast_dialog_save">Sekles</string>
     <string name="mobile_data_settings_title">Isefka izirazen</string>
     <string name="mobile_data_connection_active">Iqqen</string>
+    <string name="fgs_manager_app_item_stop_button_label">Seḥbes</string>
+    <string name="clipboard_edit_text_done">Immed</string>
+    <string name="clipboard_overlay_window_name">Ɣef afus</string>
 </resources>
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 0c2e2f4..e1be58e 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml
@@ -19,6 +19,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label">سیستەم UI</string>
     <string name="battery_saver_confirmation_ok">کردنە کار</string>
+    <string name="battery_saver_start_action">کردنە کار</string>
     <string name="status_bar_settings_auto_rotation">خۆکارانە-سوڕانەوەی شاشە</string>
     <string name="usb_accessory_uri_prompt">هیچ بەرنامەیەک دانەمەزراوە ئیش بکات لەسەر USB  زیاتر فێربە دەربارەی <xliff:g id="url">%1$s</xliff:g></string>
     <string name="title_usb_accessory">USB</string>
@@ -48,15 +49,7 @@
     <string name="accessibility_desc_notification_shade">سێبەری تێبینی.</string>
     <string name="accessibility_desc_quick_settings">خێرا ڕێکخستن.</string>
     <string name="accessibility_desc_lock_screen">قوفڵکردنی ڕوونما.</string>
-    <string name="accessibility_quick_settings_wifi_changed_off">کوژانەوەی وایفای.</string>
-    <string name="accessibility_quick_settings_wifi_changed_on">کردنەوەی وایفای.</string>
-    <string name="accessibility_quick_settings_airplane_changed_off">باری فڕۆکە ناچالاکرا.</string>
-    <string name="accessibility_quick_settings_airplane_changed_on">باری فڕۆکە چالاکرا.</string>
     <string name="accessibility_quick_settings_bluetooth_on">چالاکردنی بلوتوس.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_off">بلوتوس ناچالاکە.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_on">بلوتوس ناچالاکە.</string>
-    <string name="accessibility_quick_settings_location_changed_off">ڕاپۆرتی ناوەکی کوژایەوە.</string>
-    <string name="accessibility_quick_settings_location_changed_on">ڕاپۆرتی ناوەکی چالاکرا.</string>
     <string name="accessibility_quick_settings_alarm">دانانی بیرخەرەوە بۆ <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_more_time">کاتی زیاتر.</string>
     <string name="accessibility_quick_settings_less_time">کاتی کەمتر.</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 87a1f41..ac4088a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml
@@ -20,6 +20,8 @@
     <string name="app_label">System-UI</string>
     <string name="battery_low_percent_format"><xliff:g id="percentage">%s</xliff:g> iwwreg</string>
     <string name="battery_saver_confirmation_ok">Uschalten</string>
+    <string name="battery_saver_start_action">Uschalten</string>
+    <string name="battery_saver_dismiss_action">Nee Merci</string>
     <string name="status_bar_settings_auto_rotation">Schierm automatesch rotéieren</string>
     <string name="usb_accessory_uri_prompt">Keng installéiert App fir dësen USB-Accessoire. Méi iwwer dësen Accessoire gewuer ginn op <xliff:g id="url">%1$s</xliff:g></string>
     <string name="title_usb_accessory">USB-Accessoire</string>
@@ -49,24 +51,10 @@
     <string name="accessibility_desc_notification_shade">Notifikatiounsläischt.</string>
     <string name="accessibility_desc_quick_settings">Séier Astellungen.</string>
     <string name="accessibility_desc_lock_screen">Schierm spären.</string>
-    <string name="accessibility_quick_settings_wifi_changed_off">WLAN ausgeschalt.</string>
-    <string name="accessibility_quick_settings_wifi_changed_on">WLAN ugeschalt.</string>
-    <string name="accessibility_quick_settings_airplane_changed_off">Fligermodus ausgeschalt.</string>
-    <string name="accessibility_quick_settings_airplane_changed_on">Fligermodus ugeschalt.</string>
     <string name="accessibility_quick_settings_bluetooth_on">Bluetooth un.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_off">Bluetooth ausgeschalt.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_on">Bluetooth ugeschalt.</string>
-    <string name="accessibility_quick_settings_location_changed_off">Standuertbericht ausgeschalt.</string>
-    <string name="accessibility_quick_settings_location_changed_on">Standuertbericht ugeschalt.</string>
     <string name="accessibility_quick_settings_alarm">Alarm gesat fir <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_more_time">Méi Zäit.</string>
     <string name="accessibility_quick_settings_less_time">Manner Zäit.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_off">Täscheluucht ausgemaach.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_on">Täscheluucht ugemaach.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_off">Faarfinvertéierung ausgeschalt.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_on">Faarfinvertéierung ugeschalt.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_off">Mobillen Zougankspunkt ausgeschalt.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_on">Mobillen Zougankspunkt ugeschalt.</string>
     <string name="accessibility_casting_turned_off">Cast vum Schierm gestoppt.</string>
     <string name="accessibility_brightness">Schiermhellegkeet</string>
     <string name="accessibility_location_active">Standuertufroen aktiv</string>
@@ -87,7 +75,6 @@
     <string name="quick_settings_cast_device_default_name">Apparat ouni Numm</string>
     <string name="quick_settings_cast_detail_empty_text">Keng Apparater disponibel</string>
     <string name="quick_settings_brightness_dialog_title">Hellegkeet</string>
-    <string name="quick_settings_more_settings">Méi Astellungen</string>
     <string name="quick_settings_done">Fäerdeg</string>
     <string name="quick_settings_connected">Verbonnen</string>
     <string name="quick_settings_connecting">Gëtt connectéiert...</string>
@@ -100,17 +87,11 @@
     <string name="quick_settings_cellular_detail_data_limit"><xliff:g id="data_limit" example="2.0 GB">%s</xliff:g>-Limitt</string>
     <string name="quick_settings_cellular_detail_data_warning"><xliff:g id="data_limit" example="2.0 GB">%s</xliff:g> Warnung</string>
     <string name="accessibility_multi_user_switch_switcher">Benotzer wiesselen</string>
-    <string name="user_add_user">Benotzer dobäisetzen</string>
-    <string name="user_new_user_name">Neie Benotzer</string>
-    <string name="guest_exit_guest_dialog_title">Gaascht ewechhuelen?</string>
     <string name="guest_exit_guest_dialog_message">All d\'Appen an Daten an dëser Sëtzung gi geläscht.</string>
-    <string name="guest_exit_guest_dialog_remove">Ewechhuelen</string>
     <string name="guest_wipe_session_title">Wëllkomm zréck, Gaascht!</string>
     <string name="guest_wipe_session_message">Wëlls du deng Sëtzung weiderféieren?</string>
     <string name="guest_wipe_session_wipe">Vu vir ufänken</string>
     <string name="guest_wipe_session_dontwipe">Jo, weidermaachen</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">Neie Benotzer dobäisetzen?</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">Wann s du en neie Benotzer dobäisetz, muss déi Persoun hiren Espace amenagéieren.\n\nAll Benotzer kann Appe fir all aner Benotzer aktualiséieren.</string>
     <string name="user_remove_user_remove">Ewechhuelen</string>
     <string name="clear_all_notifications_text">Alles eidel maachen</string>
     <string name="notification_section_header_alerting">Notifikatiounen</string>
@@ -141,6 +122,9 @@
     <string name="tuner_menu">Menü</string>
     <string name="app_info">App-Info</string>
     <string name="no_auto_saver_action">Nee Merci</string>
+    <string name="controls_settings_dialog_neutral_button">Nee Merci</string>
+    <string name="controls_media_dismiss_button">Verstoppen</string>
     <string name="controls_media_settings_button">Astellungen</string>
     <string name="mobile_data_connection_active">Verbonnen</string>
+    <string name="clipboard_edit_text_done">Fäerdeg</string>
 </resources>
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 eed89c0..4ac3187 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
@@ -20,6 +20,8 @@
     <string name="app_label">IU de su sistema</string>
     <string name="battery_low_percent_format">abarrat <xliff:g id="percentage">%s</xliff:g></string>
     <string name="battery_saver_confirmation_ok">Ativa</string>
+    <string name="battery_saver_start_action">Ativa</string>
+    <string name="battery_saver_dismiss_action">No, gràtzias</string>
     <string name="status_bar_settings_auto_rotation">Rotatzione automàtica de s\'ischermu</string>
     <string name="usb_device_permission_prompt">Boles permìtere a <xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g> de atzèdere a <xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g>?</string>
     <string name="usb_device_permission_prompt_warn">Boles permìtere a <xliff:g id="application" example="Usb Mega Player">%1$s</xliff:g> de atzèdere a <xliff:g id="usb_device" example="USB Headphones">%2$s</xliff:g>?\n Custa aplicatzione no est istada autorizada a registrare ma diat pòdere caturare àudio cun custu dispositivu USB.</string>
@@ -89,9 +91,6 @@
     <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile">Si pones un\'ischema isballiadu a su tentativu imbeniente, su profilu de traballu e is datos ant a èssere cantzellados dae su dispositivu.</string>
     <string name="biometric_dialog_last_pin_attempt_before_wipe_profile">Si pones unu PIN isballiadu a su tentativu imbeniente, su profilu de traballu e is datos ant a èssere cantzellados dae su dispositivu.</string>
     <string name="biometric_dialog_last_password_attempt_before_wipe_profile">Si pones una crae isballiada a su tentativu imbeniente, su profilu de traballu e is datos s\'ant a cantzellare dae su dispositivu.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_device">As isballiadu tropu bortas. Is datos de custu dispositivu ant a èssere cantzellados.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_user">As isballiadu tropu bortas. Custa utèntzia at a èssere cantzellada.</string>
-    <string name="biometric_dialog_failed_attempts_now_wiping_profile">As isballiadu tropu bortas. Custu profilu de traballu e is datos ant a èssere cantzellados.</string>
     <string name="accessibility_bluetooth_connected">Bluetooth collegadu.</string>
     <string name="accessibility_battery_unknown">Càrriga de sa bateria disconnota.</string>
     <string name="accessibility_bluetooth_name">Collegadu a <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
@@ -107,24 +106,10 @@
     <string name="accessibility_desc_quick_settings">Impostatziones lestras.</string>
     <string name="accessibility_desc_lock_screen">Bloca s\'ischermu.</string>
     <string name="accessibility_desc_close">Serra</string>
-    <string name="accessibility_quick_settings_wifi_changed_off">Su Wifi s\'est istudadu.</string>
-    <string name="accessibility_quick_settings_wifi_changed_on">Su Wifi s\'est allutu.</string>
-    <string name="accessibility_quick_settings_airplane_changed_off">Sa modalidade aèreu s\'est istudada.</string>
-    <string name="accessibility_quick_settings_airplane_changed_on">Sa modalidade aèreu s\'est alluta.</string>
     <string name="accessibility_quick_settings_bluetooth_on">Bluetooth ativadu.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_off">Su Bluetooth s\'est disativadu.</string>
-    <string name="accessibility_quick_settings_bluetooth_changed_on">Su Bluetooth s\'est ativadu.</string>
-    <string name="accessibility_quick_settings_location_changed_off">Su signaladore de positzione s\'est disativadu.</string>
-    <string name="accessibility_quick_settings_location_changed_on">Su signaladore de positzione s\'est ativadu.</string>
     <string name="accessibility_quick_settings_alarm">Isvèllia impostada pro <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
     <string name="accessibility_quick_settings_more_time">Prus tempus.</string>
     <string name="accessibility_quick_settings_less_time">Prus pagu tempus.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_off">Su flash s\'est disativadu.</string>
-    <string name="accessibility_quick_settings_flashlight_changed_on">Su flash s\'est ativadu.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_off">Inversione de colores disativada.</string>
-    <string name="accessibility_quick_settings_color_inversion_changed_on">Inversione de colores ativada.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_off">Puntu de atzessu mòbile disativadu.</string>
-    <string name="accessibility_quick_settings_hotspot_changed_on">Puntu de atzessu mòbile ativadu.</string>
     <string name="accessibility_casting_turned_off">Sa trasmissione de s\'ischermu s\'est firmada.</string>
     <string name="accessibility_brightness">Lugore de s\'ischermu</string>
     <string name="data_usage_disabled_dialog_title">Is datos sunt in pasu</string>
@@ -148,7 +133,6 @@
     <string name="quick_settings_cast_device_default_name">Dispositivu chene nùmene</string>
     <string name="quick_settings_cast_detail_empty_text">Perunu dispositivu a disponimentu</string>
     <string name="quick_settings_brightness_dialog_title">Lugore</string>
-    <string name="quick_settings_more_settings">Àteras cunfiguratziones</string>
     <string name="quick_settings_done">Fatu</string>
     <string name="quick_settings_close_user_panel">Serra</string>
     <string name="quick_settings_connected">Connètidu</string>
@@ -177,15 +161,10 @@
     <string name="interruption_level_priority_twoline">Prioridade\nisceti</string>
     <string name="interruption_level_alarms_twoline">Isvèllias\nisceti</string>
     <string name="accessibility_multi_user_switch_switcher">Càmbia utente</string>
-    <string name="user_add_user">Agiunghe utente</string>
-    <string name="user_new_user_name">Utente nou</string>
     <string name="guest_exit_guest_dialog_message">Totu is aplicatziones e datos in custa sessione ant a èssere cantzellados.</string>
-    <string name="guest_exit_guest_dialog_remove">Boga</string>
     <string name="guest_wipe_session_message">Boles sighire sa sessione tua?</string>
     <string name="guest_wipe_session_wipe">Torra a cumintzare</string>
     <string name="guest_wipe_session_dontwipe">Eja, sighi</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">Agiùnghere un\'utente nou?</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">Cando agiunghes un\'utente nou, cussa persone at a tènnere de impostare su logu.\n\nCale si siat utente podet agiornare aplicatziones pro totu is àteros utentes.</string>
     <string name="user_remove_user_remove">Boga</string>
     <string name="media_projection_dialog_text"><xliff:g id="app_seeking_permission" example="Hangouts">%s</xliff:g> at a tènnere atzessu a totu is informatziones chi sunt visìbiles in s\'ischermu o reproduidas dae su dispositivu durante sa registratzione o sa trasmissione. Custu includet informatziones comente crae, detàllios de pagamentos, messàgios e àudio chi reprodues.</string>
     <string name="media_projection_dialog_service_text">Su servìtziu chi frunit custa funtzione at a tènnere atzessu a totu is informatziones chi sunt visìbiles in s\'ischermu o reproduidas dae su dispositivu durante sa registratzione o sa trasmissione. Custu includit informatziones comente crae, detàllios de pagamentos, messàgios e àudio chi reprodues.</string>
@@ -200,17 +179,9 @@
     <string name="empty_shade_text">Peruna notìfica</string>
     <string name="quick_settings_disclosure_management_monitoring">S\'organizatzione tua est mere de custu dispositivu e podet monitorare su tràficu de rete</string>
     <string name="quick_settings_disclosure_named_management_monitoring"><xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> est mere de custu dispositivu e podet monitorare su tràficu de rete</string>
-    <string name="quick_settings_disclosure_management_named_vpn">Su dispositivu est de s\'organizatzione tua e est connètidu a <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_named_management_named_vpn">Su dispositivu est de <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> e est connètidu a <xliff:g id="vpn_app" example="Foo VPN App">%2$s</xliff:g></string>
     <string name="quick_settings_disclosure_management">Custu dispositivu est de propiedade de s\'organizatzione tua</string>
     <string name="quick_settings_disclosure_named_management">Su dispositivu est de <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_management_vpns">Custu dispositivu est de s\'organizatzione tua e est connètidu a is VPN</string>
-    <string name="quick_settings_disclosure_named_management_vpns">Custu dispositivu est de <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> e est connètidu a is VPN</string>
     <string name="quick_settings_disclosure_monitoring">Sa rete diat pòdere èssere controllada</string>
-    <string name="quick_settings_disclosure_vpns">Custu dispositivu est connètidu a is VPN</string>
-    <string name="quick_settings_disclosure_managed_profile_named_vpn">Profilu de traballu connètidu a <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_personal_profile_named_vpn">Profilu de traballu connètidu a <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
-    <string name="quick_settings_disclosure_named_vpn">Dispositivu connètidu a <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string>
     <string name="monitoring_subtitle_vpn">VPN</string>
     <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>
@@ -233,7 +204,6 @@
     <string name="zen_alarm_warning">No as a intèndere s\'isvèllia imbeniente <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string>
     <string name="alarm_template">a is <xliff:g id="when" example="7:00 AM">%1$s</xliff:g></string>
     <string name="alarm_template_far">su <xliff:g id="when" example="Fri 7:00 AM">%1$s</xliff:g></string>
-    <string name="accessibility_quick_settings_detail">Impostatziones lestras, <xliff:g id="title" example="Wi-Fi">%s</xliff:g>.</string>
     <string name="accessibility_status_bar_hotspot">Puntu de atzessu Wi-Fi</string>
     <string name="accessibility_managed_profile">Profilu de traballu</string>
     <string name="tuner_warning_title">Ispàssiu isceti pro calicuna persone</string>
@@ -264,7 +234,11 @@
     <string name="slice_permission_allow">Permite</string>
     <string name="slice_permission_deny">Nega</string>
     <string name="no_auto_saver_action">No, gràtzias</string>
+    <string name="controls_settings_dialog_neutral_button">No, gràtzias</string>
+    <string name="controls_media_dismiss_button">Cua</string>
     <string name="controls_media_resume">Torra a cumintzare</string>
     <string name="controls_media_settings_button">Impostatziones</string>
     <string name="mobile_data_connection_active">Connètidu</string>
+    <string name="qs_tile_request_dialog_add">Agiunghe casella</string>
+    <string name="clipboard_edit_text_done">Fatu</string>
 </resources>
diff --git a/overlay/packages/apps/Car/Launcher/res/values-ast-rES/strings.xml b/overlay/packages/apps/Car/Launcher/res/values-ast-rES/strings.xml
index cd65ade..2378609 100644
--- a/overlay/packages/apps/Car/Launcher/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/Car/Launcher/res/values-ast-rES/strings.xml
@@ -22,10 +22,6 @@
     </string>
     <string name="ongoing_call_duration_text_separator"> • </string>
     <string name="ongoing_call_text">Llamada en cursu</string>
-    <plurals name="projection_devices">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> preséu</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> preseos</item>
-    </plurals>
     <string name="hide_debug_apps">Amosar les aplicaciones de depuración</string>
     <string name="show_debug_apps">Anubrir les aplicaciones de depuración</string>
 </resources>
diff --git a/overlay/packages/apps/Car/Launcher/res/values-cy/strings.xml b/overlay/packages/apps/Car/Launcher/res/values-cy/strings.xml
index 17feb93..c19b7d6 100644
--- a/overlay/packages/apps/Car/Launcher/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/Launcher/res/values-cy/strings.xml
@@ -19,14 +19,6 @@
     <string name="app_launcher_title_all_apps">Pob ap</string>
     <string name="app_launcher_title_media_only">Apiau cyfryngau</string>
     <string name="driving_toast_text">        Ni ellir ddefnyddio <xliff:g id="app_name" example="Settings">%1$s</xliff:g> tra\'n gyrru.</string>
-    <plurals name="projection_devices">
-        <item quantity="zero"><xliff:g example="2" id="count">%d</xliff:g> dyfeisiau</item>
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> dyfais</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> ddyfais</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> dyfais</item>
-        <item quantity="many"><xliff:g example="2" id="count">%d</xliff:g> dyfais</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> dyfais</item>
-    </plurals>
     <string name="hide_debug_apps">Cuddio apiau dadfygio</string>
     <string name="show_debug_apps">Dangos apiau dadfygio</string>
 </resources>
diff --git a/overlay/packages/apps/Car/Launcher/res/values-gd/strings.xml b/overlay/packages/apps/Car/Launcher/res/values-gd/strings.xml
index eecf535..5c705d5 100644
--- a/overlay/packages/apps/Car/Launcher/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Car/Launcher/res/values-gd/strings.xml
@@ -20,12 +20,6 @@
     <string name="app_launcher_title_media_only">Aplacaidean mheadhanan</string>
     <string name="driving_toast_text">        Chan fhaod thu <xliff:g id="app_name" example="Settings">%1$s</xliff:g> a chleachdadh fhad ’s a bhios tu a’ draibheadh.
     </string>
-    <plurals name="projection_devices">
-        <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> uidheam</item>
-        <item quantity="two"><xliff:g example="2" id="count">%d</xliff:g> uidheam</item>
-        <item quantity="few"><xliff:g example="2" id="count">%d</xliff:g> uidheaman</item>
-        <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> uidheam</item>
-    </plurals>
     <string name="hide_debug_apps">Falaich aplacaidean an dì-bhugachaidh</string>
     <string name="show_debug_apps">Seall aplacaidean an dì-bhugachaidh</string>
 </resources>
diff --git a/overlay/packages/apps/Car/Settings/res/values-ast-rES/arrays.xml b/overlay/packages/apps/Car/Settings/res/values-ast-rES/arrays.xml
deleted file mode 100644
index e07c62e..0000000
--- a/overlay/packages/apps/Car/Settings/res/values-ast-rES/arrays.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2019 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources>
-    <string-array name="settings_qc_provider_package_allowlist">
-        <item>com.android.systemui</item>
-    </string-array>
-</resources>
diff --git a/overlay/packages/apps/Car/Settings/res/values-ast-rES/strings.xml b/overlay/packages/apps/Car/Settings/res/values-ast-rES/strings.xml
index 5464f25..44bdc3e 100644
--- a/overlay/packages/apps/Car/Settings/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/Car/Settings/res/values-ast-rES/strings.xml
@@ -207,8 +207,6 @@
     <string name="delete_user_error_title">Nun se desanició\'l perfil. Pues reaniciar el preséu y volver tentalo.</string>
     <string name="delete_user_error_dismiss">Escartar</string>
     <string name="delete_user_error_retry">Retentar</string>
-    <string name="user_guest">Convidáu</string>
-    <string name="start_guest_session">Convidáu</string>
     <string name="current_user_name">Tu (%1$s)</string>
     <string name="user_name_label">Nome</string>
     <string name="name_input_blank_error">El campu nun pue tar baleru</string>
@@ -314,7 +312,6 @@
     <string name="notifications_all_apps">Toles aplicaciones</string>
     <string name="profiles_and_accounts_settings_title">Perfiles y cuentes</string>
     <string name="deactivate_and_uninstall_device_admin">Desactivar y desinstalar</string>
-    <string name="admin_support_more_info">Más detalles</string>
     <string name="admin_profile_owner_message">El xestor de la organización pue supervisar y xestionar les aplicaciones
         y los datos asociaos con esti perfil, incluyíos los axustes, l\'accesu corporativu,
         los permisos, l\'actividá na rede y la información de llocalización del vehículu.</string>
@@ -345,4 +342,5 @@
     <string name="captions_settings_text_style_yellow_on_blue">Mariellu sobre azul</string>
     <string name="screen_reader_options_title">Opciones</string>
     <string name="screen_reader_description_title">Axustes</string>
+    <string name="camera_settings_loading_app_permission_stats">Cargando\u2026</string>
 </resources>
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 c4d88ed..c86faa5 100644
--- a/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
@@ -343,8 +343,6 @@
     <string name="wifi_control_description">Mae rheolaeth Wi-Fi yn caniatáu i ap droi Wi-Fi ymlaen ac i ffwrdd, sganio am a chysylltu â rhwydweithiau Wi-Fi, tynnu neu ychwanegu rhwydweithiau neu ddechrau llecyn Wi-Fi.</string>
     <string name="more_special_access_title">Rhagor</string>
     <string name="location_settings_title">Lleoliad</string>
-    <string name="location_settings_recent_requests_title">Ceisiadau Diweddar am Leoliad</string>
-    <string name="location_settings_recent_requests_empty_message">Dim ceisiau diweddar am leoliad</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_settings_loading_app_permission_stats">Yn llwytho\u2026</string>
@@ -439,8 +437,6 @@
     <string name="choose_new_admin_title">Dewisa weinyddwr newydd</string>
     <string name="choose_new_admin_message">Rhaid bod o leiaf un gweinyddwr. I ddileu\'r un yma, rhaid yn gyntaf dewis un i gymryd ei le.</string>
     <string name="choose_new_admin_label">Dewis gweinyddwr</string>
-    <string name="user_guest">Gwestai</string>
-    <string name="start_guest_session">Gwestai</string>
     <string name="user_switch">Newid</string>
     <string name="current_user_name">Ti (%1$s)</string>
     <string name="user_name_label">Enw</string>
@@ -475,9 +471,6 @@
     </string>
     <string name="account_auto_sync_title">Cysoni data yn awtomatig</string>
     <string name="account_auto_sync_summary">Caniatáu i apiau ail-lwytho data yn awtomatig</string>
-    <string name="data_usage_auto_sync_on_dialog_title">Troi awto-cysoni data ymlaen?</string>
-    <string name="data_usage_auto_sync_on_dialog">Caiff unrhyw newidiadau rwyt yn eu gwneud i dy gyfrifon ar y we yn cael eu copïo yn awtomatig i dy ddyfais.\n\nGall rhai cyfrifon hefyd copïo unrhyw newidiadau rwyt yn eu gwneud y ffôn i\'r we. Mae Cyfrif Google yn gweithio yn y modd hwn.</string>
-    <string name="data_usage_auto_sync_off_dialog_title">Troi awto-cysoni data i ffwrdd?</string>
     <string name="data_usage_auto_sync_off_dialog">Bydd hyn yn arbed defnydd data, ond bydd yn rhaid cysoni pob cyfrif dy hun i gael y wybodaeth ddiweddaraf. A ni fyddi\'n derbyn hysbysiadau pan fydd diweddariadau ar gael.</string>
     <string name="account_details_title">Gwybodaeth cyfrif</string>
     <string name="add_account_title">Ychwanegu cyfrif</string>
@@ -587,4 +580,5 @@
     <string name="enterprise_privacy_none">Dim</string>
     <string name="enterprise_privacy_enterprise_set_default_apps">Apiau rhagosodedig</string>
     <string name="screen_reader_description_title">Gosodiadau</string>
+    <string name="camera_settings_loading_app_permission_stats">Yn llwytho\u2026</string>
 </resources>
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 4484bcd..0bd8300 100644
--- a/overlay/packages/apps/Car/Settings/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Car/Settings/res/values-gd/strings.xml
@@ -344,8 +344,6 @@
     <string name="wifi_control_description">Leigidh smachd air WiFi le aplacaid WiFi a chur air no dheth, sganadh airson lìonraidhean WiFi is ceangal riutha, lìonraidhean a chur ris no an toirt air falbh no hotspot a bhios ionadail a-mhàin a thòiseachadh.</string>
     <string name="more_special_access_title">Barrachd</string>
     <string name="location_settings_title">Ionad</string>
-    <string name="location_settings_recent_requests_title">Iarrtasan ionaid o chionn goirid</string>
-    <string name="location_settings_recent_requests_empty_message">Cha deach d’ ionad iarraidh o chionn goirid</string>
     <string name="location_settings_app_permissions_title">Ceadan air ìre aplacaide</string>
     <string name="location_settings_services_title">Seirbheisean ionaid</string>
     <string name="microphone_settings_loading_app_permission_stats">’Ga luchdadh\u2026</string>
@@ -441,8 +439,6 @@
     <string name="choose_new_admin_title">Tagh rianaire ùr</string>
     <string name="choose_new_admin_message">Feumaidh tu rianaire. Airson am fear seo a sguabadh às, tagh fear eile ’na àite an toiseach.</string>
     <string name="choose_new_admin_label">Tagh rianaire</string>
-    <string name="user_guest">Aoigh</string>
-    <string name="start_guest_session">Aoigh</string>
     <string name="user_switch">Geàrr leum</string>
     <string name="current_user_name">Thusa (%1$s)</string>
     <string name="user_name_label">Ainm</string>
@@ -477,9 +473,6 @@
     </string>
     <string name="account_auto_sync_title">Sioncronaich an dàta gu fèin-obrachail</string>
     <string name="account_auto_sync_summary">Leig le aplacaidean an dàta ath-nuadhachadh gu fèin-obrachail</string>
-    <string name="data_usage_auto_sync_on_dialog_title">An cuir thu an sioncronachadh fèin-obrachail an dàta air?</string>
-    <string name="data_usage_auto_sync_on_dialog">Thèid lethbhreac de dh’atharrachadh sam bith a nì thu air an cunntasan agad air an lìon a chur air an uidheam agad gu fèin-obrachail.\n\nDh’fhaoidte gun cuir cuid a chunntasan lethbhreac de dh’atharrachadh sam bith a nì thu air an fhòn dhan lìon. Seo an dòigh air a bhios cunntas Google ag obair.</string>
-    <string name="data_usage_auto_sync_off_dialog_title">An cuir thu an sioncronachadh fèin-obrachail an dàta dheth?</string>
     <string name="data_usage_auto_sync_off_dialog">Caomhnaidh seo dàta ach feumaidh tu gach cunntas a shioncronachadh a làimh airson am fiosrachadh as ùire a chruinneachadh. Cuideachd, chan fhaigh thu brath mu ùrachaidhean a thachras.</string>
     <string name="account_details_title">Fiosrachadh a’ chunntais</string>
     <string name="add_account_title">Cuir cunntas ris</string>
@@ -589,4 +582,5 @@
     <string name="enterprise_privacy_none">Chan eil gin</string>
     <string name="enterprise_privacy_enterprise_set_default_apps">Na h-aplacaidean bunaiteach</string>
     <string name="screen_reader_description_title">Roghainnean</string>
+    <string name="camera_settings_loading_app_permission_stats">’Ga luchdadh\u2026</string>
 </resources>
diff --git a/overlay/packages/apps/Car/SystemUI/res/values-ast-rES/strings.xml b/overlay/packages/apps/Car/SystemUI/res/values-ast-rES/strings.xml
index 1f3b8cb..80b5ed2 100644
--- a/overlay/packages/apps/Car/SystemUI/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/Car/SystemUI/res/values-ast-rES/strings.xml
@@ -20,16 +20,11 @@
     <string name="fan_speed_max">MÁX</string>
     <string name="voice_recognition_toast">El preséu Bluetooth conectáu remana la reconocencia de voz</string>
     <string name="car_new_user">Perfil nuevu</string>
-    <plurals name="profile_limit_reached_message">
-        <item quantity="one">Namás se pue crear un perfil.</item>
-        <item quantity="other">Pues amestar hasta <xliff:g id="count" example="3">%d</xliff:g> perfiles.</item>
-    </plurals>
     <string name="car_loading_profile">Cargando</string>
-    <string name="mic_privacy_chip_app_recently_used_mic_suffix">«<xliff:g id="app" example="Assistant">%s</xliff:g>» usó\'l micrófonu apocayá</string>
-    <string name="mic_privacy_chip_apps_recently_used_mic_suffix">«<xliff:g id="app" example="Assistant">%1$s</xliff:g>» y <xliff:g id="additional_app_count" example="2">%2$d</xliff:g> más usaron el micrófonu apocayá</string>
     <string name="mic_privacy_chip_on_toast">Activóse\'l micrófonu</string>
     <string name="mic_privacy_chip_off_toast">Desactivóse\'l micrófonu</string>
     <string name="mic_privacy_chip_dialog_ok">D\'acuerdu</string>
     <string name="sensor_privacy_start_use_mic_dialog_title">¿Quies activar el micrófonu del vehículu?</string>
+    <string name="camera_privacy_chip_dialog_ok">D\'acuerdu</string>
     <string name="qc_footer_settings">Axustes</string>
 </resources>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-ast-rES/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-ast-rES/strings.xml
index 8d73365..ff5e9a2 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-ast-rES/strings.xml
@@ -21,7 +21,6 @@
     <string name="notification_channel_broadcast_messages_in_voicecall">Alertes d\'emerxencia nes llamaes de voz</string>
     <string name="notification_channel_settings_updates">Cambeos de los axustes de les alertes d\'emerxencia ensin filos automátiques según la SIM</string>
     <string name="enable_full_screen_public_safety_messages_title">Amosar los mensaxes a pantalla completa</string>
-    <string name="enable_full_screen_public_safety_messages_summary">Desactiva esti axuste pa que los mensaxes de seguranza pública s\'unvien namás a l\'aplicación de SMS</string>
     <string name="enable_exercise_test_alerts_title">@string/cmas_exercise_alert</string>
     <string name="enable_operator_defined_test_alerts_title">@string/cmas_operator_defined_alert</string>
     <string-array name="alert_reminder_interval_entries">
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-cy/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-cy/strings.xml
index d4fc1f3..5c8ad0a 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-cy/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-cy/strings.xml
@@ -79,7 +79,6 @@
     <string name="enable_public_safety_messages_title">Negeseuon diogelwch cyhoeddus</string>
     <string name="enable_public_safety_messages_summary">Gweithredoedd a argymhellir er mwyn achub eiddo a bywydau</string>
     <string name="enable_full_screen_public_safety_messages_title">Dangos negeseuon sgrin llawn</string>
-    <string name="enable_full_screen_public_safety_messages_summary">Troi i ffwrdd i gael negeseuon diogelwch cyhoeddus wedi\'u hanfon dim ond i dy ap SMS</string>
     <string name="enable_state_local_test_alerts_title">Profion lleol a thalaith</string>
     <string name="enable_state_local_test_alerts_summary">Derbyn negeseuon profi oddi wrth awdurdodau lleol a thalaith</string>
     <string name="enable_emergency_alerts_message_title">Rhybuddion argyfwng</string>
@@ -135,6 +134,7 @@
     <string name="cmas_opt_out_button_yes">Iawn</string>
     <string name="cmas_opt_out_button_no">Na</string>
     <string name="cb_list_activity_title">"Hanes rhybuddion argyfwng"</string>
+    <string name="action_delete">Dileu</string>
     <string-array name="alert_reminder_interval_entries">
         <item>Unwaith</item>
         <item>Pob 2 funud</item>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-eo/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-eo/strings.xml
index ead8435..bd6a319 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-eo/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-eo/strings.xml
@@ -20,4 +20,5 @@
     <string name="enable_alert_speech_title">Speak alert message</string>
     <string name="cmas_opt_out_button_yes">Jes</string>
     <string name="cmas_opt_out_button_no">Ne</string>
+    <string name="action_delete">Forigi</string>
 </resources>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-gd/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-gd/strings.xml
index c3be7f9..10421a0 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-gd/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-gd/strings.xml
@@ -125,6 +125,7 @@
     <string name="cmas_opt_out_button_yes">Tha</string>
     <string name="cmas_opt_out_button_no">Chan eil</string>
     <string name="cb_list_activity_title">"Eachdraidh nan rabhaidhean èiginn"</string>
+    <string name="action_delete">Sguab às</string>
     <string-array name="alert_reminder_interval_entries">
         <item>Aon turas</item>
         <item>Gach 2 mhionaid</item>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-kab-rDZ/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-kab-rDZ/strings.xml
index 9cfb729..0c1a058 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-kab-rDZ/strings.xml
@@ -31,6 +31,7 @@
     <string name="delivery_time_heading">Yettwarmes:</string>
     <string name="cmas_opt_out_button_yes">Ih</string>
     <string name="cmas_opt_out_button_no">Uhu</string>
+    <string name="action_delete">Kkes</string>
     <string-array name="alert_reminder_interval_entries">
         <item>Tikkelt</item>
         <item>Every 2 minutes</item>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-ku/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-ku/strings.xml
index 298f4d5..6fde476 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-ku/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-ku/strings.xml
@@ -77,6 +77,7 @@
     <string name="show_cmas_opt_out_title">نیشاندانی دایه‌لۆگی دیده‌نه‌ بچوک</string>
     <string name="cmas_opt_out_button_yes">بەڵێ</string>
     <string name="cmas_opt_out_button_no">نا</string>
+    <string name="action_delete">سڕینه‌وه‌</string>
     <string-array name="alert_reminder_interval_entries">
         <item>یەکجار</item>
         <item>هەر 2 خۆلەک</item>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-lb/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-lb/strings.xml
index cac7048..fca1cbb 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-lb/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-lb/strings.xml
@@ -77,6 +77,7 @@
     <string name="show_cmas_opt_out_title">Opt-Out-Dialog uweisen</string>
     <string name="cmas_opt_out_button_yes">Jo</string>
     <string name="cmas_opt_out_button_no">Nee</string>
+    <string name="action_delete">Läschen</string>
     <string-array name="alert_reminder_interval_entries">
         <item>Eng Kéier</item>
         <item>All 2 Minutten</item>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-sc-rIT/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-sc-rIT/strings.xml
index b984d2e..b906251 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-sc-rIT/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-sc-rIT/strings.xml
@@ -77,6 +77,7 @@
     <string name="show_cmas_opt_out_title">Mustra cuadru de diàlogu pro disativare</string>
     <string name="cmas_opt_out_button_yes">Eja</string>
     <string name="cmas_opt_out_button_no">Nono</string>
+    <string name="action_delete">Cantzella</string>
     <string-array name="alert_reminder_interval_entries">
         <item>Una borta</item>
         <item>Ogni 2 minutos</item>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values-ug/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-ug/strings.xml
index 61546bd..3bad071 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-ug/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-ug/strings.xml
@@ -77,6 +77,7 @@
     <string name="show_cmas_opt_out_title">ئاگاھلاندۇرۇشنى توختىتىش سۆزلەشكۈنى كۆرسەت</string>
     <string name="cmas_opt_out_button_yes">ھەئە</string>
     <string name="cmas_opt_out_button_no">ياق</string>
+    <string name="action_delete">ئۆچۈر</string>
     <string-array name="alert_reminder_interval_entries">
         <item>بىر قېتىملىق</item>
         <item>ھەر 2 مىنۇتتا</item>
diff --git a/overlay/packages/apps/Contacts/res/values-cy/strings.xml b/overlay/packages/apps/Contacts/res/values-cy/strings.xml
index e65789e..bb61846 100644
--- a/overlay/packages/apps/Contacts/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Contacts/res/values-cy/strings.xml
@@ -63,30 +63,6 @@
     <string name="contacts_deleted_one_named_toast"><xliff:g id="name">%1$s</xliff:g> wedi\'i ddileu</string>
     <string name="contacts_deleted_two_named_toast"><xliff:g id="name">%1$s</xliff:g> a <xliff:g id="name">%2$s</xliff:g> wedi\'u dileu</string>
     <string name="contacts_deleted_many_named_toast"><xliff:g id="name">%1$s</xliff:g>, <xliff:g id="name">%2$s</xliff:g>, <xliff:g id="name">%3$s</xliff:g>\u2026 wedi\'u dileu</string>
-    <plurals name="contacts_deleted_toast">
-        <item quantity="zero">Dim cysylltiadau wedi eu dileu</item>
-        <item quantity="one">Un cyswllt wedi ei ddileu</item>
-        <item quantity="two">Dau gyswllt wedi eu dileu</item>
-        <item quantity="few">Tri chyswllt wedi eu dileu</item>
-        <item quantity="many">Chwe chyswllt wedi eu dileu</item>
-        <item quantity="other">Cysylltiadau wedi eu dileu</item>
-    </plurals>
-    <plurals name="contacts_count">
-        <item quantity="zero"><xliff:g id="count">%d</xliff:g> cysylltiadau</item>
-        <item quantity="one"><xliff:g id="count">%d</xliff:g> cyswllt</item>
-        <item quantity="two"><xliff:g id="count">%d</xliff:g> gyswllt</item>
-        <item quantity="few"><xliff:g id="count">%d</xliff:g> cyswllt</item>
-        <item quantity="many"><xliff:g id="count">%d</xliff:g> chyswllt</item>
-        <item quantity="other"><xliff:g id="count">%d</xliff:g> cyswllt</item>
-    </plurals>
-    <plurals name="contacts_count_with_account">
-        <item quantity="zero"><xliff:g id="count">%1$d</xliff:g> cysylltiadau · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="one"><xliff:g id="count">%1$d</xliff:g> cyswllt · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="two"><xliff:g id="count">%1$d</xliff:g> gyswllt · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="few"><xliff:g id="count">%1$d</xliff:g> cyswllt · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="many"><xliff:g id="count">%1$d</xliff:g> chyswllt · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="other"><xliff:g id="count">%1$d</xliff:g> cyswllt · <xliff:g id="account">%2$s</xliff:g></item>
-    </plurals>
     <string name="title_from_google">O Google</string>
     <string name="title_from_other_accounts">O <xliff:g id="account">%s</xliff:g></string>
     <string name="menu_set_ring_tone">Gosod tôn caniad</string>
@@ -146,14 +122,6 @@
     <string name="menu_share">Rhannu</string>
     <string name="menu_add_contact">Ychwanegu at gysylltiadau</string>
     <string name="menu_add_contacts">Ychwanegu</string>
-    <plurals name="title_share_via">
-        <item quantity="zero">Rhannu cysylltiadau trwy</item>
-        <item quantity="one">Rhannu\'r cyswllt trwy</item>
-        <item quantity="two">Rhannu cysylltiadau trwy</item>
-        <item quantity="few">Rhannu cysylltiadau trwy</item>
-        <item quantity="many">Rhannu cysylltiadau trwy</item>
-        <item quantity="other">Rhannu cysylltiadau trwy</item>
-    </plurals>
     <string name="dialog_new_group_account">Dewis gyfrif</string>
     <string name="group_name_dialog_insert_title">Creu label</string>
     <string name="group_name_dialog_update_title">Ailenwi\'r label</string>
@@ -411,22 +379,6 @@
     <string name="dialog_new_contact_account">Cadw\'r cysylltiadau a fewnforiwyd i:</string>
     <string name="import_from_sim">Cerdyn SIM</string>
     <string name="import_from_sim_summary_fmt">SIM <xliff:g id="sim_name">%1$s</xliff:g></string>
-    <plurals name="import_from_sim_secondary_contact_count_fmt">
-        <item quantity="zero">%1$d cysylltiadau</item>
-        <item quantity="one">1 cyswllt</item>
-        <item quantity="two">%1$d gyswllt</item>
-        <item quantity="few">%1$d chyswllt</item>
-        <item quantity="many">%1$d chyswllt</item>
-        <item quantity="other">%1$d cyswllt</item>
-    </plurals>
-    <plurals name="import_from_sim_secondary_template">
-        <item quantity="zero"><xliff:g id="count">^1</xliff:g> cysylltiadau • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="one"><xliff:g id="count">^1</xliff:g> cyswllt • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="two"><xliff:g id="count">^1</xliff:g> gyswllt • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="few"><xliff:g id="count">^1</xliff:g> cyswllt • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="many"><xliff:g id="count">^1</xliff:g> chyswllt • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="other"><xliff:g id="count">^1</xliff:g> cyswllt • <xliff:g id="phone_number">^2</xliff:g></item>
-    </plurals>
     <string name="import_from_vcf_file">ffeil .vcf</string>
     <string name="nothing_to_import_message">Dim byd i\'w fewnforio</string>
     <string name="import_from_vcf_file_confirmation_message">Mewnforio cysylltiadau o vCard?</string>
@@ -531,14 +483,6 @@
     <string name="sim_import_title_none_selected">Dewis cysylltiadau</string>
     <string name="sim_import_empty_message">Does dim cysylltiadau ar dy gerdyn SIM</string>
     <string name="sim_import_contact_exists_toast">Mae\'r cyswllt eisoes yn bodoli yn dy restr</string>
-    <plurals name="sim_import_success_toast_fmt">
-        <item quantity="zero">Mewnforiwyd <xliff:g id="count">%d</xliff:g> cysylltiadau SIM</item>
-        <item quantity="one">Mewnforiwyd 1 cyswllt SIM</item>
-        <item quantity="two">Mewnforiwyd <xliff:g id="count">%d</xliff:g> gyswllt SIM</item>
-        <item quantity="few">Mewnforiwyd <xliff:g id="count">%d</xliff:g> cyswllt SIM</item>
-        <item quantity="many">Mewnforiwyd <xliff:g id="count">%d</xliff:g> chyswllt SIM</item>
-        <item quantity="other">Mewnforiwyd <xliff:g id="count">%d</xliff:g> cyswllt SIM</item>
-    </plurals>
     <string name="sim_import_failed_toast">Methwyd â mewnforio cysylltiadau SIM</string>
     <string name="sim_import_title">Mewnforio o SIM</string>
     <string name="sim_import_cancel_content_description">Diddymu</string>
diff --git a/overlay/packages/apps/Contacts/res/values-gd/strings.xml b/overlay/packages/apps/Contacts/res/values-gd/strings.xml
index d23e797..e5eec79 100644
--- a/overlay/packages/apps/Contacts/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Contacts/res/values-gd/strings.xml
@@ -63,24 +63,6 @@
     <string name="contacts_deleted_one_named_toast">Chaidh <xliff:g id="name">%1$s</xliff:g> a sguabadh às</string>
     <string name="contacts_deleted_two_named_toast">Chaidh <xliff:g id="name">%1$s</xliff:g> ’s <xliff:g id="name">%2$s</xliff:g> a sguabadh às</string>
     <string name="contacts_deleted_many_named_toast">Chaidh <xliff:g id="name">%1$s</xliff:g>, <xliff:g id="name">%2$s</xliff:g>, <xliff:g id="name">%3$s</xliff:g>\u2026 a sguabadh às</string>
-    <plurals name="contacts_deleted_toast">
-        <item quantity="one">Chaidh an neach-aithne a sguabadh às</item>
-        <item quantity="two">Chaidh an luchd-aithne a sguabadh às</item>
-        <item quantity="few">Chaidh an luchd-aithne a sguabadh às</item>
-        <item quantity="other">Chaidh an luchd-aithne a sguabadh às</item>
-    </plurals>
-    <plurals name="contacts_count">
-        <item quantity="one"><xliff:g id="count">%d</xliff:g> neach-aithne</item>
-        <item quantity="two"><xliff:g id="count">%d</xliff:g> luchd-aithne</item>
-        <item quantity="few"><xliff:g id="count">%d</xliff:g> luchd-aithne</item>
-        <item quantity="other"><xliff:g id="count">%d</xliff:g> luchd-aithne</item>
-    </plurals>
-    <plurals name="contacts_count_with_account">
-        <item quantity="one"><xliff:g id="count">%1$d</xliff:g> neach-aithne · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="two"><xliff:g id="count">%1$d</xliff:g> luchd-aithne · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="few"><xliff:g id="count">%1$d</xliff:g> luchd-aithne · <xliff:g id="account">%2$s</xliff:g></item>
-        <item quantity="other"><xliff:g id="count">%1$d</xliff:g> luchd-aithne · <xliff:g id="account">%2$s</xliff:g></item>
-    </plurals>
     <string name="title_from_google">O Google</string>
     <string name="title_from_other_accounts">O <xliff:g id="account">%s</xliff:g></string>
     <string name="menu_set_ring_tone">Suidhich seirm</string>
@@ -140,12 +122,6 @@
     <string name="menu_share">Co-roinn</string>
     <string name="menu_add_contact">Cuir ris an luchd-aithne</string>
     <string name="menu_add_contacts">Cuir ris</string>
-    <plurals name="title_share_via">
-        <item quantity="one">Co-roinn an neach-aithne slighe</item>
-        <item quantity="two">Co-roinn an luchd-aithne slighe</item>
-        <item quantity="few">Co-roinn an luchd-aithne slighe</item>
-        <item quantity="other">Co-roinn an luchd-aithne slighe</item>
-    </plurals>
     <string name="dialog_new_group_account">Tagh cunntas</string>
     <string name="group_name_dialog_insert_title">Cruthaich leubail</string>
     <string name="group_name_dialog_update_title">Thoir ainm ùr air an leubail</string>
@@ -400,18 +376,6 @@
     <string name="dialog_new_contact_account">Sàbhail an luchd-aithne a chaidh ion-phortadh gu:</string>
     <string name="import_from_sim">Cairt SIM</string>
     <string name="import_from_sim_summary_fmt">SIM <xliff:g id="sim_name">%1$s</xliff:g></string>
-    <plurals name="import_from_sim_secondary_contact_count_fmt">
-        <item quantity="one">%1$d neach-aithne</item>
-        <item quantity="two">%1$d luchd-aithne</item>
-        <item quantity="few">%1$d luchd-aithne</item>
-        <item quantity="other">%1$d luchd-aithne</item>
-    </plurals>
-    <plurals name="import_from_sim_secondary_template">
-        <item quantity="one"><xliff:g id="count">^1</xliff:g> neach-aithne • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="two"><xliff:g id="count">^1</xliff:g> luchd-aithne • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="few"><xliff:g id="count">^1</xliff:g> luchd-aithne • <xliff:g id="phone_number">^2</xliff:g></item>
-        <item quantity="other"><xliff:g id="count">^1</xliff:g> luchd-aithne • <xliff:g id="phone_number">^2</xliff:g></item>
-    </plurals>
     <string name="import_from_vcf_file">Faidhle .vcf</string>
     <string name="nothing_to_import_message">Gun dad ri ion-phortadh</string>
     <string name="import_from_vcf_file_confirmation_message">An ion-phortaich thu luchd-aithne on vCard?</string>
@@ -516,12 +480,6 @@
     <string name="sim_import_title_none_selected">Tagh luchd-aithne</string>
     <string name="sim_import_empty_message">Chan eil neach-aithne air a’ chairt SIM agad</string>
     <string name="sim_import_contact_exists_toast">Tha an neach-aithne san liosta agad mu thràth</string>
-    <plurals name="sim_import_success_toast_fmt">
-        <item quantity="one">Chaidh <xliff:g id="count">%d</xliff:g> neach-aithne ion-phortadh on t-SIM</item>
-        <item quantity="two">Chaidh <xliff:g id="count">%d</xliff:g> luchd-aithne ion-phortadh on t-SIM</item>
-        <item quantity="few">Chaidh <xliff:g id="count">%d</xliff:g> luchd-aithne ion-phortadh on t-SIM</item>
-        <item quantity="other">Chaidh <xliff:g id="count">%d</xliff:g> luchd-aithne ion-phortadh on t-SIM</item>
-    </plurals>
     <string name="sim_import_failed_toast">Dh’fhàillig ion-phortadh an luchd-aithne on t-SIM</string>
     <string name="sim_import_title">Ion-phortaich on t-SIM</string>
     <string name="sim_import_cancel_content_description">Sguir dheth</string>
diff --git a/overlay/packages/apps/Contacts/res/values-lb/strings.xml b/overlay/packages/apps/Contacts/res/values-lb/strings.xml
index ad27900..b379a36 100644
--- a/overlay/packages/apps/Contacts/res/values-lb/strings.xml
+++ b/overlay/packages/apps/Contacts/res/values-lb/strings.xml
@@ -37,10 +37,6 @@
     <string name="separatorJoinAggregateSuggestions">Proposéiert Kontakter</string>
     <string name="separatorJoinAggregateAll">All d\'Kontakter</string>
     <string name="contactsJoinedMessage">Kontakter fusionéiert</string>
-    <plurals name="contacts_deleted_toast">
-        <item quantity="one">Kontakt geläscht</item>
-        <item quantity="other">Kontakter geläscht</item>
-    </plurals>
     <string name="menu_set_ring_tone">Schelltoun setzen</string>
     <string name="single_delete_confirmation">Kontakt läschen?</string>
     <string name="batch_delete_confirmation">Ausgewielt Kontakter läschen?</string>
diff --git a/overlay/packages/apps/DeskClock/res/values-ast-rES/strings.xml b/overlay/packages/apps/DeskClock/res/values-ast-rES/strings.xml
index cca8cea..da6741a 100644
--- a/overlay/packages/apps/DeskClock/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/DeskClock/res/values-ast-rES/strings.xml
@@ -85,7 +85,7 @@
         <item>Vamos volver saltar nel tiempu.</item>
         <item>Namás un saltu a la esquierda.</item>
         <item>Cuerres más que la lluz.</item>
-        <item>Velocidá fotónica.</item>
+        <item>Velocidá fotónica</item>
     </string-array>
     <string name="cities_activity_title">Ciudaes</string>
     <string name="clock_settings">Reló</string>
diff --git a/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml b/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml
index 26e68eb..1d37088 100644
--- a/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml
+++ b/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml
@@ -123,7 +123,6 @@
     <string name="phone_type_and_phone_number"><xliff:g id="phone_type" example="Symudol">%1$s</xliff:g> • <xliff:g id="phone_number" example="0777 123 8899">%2$s</xliff:g>
     </string>
     <string name="no_info_provided">Dim gwybodaeth am berchennog y ffôn</string>
-    <string name="tap_pencil">Os mai dyma dy ffôn, tapia\'r eicon pensil i ychwanegu gwybodaeth i\'w ddangos os fydd argyfwng.</string>
     <string name="clear_all">Clirio\'r cyfan</string>
     <string name="clear">Clirio</string>
     <string name="clear_all_message">Clirio\'r holl wybodaeth a chysylltiadau?</string>
diff --git a/overlay/packages/apps/EmergencyInfo/res/values-gd/strings.xml b/overlay/packages/apps/EmergencyInfo/res/values-gd/strings.xml
index 9841284..464f1a3 100644
--- a/overlay/packages/apps/EmergencyInfo/res/values-gd/strings.xml
+++ b/overlay/packages/apps/EmergencyInfo/res/values-gd/strings.xml
@@ -124,7 +124,6 @@
     <string name="phone_type_and_phone_number">        <xliff:g id="phone_type" example="Mobile">%1$s</xliff:g> • <xliff:g id="phone_number" example="333-444-5566">%2$s</xliff:g>
     </string>
     <string name="no_info_provided">Chan eil fiosrachadh mu shealbhadair an fhòn ann</string>
-    <string name="tap_pencil">Mas e am fòn agadsa a th’ ann, thoir gnogag air ìomhaigheag a’ pheansail airson fiosrachadh a chur ris a nochdas an-seo nuair a bhios tu ann an èiginn</string>
     <string name="clear_all">Falamhaich na h-uile</string>
     <string name="clear">Falamhaich</string>
     <string name="clear_all_message">Am falmhaich thu a h-uile fiosrachadh is neach-aithne?</string>
diff --git a/overlay/packages/apps/ManagedProvisioning/res/values-ast-rES/strings.xml b/overlay/packages/apps/ManagedProvisioning/res/values-ast-rES/strings.xml
index 1fc3364..26fe166 100644
--- a/overlay/packages/apps/ManagedProvisioning/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/ManagedProvisioning/res/values-ast-rES/strings.xml
@@ -17,7 +17,6 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="admin_has_ability_to_monitor_profile">L\'alministrador de TI tien la capacidá de supervisar y xestionar los axustes, l\'accesu corporativu, les aplicaciones, los permisos y los datos asociaos con esti perfil, incluyida la to actividá na rede, amás de la llocalización del preséu, l\'historial de llamaes y l\'historial de busca de contautos.<xliff:g id="line_break">\n\n</xliff:g>Ponte en contautu col alministrador de TI pa consiguir mas información, incluyíes les polítiques de privacidá de la to organización.</string>
   <string name="admin_has_ability_to_monitor_device">L\'alministrador de TI tien la capacidá de supervisar y xestionar los axustes, l\'accesu corporativu, les aplicaciones, los permisos y los datos asociaos con esti preséu, incluyida la to actividá na rede, amás de la llocalización del preséu, l\'historial de llamaes y l\'historial de busca de contautos.<xliff:g id="line_break">\n\n</xliff:g>Ponte en contautu col alministrador de TI pa consiguir mas información, incluyíes les polítiques de privacidá de la to organización.</string>
   <string name="navigation_button_description">Desplazase p\'arriba</string>
   <string name="something_went_wrong">Asocedió daqué malo</string>
diff --git a/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml b/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml
index efd660a..4ab0e2c 100644
--- a/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml
+++ b/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml
@@ -26,7 +26,6 @@
   <string name="the_following_is_your_mdm_for_device">Bydd yr ap canlynol yn rheoli dy ddyfais:</string>
   <string name="next">Nesaf</string>
   <string name="setting_up_workspace">Yn gosod y proffil gwaith\u2026</string>
-  <string name="admin_has_ability_to_monitor_profile">Mae gan dy weinyddwr TG y gallu i fonitro a rheoli\'r gosodiadau, mynediad corfforaethol, apiau, caniatâd, a data yn gysylltiedig â\'r proffil hwn, gan gynnwys dy weithgaredd rhwydwaith, yn ogystal â lleoliad dy ddyfais, hanes galwadau, a hanes chwilio cysylltiadau. <xliff:g id="line_break">\n\n</xliff:g>Cysyllta â dy weinyddwr TG am ragor o wybodaeth, gan gynnwys polisïau preifatrwydd dy sefydliad.</string>
   <string name="admin_has_ability_to_monitor_device">Mae gan dy weinyddwr TG y gallu i fonitro a rheoli\'r gosodiadau, mynediad corfforaethol, apiau, caniatâd, a data yn gysylltiedig â\'r ddyfais hon, gan gynnwys dy weithgaredd rhwydwaith, yn ogystal â lleoliad dy ddyfais, hanes galwadau, a hanes chwilio cysylltiadau. <xliff:g id="line_break">\n\n</xliff:g>Cysyllta â dy weinyddwr TG am ragor o wybodaeth, gan gynnwys polisïau preifatrwydd dy sefydliad.</string>
   <string name="theft_protection_disabled_warning">Er mwyn defnyddio nodweddion amddiffyn rhag lladrad, rhaid yn gyntaf gosod sgrin cloi gyda chyfrinair i ddiogelu dy ddyfais.</string>
   <string name="contact_your_admin_for_more_info">Cysyllta â dy weinyddwr TG am ragor o wybodaeth, gan gynnwys polisïau preifatrwydd y sefydliad.</string>
diff --git a/overlay/packages/apps/Settings/res/values-ast-rES/arrays.xml b/overlay/packages/apps/Settings/res/values-ast-rES/arrays.xml
index 5c8db64..abf3484 100644
--- a/overlay/packages/apps/Settings/res/values-ast-rES/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-ast-rES/arrays.xml
@@ -23,6 +23,12 @@
         <item>@string/dark_ui_auto_mode_custom</item>
         <item>@string/dark_ui_auto_mode_auto</item>
     </string-array>
+    <string-array name="dark_ui_scheduler_with_bedtime_preference_titles">
+        <item>@string/dark_ui_auto_mode_never</item>
+        <item>@string/dark_ui_auto_mode_custom</item>
+        <item>@string/dark_ui_auto_mode_auto</item>
+        <item>@string/dark_ui_auto_mode_custom_bedtime</item>
+    </string-array>
     <string-array name="wifi_tether_security">
         <item>@string/wifi_security_sae</item>
         <item>@string/wifi_security_psk_sae</item>
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 6251d1d..05afec2 100644
--- a/overlay/packages/apps/Settings/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-ast-rES/strings.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="smart_rotate_text_headline">La deteición facial usa la cámara d\'alantre p\'ameyorar la precisión del voltéu automáticu. Les imáxenes enxamás nun s\'atroxen o s\'unvien a Google.</string>
     <string name="font_size_save">D\'acuerdu</string>
     <string name="keywords_add_bt_device">bluetooth</string>
     <string name="connected_device_media_device_title">Preseos multimedia</string>
@@ -49,7 +48,7 @@
     <string name="lock_screen_pin_skip_message" product="default">Un PIN protexe\'l teléfonu si lu pierdes o lu roben</string>
     <string name="lock_screen_pattern_skip_message" product="default">Un patrón protexe\'l teléfonu si lu pierdes o lu roben</string>
     <string name="lock_screen_password_skip_message" product="default">Una contraseña protexe\'l teléfonu si lu pierdes o lu roben</string>
-    <string name="crypt_keeper_settings_title">Cifráu</string>
+    <string name="encryption_settings_title">Cifráu</string>
     <string name="face_unlock_set_unlock_pattern">Desbloquéu facial + patrón</string>
     <string name="face_unlock_set_unlock_pin">Desbloquéu facial + PIN</string>
     <string name="face_unlock_set_unlock_password">Desbloquéu facial + contraseña</string>
@@ -60,9 +59,6 @@
     <string name="android_beam_settings_title">Android Beam</string>
     <string name="wifi_settings_title">Wi\u2011Fi</string>
     <string name="wifi_subscription">Soscripción</string>
-    <string name="wifi_type_11AX">Wi\u2011Fi 6</string>
-    <string name="wifi_type_11AC">Wi\u2011Fi 5</string>
-    <string name="wifi_type_11N">Wi\u2011Fi 4</string>
     <string name="wifi_add_app_single_network_title">¿Quies guardar esta rede?</string>
     <string name="wifi_add_app_single_network_summary" product="default">«<xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g>» quier guardar una rede nel teléfonu</string>
     <string name="wifi_add_app_single_network_summary" product="tablet">«<xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g>» quier guardar una rede na tableta</string>
@@ -105,9 +101,7 @@
     <string name="accessibility_autoclick_short_summary">0,2 segundos</string>
     <string name="accessibility_autoclick_medium_summary">0,6 segundos</string>
     <string name="accessibility_autoclick_long_summary">1 segundu</string>
-    <string name="daltonizer_mode_deuteranomaly_title">Deuteranomalía</string>
-    <string name="daltonizer_mode_protanomaly_title">Protanomalía</string>
-    <string name="daltonizer_mode_tritanomaly_title">Tritanomalía</string>
+    <string name="daltonizer_mode_tritanomaly_summary">Tritanomalía</string>
     <plurals name="accessibilty_autoclick_delay_unit_second">
         <item quantity="one"><xliff:g id="click_delay_label" example="1">%1$s</xliff:g> segundu</item>
         <item quantity="other"><xliff:g id="click_delay_label" example="1">%1$s</xliff:g> segundos</item>
@@ -226,7 +220,6 @@
     <string name="memory_settings_title">Memoria</string>
     <string name="usb_switching">Cambiando\u2026</string>
     <string name="notification_log_channel">canal</string>
-    <string name="dark_ui_settings_dialog_acknowledge">Entendílo</string>
     <string name="assistant_gesture_category_title">Asistente dixital</string>
     <string name="left_edge">Berbesu esquierdu</string>
     <string name="right_edge">Berbesu derechu</string>
diff --git a/overlay/packages/apps/Settings/res/values-cy/arrays.xml b/overlay/packages/apps/Settings/res/values-cy/arrays.xml
index 0818432..dd75627 100644
--- a/overlay/packages/apps/Settings/res/values-cy/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-cy/arrays.xml
@@ -51,6 +51,12 @@
         <item>@string/dark_ui_auto_mode_custom</item>
         <item>@string/dark_ui_auto_mode_auto</item>
     </string-array>
+    <string-array name="dark_ui_scheduler_with_bedtime_preference_titles">
+        <item>@string/dark_ui_auto_mode_never</item>
+        <item>@string/dark_ui_auto_mode_custom</item>
+        <item>@string/dark_ui_auto_mode_auto</item>
+        <item>@string/dark_ui_auto_mode_custom_bedtime</item>
+    </string-array>
     <string-array name="lock_after_timeout_entries">
         <item>Ar unwaith</item>
         <item>5 eiliad</item>
@@ -380,17 +386,10 @@
     <string-array name="captioning_font_size_selector_titles">
         <item>Bach iawn</item>
         <item>Bach</item>
-        <item>Arferol</item>
+        <item>Canolig</item>
         <item>Mawr</item>
         <item>Mawr iawn</item>
     </string-array>
-    <string-array name="captioning_font_size_selector_summaries">
-        <item>Tesun maint bach iawn</item>
-        <item>Testun maint bach</item>
-        <item>Testun maint arferol</item>
-        <item>Testun maint mawr</item>
-        <item>Testun maint mawr iawn</item>
-    </string-array>
     <string-array name="captioning_edge_type_selector_titles">
         <item>Rhagosodiad</item>
         <item>Dim</item>
@@ -585,4 +584,9 @@
         <item>@string/rtt_settings_visible_during_call</item>
         <item>@string/rtt_settings_always_visible</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>Byth</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-cy/strings.xml b/overlay/packages/apps/Settings/res/values-cy/strings.xml
index 1457c67..40519e5 100644
--- a/overlay/packages/apps/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-cy/strings.xml
@@ -54,8 +54,6 @@
     <string name="font_size_summary">Gosod maint y testun sy\'n ymddangos ar y sgrin.</string>
     <string name="font_size_make_smaller_desc">Gwneud yn llai</string>
     <string name="font_size_make_larger_desc">Gwneud yn fwy</string>
-    <string name="auto_rotate_settings_primary_switch_title">Defnyddio Troi yn Awtomatig</string>
-    <string name="smart_rotate_text_headline">Mae Adnabod ag Wyneb yn defnyddio\'r camera blaen i wella cywirdeb Troi yn Awtomatig. Dyw lluniau byth yn cael eu cadw na\'u hanfon at Google.</string>
     <string name="font_size_preview_text_headline">Testun enghreifftiol</string>
     <string name="font_size_preview_text_title" translation_description="Title text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">        Llyfr Gwyn Rhydderch
     </string>
@@ -156,10 +154,10 @@
     <string name="bluetooth_pref_summary" product="device">Galluogi dy ddyfais i gyfathrebu â dyfeisiau Bluetooth gerllaw</string>
     <string name="bluetooth_pref_summary" product="default">Caniatáu i dy ffôn gyfathrebu â dyfeisiau Bluetooth gerllaw</string>
     <string name="bluetooth_disable_a2dp_hw_offload">Analluogi dadlwytho caledwedd Bluetooth A2DP</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title">Ailgychwyn y Ddyfais?</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message">Mae angen ailgychwyn dy ddyfais i newid yr osodiad hwn.</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Ailgychwyn</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Diddymu</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title">Ailgychwyn y Ddyfais?</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message">Mae angen ailgychwyn dy ddyfais i newid yr osodiad hwn.</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm">Ailgychwyn</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">Diddymu</string>
     <string name="connected_device_media_device_title">Dyfeisiau cyfryngau</string>
     <string name="connected_device_call_device_title">Dyfeisiau galw</string>
     <string name="connected_device_other_device_title">Dyfeisiau eraill</string>
@@ -220,6 +218,8 @@
     <string name="language_picker_title">Ieithoedd</string>
     <string name="locale_remove_menu">Tynnu</string>
     <string name="add_a_language">Ychwanegu iaith</string>
+    <string name="app_locale_preference_title">Iaith</string>
+    <string name="preference_of_system_locale_summary">Rhagosodiad y system</string>
     <plurals name="dlg_remove_locales_title">
         <item quantity="zero">Tynnu\'r ieithoedd a ddewiswyd?</item>
         <item quantity="one">Tynnu\'r iaith a ddewiswyd?</item>
@@ -336,9 +336,9 @@
     <string name="security_settings_title">Diogelwch</string>
     <string name="encryption_and_credential_settings_title">Amgryptio a thystnodiadau</string>
     <string name="encryption_and_credential_settings_summary" product="default">Ffôn wedi\'i amgryptio</string>
-    <string name="decryption_settings_summary" product="default">Ffôn heb ei amgryptio</string>
+    <string name="not_encrypted_summary" product="default">Ffôn heb ei amgryptio</string>
     <string name="encryption_and_credential_settings_summary" product="tablet">Dyfais wedi\'i hamgryptio</string>
-    <string name="decryption_settings_summary" product="tablet">Dyfais heb ei hamgryptio</string>
+    <string name="not_encrypted_summary" product="tablet">Dyfais heb ei hamgryptio</string>
     <string name="lockscreen_settings_title">Sgrin cloi</string>
     <string name="lockscreen_settings_what_to_show_category">Beth i\'w ddangos</string>
     <string name="security_settings_summary">Gosod Fy Lleoliad, sgrin datgloi, clo cerdyn SIM, clo storfa tyst-nodyn</string>
@@ -419,7 +419,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title">Gosoda ôl dy fys</string>
     <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_message">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_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_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>
@@ -452,7 +452,6 @@
     <string name="security_settings_fingerprint_v2_enroll_acquire_too_fast">Coda dy fys ar ôl teimlo dirgryniad</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_too_bright">Symuda i fan llai disglair a cheisio eto</string>
     <string name="security_settings_fingerprint_v2_enroll_error_max_attempts">Rwyt wedi cyrraedd y nifer mwyaf o gynigion a ganiateir</string>
-    <string name="security_settings_fingerprint_v2_home_screen">Defnyddia ôl dy fys i ddatgloi dy ffôn a dilysu mai ti sy\u2019n ei ddefnyddio, fel pan rwyt yn mewngofnodi i apiau\n\n<annotation id="url">Dysgu rhagor</annotation></string>
     <string name="security_settings_biometric_preference_title">Datgloi ag Wyneb ac Ôl Bys</string>
     <string name="security_settings_biometric_preference_summary_none_enrolled">Tapia i\'w osod</string>
     <string name="security_settings_biometric_preference_summary_both_fp_multiple">Ychwanegwyd wyneb ac olion bysedd</string>
@@ -497,12 +496,10 @@
     <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_udfps_enroll_edge_title">Yn olaf, defnyddia ochrau dy fys</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_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_message">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>
@@ -566,9 +563,6 @@
     <string name="fingerprint_enroll_button_add">Ychwanegu un arall</string>
     <string name="fingerprint_enroll_button_next">Nesaf</string>
     <string name="security_settings_fingerprint_enroll_disclaimer">Yn ogystal â datgloi dy ffôn, gellir hefyd defnyddio ôl dy fys i awdurdodi prynu pethau a chael mynediad at apiau. <annotation id="url">Dysgu mwy</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled">        Dyw\'r sgrin cloi heb ei alluogi. I ddysgu mwy, cysyllta â gweinyddwr dy sefydliad.
-        <annotation id="admin_details">Mwy o wybodaeth</annotation>\n\nMae dal yn bosib defnyddio ôl dy fys i awdurdodi mynediad apiau a phrynu pethau.
-        <annotation id="url">Dysgu mwy</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again">Coda dy fys, yna cyffyrdda\'r synhwyrydd eto</string>
     <string name="security_settings_fingerprint_bad_calibration">Methu â defnyddio\'r synhwyrydd ôl bys. Awgrymir cael arbenigwr i edrych arno.</string>
     <string name="fingerprint_add_max">Gellir ychwanegu hyd at <xliff:g id="count" example="5">%d</xliff:g> ôl bys</string>
@@ -581,39 +575,11 @@
     <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_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="crypt_keeper_settings_title">Amgryptiad</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet">Amgryptio\'r llechen</string>
-    <string name="crypt_keeper_encrypt_title" product="default">Amgryptio\'r ffôn</string>
-    <string name="crypt_keeper_encrypted_summary">Wedi’i amgryptio</string>
-    <string name="crypt_keeper_desc" product="tablet">Mae\'n bosib amgryptio dy gyfrifon, gosodiadau, apiau wedi\'u lawrlwytho a\'u data, cyfryngau, a ffeiliau eraill. Ar ôl amgryptio dy lechen, gan gymryd dy fod wedi gosod sgrin cloi (boed yn batrwm, PIN neu gyfrinair), bydd yn rhaid datgloi\'r sgrin i ddadgryptio\'r llechen pob tro mae\'n cael ei throi ymlaen. Yr unig ffordd arall i ddadgryptio yw ail-osod y ddyfais i fel yr oedd yn gadael y ffatri, gan golli dy holl ddata.\n\nMae amgryptio yn cymryd tuag awr neu\'n fwy o amser. Rhaid bod y batri yn llawn cyn dechrau a\'r llechen wedi ei gysylltu i brif ffynhonnell pŵer trwy gydol y broses. Os oes rhywbeth yn tarfu ar y broses, mae\'n bosib colli peth neu\'r cyfan o dy ddata.</string>
-    <string name="crypt_keeper_desc" product="default">Mae\'n bosib amgryptio dy gyfrifon, gosodiadau, apiau wedi\'u lawrlwytho a\'u data, cyfryngau, a ffeiliau eraill. Ar ôl amgryptio dy ffôn, gan gymryd dy fod wedi gosod sgrin cloi (boed yn batrwm, PIN neu gyfrinair), bydd yn rhaid datgloi\'r sgrin i ddadgryptio\'r ffôn pob tro mae\'n cael ei droi ymlaen. Yr unig ffordd arall i ddadgryptio yw ail-osod y ddyfais i fel yr oedd yn gadael y ffatri, gan golli dy holl ddata.\n\nMae amgryptio yn cymryd tuag awr neu\'n fwy o amser. Rhaid bod y batri yn llawn cyn dechrau a\'r ffôn wedi ei gysylltu i brif ffynhonnell pŵer trwy gydol y broses. Os oes rhywbeth yn tarfu ar y broses, mae\'n bosib colli peth neu\'r cyfan o dy ddata.</string>
-    <string name="crypt_keeper_button_text" product="tablet">Amgryptio\'r llechen</string>
-    <string name="crypt_keeper_button_text" product="default">Amgryptio\'r ffôn</string>
-    <string name="crypt_keeper_low_charge_text">Rhaid gwefru\'r batri a rhoi cynnig arall arni.</string>
-    <string name="crypt_keeper_unplugged_text">Cysyllta wefrydd a rhoi cynnig arall arni.</string>
-    <string name="crypt_keeper_dialog_need_password_title">Nid oes PIN na chyfrinair i\'r sgrin cloi</string>
-    <string name="crypt_keeper_dialog_need_password_message">Rhaid gosod PIN neu gyfrinair i\'r sgrin cloi cyn medru dechrau amgryptiad.</string>
-    <string name="crypt_keeper_confirm_title">Amgryptio?</string>
-    <string name="crypt_keeper_final_desc" product="tablet">Nid yw\'n bosib dadwneud y weithred amgryptio a bydd data yn cael ei golli os yw\'r amgryptiad yn cael ei stopio cyn cwblhau.
-Mae amgryptio yn cymryd awr neu\'n hirach a bydd y llechen yn ailgychwyn sawl tro yn ystod yr amser yna.    </string>
-    <string name="crypt_keeper_final_desc" product="default">Nid yw\'n bosib dadwneud y weithred amgryptio a bydd data yn cael ei golli os yw\'r amgryptiad yn cael ei stopio cyn cwblhau.
-Mae amgryptio yn cymryd awr neu\'n hirach a bydd y ffôn yn ailgychwyn sawl tro yn ystod yr amser yna.    </string>
-    <string name="crypt_keeper_setup_title">Yn amgryptio</string>
-    <string name="crypt_keeper_setup_description" product="tablet">Arhosa tra bod dy lechen yn cael ei hamgryptio. Wedi cwblhau <xliff:g id="percent" example="50">^1</xliff:g>%.</string>
-    <string name="crypt_keeper_setup_description" product="default">Arhosa tra bod dy ffôn yn cael ei amgryptio. Wedi cwblhau <xliff:g id="percent" example="50">^1</xliff:g>%.</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet">Arhosa tra bod dy lechen yn cael ei hamgryptio. Amser yn weddill: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_setup_time_remaining" product="default">Arhosa tra bod dy ffôn yn cael ei amgryptio. Amser yn weddill: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet">I ddatgloi\'r llechen, tro\'r ddyfais i ffwrdd ac yna ymlaen eto.</string>
-    <string name="crypt_keeper_force_power_cycle" product="default">I ddatgloi\'r ffôn, tro\'r ddyfais i ffwrdd ac yna ymlaen eto.</string>
-    <string name="crypt_keeper_warn_wipe">Rhybudd: Caiff dy ddyfais ei chlirio o\'i holl ddata ar ôl <xliff:g id="count" example="7">^1</xliff:g> ymdrech aflwyddiannus arall i\'w datgloi!    </string>
-    <string name="crypt_keeper_enter_password">Rho dy gyfrinair</string>
-    <string name="crypt_keeper_failed_title">Amgryptiad aflwyddiannus</string>
-    <string name="crypt_keeper_failed_summary" product="tablet">Cafodd y broses amgryptio ei dorri ar ei draws ac nid yw\'n bosib ei gwblhau. O ganlyniad, dyw data dy lechen ddim yn hygyrch bellach.\n\nI barhau defnyddio dy lechen, rhaid ei ailosod nôl i fel yr oedd wrth adael y ffatri. Pan wyt ti\'n gosod dy lechen ar ôl ei ailosod, mi fydd yn cynnig cyfle iti adfer unrhyw ddata cafodd ei gadw wrth gefn i dy gyfrif Google.    </string>
-    <string name="crypt_keeper_failed_summary" product="default">Cafodd y broses amgryptio ei dorri ar ei draws ac nid yw\'n bosib ei gwblhau. O ganlyniad, dyw data dy ffôn ddim yn hygyrch bellach.\n\nI barhau defnyddio dy ffôn, rhaid ei ailosod nôl i fel yr oedd wrth adael y ffatri. Pan wyt ti\'n gosod dy ffôn ar ôl ei ailosod, mi fydd yn cynnig cyfle iti adfer unrhyw ddata cafodd ei gadw wrth gefn i dy gyfrif Google.    </string>
-    <string name="crypt_keeper_data_corrupt_title">Dadamgryptiad aflwyddiannus</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet">Mae\'r cyfrinair a rhoddaist yn gywir, ond yn anffodus mae dy ddata yn llwgr.\n\nI barhau i ddefnyddio dy lechen, rhaid ei ailosod nôl i fel yr oedd yn gadael y ffatri.\n\nWrth osod dy lechen ar ôl ei ailosod, bydd cyfle i adfer unrhyw ddata a gafodd ei gadw fel copi wrth gefn ar dy gyfrif Google.</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default">Mae\'r cyfrinair a rhoddaist yn gywir, ond yn anffodus mae dy ddata yn llwgr.\n\nI barhau i ddefnyddio dy ffôn, rhaid ei ailosod nôl i fel yr oedd yn gadael y ffatri.\n\nWrth osod dy ffôn ar ôl ei ailosod, bydd cyfle i adfer unrhyw ddata a gafodd ei gadw fel copi wrth gefn ar dy gyfrif Google.</string>
-    <string name="crypt_keeper_switch_input_method">Newid dull mewnbwn</string>
+    <string name="encryption_settings_title">Amgryptiad</string>
+    <string name="encrypt_title" product="tablet">Amgryptio\'r llechen</string>
+    <string name="encrypt_title" product="default">Amgryptio\'r ffôn</string>
+    <string name="encrypted_summary">Wedi’i amgryptio</string>
+    <string name="no_screen_lock_issue_action_label">Gosod clo\'r sgrin</string>
     <string name="suggested_lock_settings_title">Diogela dy ffôn</string>
     <string name="suggested_lock_settings_summary" product="tablet">Gosoda sgrin cloi i warchod dy lechen</string>
     <string name="suggested_lock_settings_summary" product="device">Gosoda sgrin cloi i warchod dy ddyfais</string>
@@ -632,7 +598,6 @@
     <string name="setup_lock_settings_picker_message" product="device">Rhwystra eraill rhag defnyddio\'r ddyfais hon heb dy ganiatâd gan roi nodweddion diogelu\'r ddyfais ar waith. Dewisa pa sgrin cloi wyt ti am ei defnyddio.</string>
     <string name="setup_lock_settings_picker_message" product="default">Rhwystra eraill rhag defnyddio\'r ffôn hwn heb dy ganiatâd gan roi nodweddion diogelu\'r ddyfais ar waith. Dewisa pa sgrin cloi wyt ti am ei defnyddio.</string>
     <string name="lock_settings_picker_biometric_message">Dewisa dy ddull wrth gefn i gloi\'r sgrin</string>
-    <string name="lock_settings_picker_admin_restricted_personal_message">Ni ellir ailosod y clo hwn gan dy weinyddwr TG. <xliff:g id="link_begin" example="">LINK_BEGIN</xliff:g>Gosod clo gwaith ar wahân yn lle<xliff:g id="link_end" example="">LINK_END</xliff:g></string>
     <string name="lock_settings_picker_profile_message">Os fyddi di\'n anghofio\'r clo hwn, gofynna i dy weinyddwr TG ei ailosod</string>
     <string name="setup_lock_settings_options_button_label">Dewisiadau sgrin cloi</string>
     <string name="setup_lock_settings_options_dialog_title">Dewisiadau sgrin cloi</string>
@@ -714,10 +679,6 @@
     <string name="lock_last_pattern_attempt_before_wipe_profile">Os rwyt yn rhoi patrwm anghywir ar dy ymdrech nesaf caiff dy broffil gwaith a\'i ddata eu dileu</string>
     <string name="lock_last_pin_attempt_before_wipe_profile">Os rwyt yn rhoi PIN anghywir ar dy ymdrech nesaf caiff holl ddata\'r ddyfais ei ddileu</string>
     <string name="lock_last_password_attempt_before_wipe_profile">Os rwyt yn rhoi cyfrinair anghywir ar dy ymdrech nesaf caiff dy broffil gwaith a\'i ddata eu dileu</string>
-    <string name="lock_failed_attempts_now_wiping_device">Bu gormod o ymdrechion aflwyddiannus. Caiff data\'r ddyfais ei ddileu.</string>
-    <string name="lock_failed_attempts_now_wiping_user">Bu gormod o ymdrechion aflwyddiannus. Caiff y defnyddiwr hwn ei ddileu.</string>
-    <string name="lock_failed_attempts_now_wiping_profile">Bu gormod o ymdrechion aflwyddiannus. Caiff y proffil gwaith a\'i ddata eu dileu.</string>
-    <string name="lock_failed_attempts_now_wiping_dialog_dismiss">Diystyru</string>
     <plurals name="lockpassword_password_too_short">
         <item quantity="zero">Rhaid bod o leiaf <xliff:g id="count" example="3">%d</xliff:g> nodau</item>
         <item quantity="one">Rhaid bod o leiaf <xliff:g id="count" example="1">%d</xliff:g> nod</item>
@@ -1111,7 +1072,6 @@
     <string name="wifi_use_system_certs">Defnyddio tystysgrifau system</string>
     <string name="wifi_do_not_provide_eap_user_cert">Peidio â darparu</string>
     <string name="wifi_do_not_validate_eap_server">Peidio â dilysu</string>
-    <string name="wifi_do_not_validate_eap_server_warning">Ni roddwyd tystysgrif. Ni fydd dy gysylltiad yn breifat.</string>
     <string name="wifi_ssid_too_long">Mae\'r enw rhwydwaith yn rhy hir.</string>
     <string name="wifi_no_domain_warning">Rhaid rhoi parth.</string>
     <string name="wifi_no_user_cert_warning">Mae angen tystysgrif.</string>
@@ -1197,9 +1157,6 @@
     <string name="wifi_ip_settings_invalid_network_prefix_length">Rho hyd ragddodiad rhwydwaith rhwng 0 a 32.</string>
     <string name="wifi_gateway">Porth</string>
     <string name="wifi_network_prefix_length">Hyd rhagddodiad rhwydwaith</string>
-    <string name="wifi_type_11AX">Wi\u2011Fi 6</string>
-    <string name="wifi_type_11AC">Wi\u2011Fi 5</string>
-    <string name="wifi_type_11N">Wi\u2011Fi 4</string>
     <string name="wifi_p2p_settings_title">Llecyn Wi\u2011Fi</string>
     <string name="wifi_p2p_device_info">Gwybodaeth y ddyfais</string>
     <string name="wifi_p2p_persist_network">Cofio\'r cysylltiad hwn.</string>
@@ -1271,7 +1228,6 @@
     <string name="wifi_calling_mode_cellular_preferred_summary">Os nad yw rhwydwaith symudol ar gael, defnyddio Wi\u2011Fi</string>
     <string name="wifi_calling_mode_wifi_only_summary">Galw dros Wi\u2011Fi. Os gollir y Wi\u2011Fi, daw\u2019r alwad i ben.</string>
     <string name="wifi_calling_off_explanation">Tra bod galwadau Wi-Fi ymlaen, gall dy ffôn dargyfeirio galwadau trwy rwydweithiau Wi-Fi neu rwydwaith dy ddarparwr gwasanaeth symudol, yn dibynnu ar dy osodiadau a pha signal sy\'n gryfach ar y pryd. Cyn troi\'r nodwedd hon ymlaen, mae\'n syniad da gwirio gyda dy ddarparwr symudol am ffioedd a manylion eraill. <xliff:g id="additional_text" example="Learn More">%1$s</xliff:g></string>
-    <string name="emergency_address_title">Cyfeiriad Argyfwng</string>
     <string name="emergency_address_summary">Defnyddir fel dy leoliad os wyt yn gwneud galwad brys dros Wi\u2011Fi</string>
     <string name="private_dns_help_message"><annotation id="url">Dysgu mwy</annotation> am nodweddion DNS Preifat</string>
     <string name="private_dns_mode_on">Ymlaen</string>
@@ -1282,7 +1238,6 @@
     <string name="wifi_disconnected_from">Wedi datgysylltu o<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g></string>
     <string name="carrier">Darparwr gwasanaeth</string>
     <string name="display_settings_title">Dangosydd</string>
-    <string name="sound_settings">Sain</string>
     <string name="all_volume_title">Uchder sain</string>
     <string name="musicfx_title">Effeithiau sain</string>
     <string name="ring_volume_title">Maint sain caniad a hysbysu</string>
@@ -1457,7 +1412,6 @@
     <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_dream_start">Dechrau nawr</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>
@@ -1469,7 +1423,6 @@
     <string name="doze_always_on_summary">Defnydd uwch o\'r batri</string>
     <string name="force_bold_text">Testun trwm</string>
     <string name="title_font_size">Maint ffont</string>
-    <string name="short_summary_font_size">Gwneud testun yn fwy neu\'n llai o faint</string>
     <string name="sim_lock_settings">Gosodiadau cloi cerdyn SIM</string>
     <string name="sim_lock_settings_category">Clo\'r cerdyn SIM</string>
     <string name="sim_lock_settings_summary_off">I ffwrdd</string>
@@ -1520,7 +1473,6 @@
     <string name="firmware_version">Fersiwn Android</string>
     <string name="security_patch">Diweddariad diogelwch Android</string>
     <string name="model_info">Model</string>
-    <string name="hardware_info">Model a chaledwedd</string>
     <string name="hardware_revision">Fersiwn caledwedd</string>
     <string name="fcc_equipment_id">ID Offer</string>
     <string name="baseband_version">Fersiwn Baseband</string>
@@ -1641,7 +1593,6 @@
     <string name="storage_internal_title">Storfa\'r ddyfais</string>
     <string name="storage_external_title">Storfeydd datgysylltadwy</string>
     <string name="storage_size_large"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small></string>
-    <string name="storage_volume_used">wedi\'i ddefnyddio o <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
     <string name="storage_mount_success">Mae <xliff:g id="name" example="SD card">%1$s</xliff:g> wedi mowntio</string>
     <string name="storage_mount_failure">Methwyd â mowntio <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
     <string name="storage_unmount_success">Dadfowntwyd <xliff:g id="name" example="SD card">%1$s</xliff:g> yn ddiogel</string>
@@ -1797,15 +1748,14 @@
     <string name="reset_esim_error_msg">Ni ellir dileu SIMiau wedi eu lawrlwytho oherwydd gwall.\n\nAil-ddechreua dy ddyfais a cheisio eto.</string>
     <string name="main_clear_title">Dileu\'r holl ddata (ailosod i fel yr oedd yn gadael y ffatri)</string>
     <string name="main_clear_short_title">Dileu\'r holl ddata (ailosod i fel yr oedd yn gadael y ffatri)</string>
-    <string name="main_clear_desc" product="tablet">Bydd hyn yn dileu\'r holl ddata o <b>storfa fewnol</b> y llechen, gan gynnwys:\n\n<li>Dy gyfrif Google</li>\n<li>Data a gosodiadau system ac apiau</li>\n<li>Apiau wedi\'u lawrlwytho</li></string>
-    <string name="main_clear_desc" product="default">Bydd hyn yn dileu\'r holl ddata o <b>storfa fewnol</b> y ffôn, gan gynnwys:\n\n<li>Dy gyfrif Google</li>\n<li>Data a gosodiadau system ac apiau</li>\n<li>Apiau wedi\'u lawrlwytho</li></string>
-    <string name="main_clear_accounts" product="default">\n\nRwyt ar hyn o bryd wedi mewngofnodi i\'r cyfrifon hyn:\n</string>
-    <string name="main_clear_other_users_present" product="default">\n\nMae defnyddwyr eraill ar y ddyfais hon.\n</string>
-    <string name="main_clear_desc_also_erases_external"><li>Cerddoriaeth</li>\n<li>Lluniau</li>\n<li>Data arall y defnyddiwr</li></string>
-    <string name="main_clear_desc_also_erases_esim"><li>Cardiau eSIM</li></string>
-    <string name="main_clear_desc_no_cancel_mobile_plan">\n\nNi fydd hyn yn canslo dy gynllun gwasanaeth ffôn symudol.</string>
-    <string name="main_clear_desc_erase_external_storage" product="nosdcard">\n\nRhaid dileu\'r <b>storfa USB</b> er mwyn clirio cerddoriaeth, lluniau a data arall defnyddiwr.</string>
-    <string name="main_clear_desc_erase_external_storage" product="default">\n\nRhaid dileu\'r <b>cerdyn SD</b> er mwyn clirio cerddoriaeth, lluniau a data arall defnyddiwr.</string>
+    <string name="main_clear_desc" product="tablet">"Bydd hyn yn dileu'r holl ddata o <b>storfa fewnol</b> y llechen, gan gynnwys:\n\n<li>Dy gyfrif Google</li>\n<li>Data a gosodiadau system ac apiau</li>\n<li>Apiau wedi'u lawrlwytho</li>"</string>
+    <string name="main_clear_desc" product="default">"Bydd hyn yn dileu'r holl ddata o <b>storfa fewnol</b> y ffôn, gan gynnwys:\n\n<li>Dy gyfrif Google</li>\n<li>Data a gosodiadau system ac apiau</li>\n<li>Apiau wedi'u lawrlwytho</li>"</string>
+    <string name="main_clear_accounts" product="default">"\n\nRwyt ar hyn o bryd wedi mewngofnodi i'r cyfrifon hyn:\n"</string>
+    <string name="main_clear_other_users_present" product="default">"\n\nMae defnyddwyr eraill ar y ddyfais hon.\n"</string>
+    <string name="main_clear_desc_also_erases_external">"<li>Cerddoriaeth</li>\n<li>Lluniau</li>\n<li>Data arall y defnyddiwr</li>"</string>
+    <string name="main_clear_desc_also_erases_esim">"<li>Cardiau eSIM</li>"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard">"\n\nRhaid dileu'r <b>storfa USB</b> er mwyn clirio cerddoriaeth, lluniau a data arall defnyddiwr."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default">"\n\nRhaid dileu'r <b>cerdyn SD</b> er mwyn clirio cerddoriaeth, lluniau a data arall defnyddiwr."</string>
     <string name="erase_external_storage" product="nosdcard">Dileu popeth ar y storfa USB</string>
     <string name="erase_external_storage" product="default">Dileu popeth ar y cerdyn SD</string>
     <string name="erase_external_storage_description" product="nosdcard">Dileu\'r holl ddata ar y storfa USB mewnol, megis lluniau a cherddoriaeth</string>
@@ -1969,7 +1919,6 @@
     <string name="module_license_title">Trwyddedau diweddariad system Google Play</string>
     <string name="terms_title">Telerau ac amodau</string>
     <string name="webview_license_title">Trwydded system WebView</string>
-    <string name="wallpaper_attributions">Papurau wal</string>
     <string name="wallpaper_attributions_values">Darparwyr delweddau lleoren:\©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
     <string name="settings_manual_activity_title">Â llaw</string>
     <string name="settings_manual_activity_unavailable">Mae yna broblem wrth lwytho\'r llawlyfr.</string>
@@ -1986,15 +1935,6 @@
     <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_profile_pattern_header">Gosoda batrwm gwaith</string>
-    <string name="lockpassword_choose_password_description" product="phone">Am ddiogelwch ychwanegol, gosoda gyfrinair i ddatgloi\'r ffôn</string>
-    <string name="lockpassword_choose_pin_description" product="phone">Am ddiogelwch ychwanegol, gosoda PIN i ddatgloi\'r ffôn</string>
-    <string name="lockpattern_choose_pattern_description" product="phone">Am ddiogelwch ychwanegol, gosoda batrwm i ddatgloi\'r ffôn</string>
-    <string name="lockpassword_choose_password_description" product="tablet">Am ddiogelwch ychwanegol, gosoda gyfrinair i ddatgloi\'r llechen</string>
-    <string name="lockpassword_choose_pin_description" product="tablet">Am ddiogelwch ychwanegol, gosoda PIN i ddatgloi\'r llechen</string>
-    <string name="lockpattern_choose_pattern_description" product="tablet">Am ddiogelwch ychwanegol, gosoda batrwm i ddatgloi\'r llechen</string>
-    <string name="lockpassword_choose_password_description" product="default">Am ddiogelwch ychwanegol, gosoda gyfrinair i ddatgloi\'r ddyfais</string>
-    <string name="lockpassword_choose_pin_description" product="default">Am ddiogelwch ychwanegol, gosoda PIN i ddatgloi\'r ddyfais</string>
-    <string name="lockpattern_choose_pattern_description" product="default">Am ddiogelwch ychwanegol, gosoda batrwm i ddatgloi\'r ddyfais</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>
     <string name="lockpassword_choose_your_pin_message">Er diogelwch, gosoda PIN</string>
@@ -2169,9 +2109,9 @@
     <string name="internal_storage">Storfa fewnol</string>
     <string name="recompute_size">Yn ail-gyfrifo maint\u2026</string>
     <string name="clear_data_dlg_title">Dileu data\'r ap?</string>
-    <string name="clear_data_dlg_text">Caiff ddata\u2019r ap hwn ei ddileu yn barhaol. Mae hyn yn cynnwys ffeiliau, gosodiadau, cronfeydd data, a data arall yr ap.</string>
     <string name="dlg_ok">Iawn</string>
     <string name="dlg_cancel">Diddymu</string>
+    <string name="dlg_delete">Dileu</string>
     <string name="app_not_found_dlg_text"> Ni chanfuwyd yr ap yn y rhestr o apiau wedi\u2019u gosod.</string>
     <string name="clear_failed_dlg_text">Methwyd â chlirio storfa ar gyfer yr ap.</string>
     <string name="join_two_items"><xliff:g id="first_item">%1$s</xliff:g> a <xliff:g id="second_item">%2$s</xliff:g></string>
@@ -2353,7 +2293,6 @@
     <string name="audio_category_title">Sain</string>
     <string name="general_category_title">Cyffredinol</string>
     <string name="display_category_title">Dangosydd</string>
-    <string name="accessibility_text_and_display_title">Testun ac arddangos</string>
     <string name="accessibility_turn_screen_darker_title">Troi\'r sgrin yn dywyllach</string>
     <string name="interaction_control_category_title">Rheolaeth rhyngweithio</string>
     <string name="accessibility_tap_assistance_title">Rheolaeth amseru</string>
@@ -2380,11 +2319,14 @@
     <string name="accessibility_magnification_switch_shortcut_title">Newid i\'r botwm hygyrchedd?</string>
     <string name="accessibility_magnification_switch_shortcut_message">Mae tapio teirgwaith i chwyddo rhan o\'r sgrin yn achosi oedi wrth deipio a gwneud ambell beth arall.\nMae\'r botwm hygyrchedd yn arnofio ar y sgrin dros apiau eraill. Tapia arno i chwyddo.</string>
     <string name="accessibility_magnification_switch_shortcut_positive_button">Newid i\'r botwm hygyrchedd</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">Diddymu</string>
     <string name="accessibility_magnification_service_settings_title">Gosodiadau chwyddhad</string>
     <string name="accessibility_screen_magnification_gestures_title">Chwyddo wrth dapio teirgwaith</string>
     <string name="accessibility_screen_magnification_navbar_title">Chwyddo gyda llwybr byr</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture">Chwyddo gyda llwybr byr a thap triphlyg</string>
     <string name="accessibility_introduction_title">Ynghylch <xliff:g id="service" example="Select to Speak">%1$s</xliff:g></string>
+    <string name="accessibility_text_reading_reset_button_title">Ailosod gosodiadau</string>
+    <string name="accessibility_text_reading_confirm_dialog_reset_button">Ailosod</string>
     <string name="accessibility_screen_option">Dewisiadau</string>
     <string name="accessibility_preference_magnification_summary">Chwyddo i mewn ar y sgrin</string>
     <string name="accessibility_screen_magnification_short_summary">Tapio 3 gwaith i chwyddo</string>
@@ -2437,8 +2379,6 @@
     <string name="accessibility_button_gesture_footer_learn_more_content_description">Dysgu mwy am y botwm ac ystum hygyrchedd</string>
     <string name="accessibility_button_intro">Yn defnyddio\'r botwm hygyrchedd. Dyw\u2019r ystum ddim ar gael gyda llywio tri botwm.</string>
     <string name="accessibility_button_summary">Cael nodweddion hygyrchedd yn gyflym</string>
-    <string name="accessibility_button_gesture_description">Cewch fynediad at nodweddion hygyrchedd o unrhyw sgrin.\nI ddechrau arni, dewisa nodwedd o\'r gosodiadau hygyrchedd. Tapia ar y llwybr byr a dewis y botwm hygyrchedd neu ystum.</string>
-    <string name="accessibility_button_description">Cewch fynediad at nodweddion hygyrchedd o unrhyw sgrin.\nI ddechrau arni, dewisa nodwedd o\'r gosodiadau hygyrchedd. Tapia ar y llwybr byr a dewis y botwm hygyrchedd.</string>
     <string name="accessibility_button_location_title">Lleoliad</string>
     <string name="accessibility_button_size_title">Maint</string>
     <string name="accessibility_button_opacity_title">Tryloywder pan nad yw\'n cael ei ddefnyddio</string>
@@ -2464,22 +2404,11 @@
     <string name="accessibility_control_timeout_about_title">Ynghylch amser i weithredu (terfyn amser hygyrchedd)</string>
     <string name="accessibility_control_timeout_footer_learn_more_content_description">Dysgu rhagor am amser i weithredu (terfyn amser hygyrchedd)</string>
     <string name="accessibility_control_timeout_preference_title">Cyfnod i weithredu</string>
-    <string name="accessibility_control_timeout_preference_summary">Dewisa pa mor hir i ddangos negeseuon sy\u2019n gofyn i ti wneud rhywbeth ond sydd ond i\u2019w gweld am gyfnod byr.\n\nNid yw pob ap yn cefnogi hyn.</string>
     <string name="accessibility_long_press_timeout_preference_title">Oediad cyffwrdd a dal</string>
-    <string name="accessibility_display_inversion_preference_title">Gwrthdroi lliwiau</string>
-    <string name="accessibility_display_inversion_switch_title">Defnyddio gwrthdroi lliwiau</string>
+    <string name="accessibility_display_inversion_preference_title">Gwrthdroad lliwiau</string>
+    <string name="accessibility_display_inversion_switch_title">Defnyddio gwrthdroad lliwiau</string>
     <string name="accessibility_display_inversion_shortcut_title">Llwybr byr i wrthdroi lliwiau</string>
-    <string name="accessibility_display_inversion_preference_subtitle"><![CDATA[Mae gwrthdroad lliwiau yn troi sgrin golau yn dywyll.<br/><br/>
-        Nodyn:
-        <ol>
-            <li>\u00a0Mae gwrthdroad lliwiau hefyd yn troi sgrin dywyll yn olau.</li>
-            <li>\u00a0Bydd lliwiau yn newid mewn cyfryngau a delweddau.</li>
-            <li>\u00a0Gellir defnyddio thema dywyll i ddangos cefndir tywyll. Mae thema dywyll yn gweithio gydag apiau a chefnogir. Mae gwrthdroad lliwiau yn gweithio gyda phob ap.</li>
-        </ol>
-        ]]></string>
     <string name="accessibility_autoclick_preference_title">Awtoglicio (amser trigo)</string>
-    <string name="accessibility_autoclick_description">Mae awtoglicio yn gweithio gyda llygoden wedi\'i chysylltu. Gellir gosod pwyntydd y llygoden i glicio\'n awtomatig pan fo\'n stopio symud am gyfnod penodol o amser.</string>
-    <string name="accessibility_autoclick_default_title">I ffwrdd</string>
     <string name="accessibility_autoclick_short_title">Byr</string>
     <string name="accessibility_autoclick_short_summary">0.2 eiliad</string>
     <string name="accessibility_autoclick_medium_title">Canolig</string>
@@ -2490,12 +2419,15 @@
     <string name="accessibility_autoclick_shorter_desc">Byrach</string>
     <string name="accessibility_autoclick_longer_desc">Hirach</string>
     <string name="accessibility_autoclick_seekbar_desc">Amser awtoglicio</string>
-    <string name="accessibility_vibration_settings_title">Cryfder dirgrynu a habtig</string>
-    <string name="accessibility_notification_vibration_title">Dirgryniad hysbysiadau</string>
+    <string name="accessibility_vibration_settings_state_on">Ymlaen</string>
+    <string name="accessibility_vibration_settings_state_off">I ffwrdd</string>
+    <string name="accessibility_call_vibration_category_title">Galwadau</string>
     <string name="accessibility_ring_vibration_title">Dirgryniad galwad ffôn</string>
+    <string name="accessibility_notification_vibration_title">Dirgryniad hysbysiadau</string>
     <string name="accessibility_touch_vibration_title">Adborth cyffyrddiadau</string>
     <string name="accessibility_service_primary_switch_title">Defnyddio <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
     <string name="accessibility_service_primary_open_title">Agor <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
+    <string name="accessibility_quick_settings_tooltip_dismiss">Diystyru</string>
     <string name="accessibility_daltonizer_primary_switch_title">Defnyddio cywiriad lliw</string>
     <string name="accessibility_daltonizer_shortcut_title">Llwybr byr i gywiro lliwiau</string>
     <string name="accessibility_daltonizer_about_title">Ynghylch cywiro lliwiau</string>
@@ -2507,7 +2439,6 @@
     <string name="captioning_caption_appearance_title">Maint ac arddull capsiynau</string>
     <string name="captioning_caption_appearance_summary">Maint tesun <xliff:g id="accessibility_font_size" example="Large">%1$s</xliff:g></string>
     <string name="captioning_more_options_title">Rhagor o ddewisiadau</string>
-    <string name="accessibility_caption_preference_summary">Dyw pob ap ddim yn cefnogi\'r dewisiadau capsiynau hyn</string>
     <string name="accessibility_shortcut_type_software">Botwm hygyrchedd</string>
     <string name="accessibility_shortcut_type_software_gesture">llusgo 2 fys o\'r gwaelod</string>
     <string name="accessibility_shortcut_type_hardware">Dal bysellau sain</string>
@@ -2516,8 +2447,6 @@
     <string name="accessibility_hearingaid_title">Teclynnau clyw</string>
     <string name="accessibility_hearingaid_not_connected_summary">Dim teclynnau clyw wedi\'u cysylltu</string>
     <string name="accessibility_hearingaid_adding_summary">Ychwanegu teclynnau cymorth clyw</string>
-    <string name="accessibility_hearingaid_pair_instructions_message">I baru dy gymorth clyw, dewisa dy ddyfais ar y sgrin nesaf. Sicrha fod dy gymorth clyw ym modd paru.</string>
-    <string name="accessibility_hearingaid_active_device_summary"><xliff:g id="device_name">%1$s</xliff:g> yn weithredol</string>
     <plurals name="show_number_hearingaid_count">
         <item quantity="zero"><xliff:g id="number_device_count">%1$d</xliff:g> teclyn clyw wedi\'u cadw</item>
         <item quantity="one"><xliff:g id="number_device_count">%1$d</xliff:g> teclyn clyw wedi\'i gadw</item>
@@ -2534,14 +2463,11 @@
     <string name="accessibility_description_state_stopped">Dyw\'r gwasanaeth ddim yn gweithio\'n iawn.</string>
     <string name="accessibility_shortcuts_settings_title">Llwybrau byr hygyrchedd</string>
     <string name="enable_quick_setting">Dangos yng Ngosodiadau Cyflym</string>
-    <string name="daltonizer_type">Modd cywiro</string>
-    <string name="daltonizer_mode_deuteranomaly_title">Diwteranomaledd</string>
-    <string name="daltonizer_mode_protanomaly_title">Protanomaledd</string>
-    <string name="daltonizer_mode_tritanomaly_title">Tritanomaledd</string>
+    <string name="daltonizer_mode_deuteranomaly_title">Coch-gwyrdd</string>
+    <string name="daltonizer_mode_protanomaly_title">Coch-gwyrdd</string>
+    <string name="daltonizer_mode_tritanomaly_title">Glas-melyn</string>
     <string name="daltonizer_mode_grayscale_title">Graddlwyd</string>
-    <string name="daltonizer_mode_deuteranomaly_summary">Coch-gwyrdd</string>
-    <string name="daltonizer_mode_protanomaly_summary">Coch-gwyrdd</string>
-    <string name="daltonizer_mode_tritanomaly_summary">Glas-melyn</string>
+    <string name="daltonizer_mode_tritanomaly_summary">Tritanomaledd</string>
     <string name="reduce_bright_colors_intensity_preference_title">Tanbeidrwydd</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay">
         <item quantity="zero">Byr (<xliff:g id="click_delay_label" example="200">%1$s</xliff:g> eiliadau)</item>
@@ -2575,15 +2501,6 @@
         <item quantity="many"><xliff:g id="click_delay_label" example="1">%1$s</xliff:g> eiliad</item>
         <item quantity="other"><xliff:g id="click_delay_label" example="1">%1$s</xliff:g> eiliad</item>
     </plurals>
-    <string name="accessibility_vibration_summary">Canu <xliff:g id="summary_ring" example="Medium">%1$s</xliff:g>, hysbysiadau <xliff:g id="summary_notification" example="Low">%2$s</xliff:g>, cyffwrdd <xliff:g id="summary_touch" example="High">%3$s</xliff:g></string>
-    <string name="accessibility_vibration_summary_off">Canu a hysbysiadau i ffwrdd</string>
-    <string name="accessibility_vibration_summary_low">Canu a hysbysiadau ar lefel isel</string>
-    <string name="accessibility_vibration_summary_medium">Canu a hysbysiadau ar lefel canolig</string>
-    <string name="accessibility_vibration_summary_high">Canu a hysbysiadau ar lefel uchel</string>
-    <string name="accessibility_vibration_intensity_off">I ffwrdd</string>
-    <string name="accessibility_vibration_intensity_low">Isel</string>
-    <string name="accessibility_vibration_intensity_medium">Canolig</string>
-    <string name="accessibility_vibration_intensity_high">Uchel</string>
     <string name="accessibility_menu_item_settings">Gosodiadau</string>
     <string name="accessibility_feature_state_on">Ymlaen</string>
     <string name="accessibility_feature_state_off">I ffwrdd</string>
@@ -2620,11 +2537,6 @@
     <string name="enable_service_title">Caniatáu <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i gael rheolaeth lwyr o dy ddyfais?</string>
     <string name="capabilities_list_title">Mae ar <xliff:g id="service" example="TalkBack">%1$s</xliff:g> angen:</string>
     <string name="touch_filtered_warning">Gan fod ap yn cymylu cais am ganiatâd, ni all Gosodiadau dilysu dy ymateb.</string>
-    <string name="enable_service_encryption_warning">Os wyt yn troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> ymlaen, ni fydd dy ddyfais yn defnyddio\'r sgrin cloi i wella amgryptiad data.</string>
-    <string name="secure_lock_encryption_warning">Gan dy fod wedi troi gwasanaeth hygyrchedd ymlaen, ni fydd dy ddyfais yn defnyddio dy glo sgrin i wella amgryptiad data.</string>
-    <string name="enable_service_pattern_reason">Gan fod troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i ffwrdd yn effeithio ar dy amgryptiad data, rhaid cadarnhau dy batrwm.    </string>
-    <string name="enable_service_pin_reason">Gan fod troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i ffwrdd yn effeithio ar dy amgryptiad data, rhaid cadarnhau dy PIN.    </string>
-    <string name="enable_service_password_reason">Gan fod troi <xliff:g id="service" example="TalkBack">%1$s</xliff:g> i ffwrdd yn effeithio ar dy amgryptiad data, rhaid cadarnhau dy gyfrinair.    </string>
     <string name="accessibility_service_warning">Mae <xliff:g id="service" example="TalkBack">%1$s</xliff:g> yn gofyn am reolaeth lwyr o\u2019r ddyfais hon. Gall y gwasanaeth darllen y sgrin a gweithredu ar ran defnyddwyr gydag anghenion hygyrchedd.
 Dyw\u2019r lefel hyn o reolaeth ddim yn briodol ar gyfer y mwyafrif o apiau.</string>
     <string name="accessibility_service_warning_description">Mae rheolaeth lwyr yn briodol ar gyfer apiau sy\u2019n dy helpu gydag anghenion hygyrchedd, ond nid i\u2019r mwyafrif o apiau.</string>
@@ -2970,6 +2882,8 @@
     <string name="menu_stats_refresh">Ail-lwytho</string>
     <string name="process_mediaserver_label">Mediaserver</string>
     <string name="process_dex2oat_label">Optimeiddiad apiau</string>
+    <string name="process_network_tethering">Tenynnu</string>
+    <string name="process_removed_apps">Apiau wedi eu tynnu</string>
     <string name="battery_saver">Arbedwr Batri</string>
     <string name="battery_saver_auto_title">Troi ymlaen yn awtomatig</string>
     <string name="battery_saver_auto_no_schedule">Dim amserlen</string>
@@ -3206,14 +3120,6 @@
     <string name="remove_account_failed">Nid yw dy weinyddwr yn caniatáu\'r newid hwn</string>
     <string name="cant_sync_dialog_title">Methu â chysoni â llaw</string>
     <string name="cant_sync_dialog_message">Mae cysoni ar gyfer yr eitem hon wedi\'i analluogi. I newid y gosodiad, tro data cefndirol a chysoni awtomatig ymlaen am gyfnod dros dro.</string>
-    <string name="enter_password">I ddechrau Android, rho dy gyfrinair</string>
-    <string name="enter_pin">I ddechrau Android, rho dy PIN</string>
-    <string name="enter_pattern">I ddechrau Android, llunia dy batrwm</string>
-    <string name="cryptkeeper_wrong_pattern">Patrwm Anghywir</string>
-    <string name="cryptkeeper_wrong_password">Cyfrinair Anghywir</string>
-    <string name="cryptkeeper_wrong_pin">PIN Anghywir</string>
-    <string name="checking_decryption">Yn gwirio\u2026</string>
-    <string name="starting_android">Yn dechrau Android\u2026</string>
     <string name="delete">Dileu</string>
     <string name="misc_files">Ffeiliau amrywiol</string>
     <string name="misc_files_selected_count">dewiswyd <xliff:g id="number" example="3">%1$d</xliff:g> allan o <xliff:g id="total" example="15">%2$d</xliff:g></string>
@@ -3309,8 +3215,6 @@
     <string name="data_usage_metered_yes">Wedi\'i mesur</string>
     <string name="data_usage_metered_no">Heb ei mesur</string>
     <string name="data_usage_disclaimer">Mae\'n bosib y bydd cyfrif data\'r darparwr yn wahanol i gyfrif dy ddyfais.</string>
-    <string name="cryptkeeper_emergency_call">Galwad brys</string>
-    <string name="cryptkeeper_return_to_call">Dychwelyd i\'r alwad</string>
     <string name="vpn_name">Enw</string>
     <string name="vpn_type">Math</string>
     <string name="vpn_server">Cyfeiriad gweinydd</string>
@@ -3410,22 +3314,6 @@
         <item quantity="many">Ymddiried yn neu dynnu tystysgrifau</item>
         <item quantity="other">Ymddiried yn neu dynnu tystysgrifau</item>
     </plurals>
-    <plurals name="ssl_ca_cert_info_message_device_owner">
-        <item quantity="zero">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy ddyfais. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith dy ddyfais, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="one">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrif awdurdod ar gyfer dy ddyfais. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith dy ddyfais, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrif hon, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="two">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy ddyfais. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith dy ddyfais, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="few">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy ddyfais. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith dy ddyfais, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="many">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy ddyfais. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith dy ddyfais, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="other">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy ddyfais. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith dy ddyfais, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message">
-        <item quantity="zero">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrif awdurdod ar gyfer dy broffil gwaith. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith gwaith, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y dystysgrif hon, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="one">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrif awdurdod ar gyfer dy broffil gwaith. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith gwaith, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y dystysgrif hon, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="two">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy broffil gwaith. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith gwaith, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="few">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy broffil gwaith. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith gwaith, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="many">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy broffil gwaith. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith gwaith, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-        <item quantity="other">Mae <xliff:g id="managing_domain">%s</xliff:g> wedi gosod tystysgrifau awdurdod ar gyfer dy broffil gwaith. Mae\'n bosib y bydd yn eu caniatáu i fonitro gweithgareddau rhwydwaith gwaith, gan gynnwys e-bost, apiau, a gwefannau diogel.\n\nAm ragor o wybodaeth am y tystysgrifau hyn, cysyllta â\'r gweinyddwr.</item>
-    </plurals>
     <string name="ssl_ca_cert_warning_message">Mae gan drydydd parti y gallu i fonitro gweithgaredd dy rwydwaith, gan gynnwys e-bost, apiau a gwefannau diogel.\n\nMae tyst-nodyn dibynadwy ar dy ddyfais yn gwneud hyn yn bosib.</string>
     <plurals name="ssl_ca_cert_settings_button">
         <item quantity="zero">Gwirio tystysgrifau</item>
@@ -3441,14 +3329,12 @@
     <string name="user_settings_footer_text" product="default">Rhanna dy ffôn gan ychwanegu defnyddwyr newydd. Bydd gan bob defnyddiwr lle personol ar dy ffôn ar gyfer sgriniau Cartref, cyfrifon, apiau, gosodiadau eu hunain, a mwy.</string>
     <string name="user_list_title">Defnyddwyr a phroffiliau</string>
     <string name="user_add_user_or_profile_menu">Ychwanegu defnyddiwr neu broffil</string>
-    <string name="user_add_user_menu">Ychwanegu defnyddiwr</string>
     <string name="user_summary_restricted_profile">Proffil cyfyngedig</string>
     <string name="user_summary_not_set_up">Heb ei osod</string>
     <string name="user_summary_restricted_not_set_up">Heb ei osod - Proffil cyfyngedig</string>
     <string name="user_summary_managed_profile_not_set_up">Heb ei osod - Proffil gwaith</string>
     <string name="user_admin">Gweinyddwr</string>
     <string name="user_you">Ti (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
-    <string name="user_add_max_count">Gellir ychwanegu hyd at <xliff:g id="user_count">%1$d</xliff:g> defnyddiwr</string>
     <string name="user_cannot_manage_message" product="tablet">Dim ond perchennog y llechen gall rheoli defnyddwyr.</string>
     <string name="user_cannot_manage_message" product="default">Dim ond perchennog y ffôn gall rheoli defnyddwyr.</string>
     <string name="user_cannot_add_accounts_message">Ni all proffiliau cyfyngedig ychwanegu cyfrifon</string>
@@ -3467,9 +3353,6 @@
     <string name="user_adding_new_user">Yn ychwanegu defnyddiwr newydd\u2026</string>
     <string name="user_delete_user_description">Dileu\'r defnyddiwr</string>
     <string name="user_delete_button">Dileu</string>
-    <string name="user_guest">Gwestai</string>
-    <string name="user_exit_guest_title">Tynnu gwestai</string>
-    <string name="user_exit_guest_confirm_title">Tynnu\'r gwestai?</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="user_enable_calling">Troi galwadau ffôn ymlaen</string>
@@ -3486,12 +3369,12 @@
     <string name="apps_with_restrictions_header">Apiau gyda chyfyngiadau</string>
     <string name="apps_with_restrictions_settings_button">Ehangu\'r gosodiadau ar gyfer yr ap</string>
     <string name="nfc_payment_settings_title">Taliadau di-gyffwrdd</string>
+    <string name="nfc_more_details">Dysgu mwy</string>
     <string name="nfc_payment_how_it_works">Sut mae\'n gweithio</string>
     <string name="nfc_payment_no_apps">Tala gyda dy ffôn mewn siopau</string>
     <string name="nfc_payment_default">Ap talu arferol</string>
     <string name="nfc_payment_default_not_set">Heb ei osod</string>
     <string name="nfc_payment_app_and_desc"><xliff:g id="app">%1$s</xliff:g> - <xliff:g id="description">%2$s</xliff:g></string>
-    <string name="nfc_payment_use_default">Defnyddio\'r rhagosodiad</string>
     <string name="nfc_payment_favor_default">Pob tro</string>
     <string name="nfc_payment_favor_open">Oni bai bod ap talu arall ar agor</string>
     <string name="nfc_payment_pay_with">Wrth derfynell digyffwrdd, talu gyda:</string>
@@ -3508,11 +3391,12 @@
     </string>
     <string name="nfc_payment_btn_text_set_deault">Gosod fel rhagosodiad</string>
     <string name="nfc_payment_btn_text_update">Diweddariad</string>
+    <string name="nfc_work_text">Gwaith</string>
     <string name="restriction_settings_title">Rhwystrau</string>
     <string name="restriction_menu_reset">Cyfyngiadau rhwydwaith</string>
     <string name="restriction_menu_change_pin">Newid PIN</string>
     <string name="help_label">Cymorth ac adborth</string>
-    <string name="support_summary">Erthyglau cymorth, ffôn a sgwrsio</string>
+    <string name="support_summary" product="default">Erthyglau cymorth, ffôn a sgwrsio</string>
     <string name="user_account_title">Cyfrif ar gyfer cynnwys</string>
     <string name="user_picture_title">ID Llun</string>
     <string name="extreme_threats_title">Bygythiadau eithafol</string>
@@ -3576,7 +3460,6 @@
     <string name="sim_cellular_data_unavailable">Dyw data symudol ddim ar gael.</string>
     <string name="sim_cellular_data_unavailable_summary">Tapia i ddewis SIM data</string>
     <string name="sim_calls_always_use">Defnyddio hwn bob tro ar gyfer galwadau</string>
-    <string name="select_sim_for_data">Dewis SIM ar gyfer data</string>
     <string name="select_sim_for_sms">Dewisa SIM ar gyfer SMS</string>
     <string name="data_switch_started">Yn newid SIM data. Gall hyn gymryd munud\u2026</string>
     <string name="select_sim_for_calls">Galw gyda</string>
@@ -3641,7 +3524,6 @@
     <string name="keywords_wifi">wifi, wi-fi, cysylltiad rhwydwaith, rhyngrwyd, di-wifr, data, wi fi, cysylltiad, rhwydwaith, diwifr, di wifr, network</string>
     <string name="keywords_wifi_notify_open_networks">Hysbyisad Wi\u2011Fi, hysbysiad wifi</string>
     <string name="keywords_wifi_data_usage">defnydd data</string>
-    <string name="keywords_vibrate_on_touch">Stopio dirgrynu, tapio, bysellfwrdd</string>
     <string name="keywords_time_format">Defnyddio fformat 24 awr</string>
     <string name="keywords_storage_files">Lawrlwytho</string>
     <string name="keywords_app_default">Agor gyda</string>
@@ -3670,11 +3552,9 @@
     <string name="keywords_network_reset">ailosod, ail-osod, ffatri</string>
     <string name="keywords_factory_data_reset">weipio, clirio, dileu, ailosod, dadosod, ffatri, tynnu</string>
     <string name="keywords_printing">argraffydd</string>
-    <string name="keywords_sounds">seinydd, sain, uchder, lefel, bip, tawel, diwstaw, distewi, distawrwydd, sŵn, swn, cerddoriaeth, miwsig</string>
     <string name="keywords_sounds_and_notifications_interruptions">dim tarfu, tarfu, ymyrryd, torriad</string>
     <string name="keywords_app">RAM</string>
     <string name="keywords_location">gerllaw, lleol, agos, cyfagos, lleoliad, hanes, adrodd, GPS</string>
-    <string name="keywords_accounts">cyfrif, ychwanegu gyfrif, proffil gwaith, ychwanegu cyfrif, account, add an account, work profile, add account</string>
     <string name="keywords_users">rhwystr, rhwystro, rhwystrwyd</string>
     <string name="keywords_keyboard_and_ime">cywiro testun, cywiriad sillafu, cywiro, sain, dirgrynu, awto, iaith, ystum, awgrym, awgrymiad, awgrymu, thema, gair, math, emoji, gwenoglun, rhyngwladol</string>
     <string name="keywords_reset_apps">ailosod, dewisiadau, rhagosod, rhagosodedig</string>
@@ -3720,7 +3600,6 @@
     <string name="keywords_hotspot_tethering">tenynnu USB, tenyn USB, rhwymo bluetooth, bluetooth, llecyn, wifi hotspot, llecyn wifi, llecyn wi-fi, wi-fi hotspot</string>
     <string name="keywords_touch_vibration">haptics, habtig, habtigau, dirgrynu, sgrin, dangosydd, sensitifrwydd</string>
     <string name="keywords_ring_vibration">haptics, habtig, habtigau, dirgrynu, ffôn, ffon, galw, galwad, galwadau, sensitifrwydd, canu</string>
-    <string name="keywords_notification_vibration">haptics, habtig, habtigau, dirgrynu, sensitifrwydd</string>
     <string name="keywords_battery_saver_sticky">arbedwr batri, sticky, gludog, gludiog, arbed pwer, arbed pŵer, batri</string>
     <string name="keywords_battery_saver_schedule">arfer, amserlen, arbedwr batri, arbedwr pŵer, batri, awtomatig, canran</string>
     <string name="keywords_enhance_4g_lte">volte, galwadau uwch, galwadau 4g, galw 4g</string>
@@ -3755,8 +3634,6 @@
     <string name="docking_sounds_title">Synau docio</string>
     <string name="touch_sounds_title">Seiniau cyffwrdd</string>
     <string name="vibrate_icon_title">Dangos yr eicon o hyd pan ym modd dirgrynu</string>
-    <string name="vibrate_on_touch_title">Dirgrynu ar gyffwrdd</string>
-    <string name="vibrate_on_touch_summary">Adborth habtig am dapio, bysellfwrdd, a mwy</string>
     <string name="dock_audio_media_title">Seinydd y doc yn chwarae</string>
     <string name="dock_audio_media_disabled">Pob sain</string>
     <string name="dock_audio_media_enabled">Sain cyfryngau yn unig</string>
@@ -3766,6 +3643,7 @@
     <string name="boot_sounds_title">Synau wrth droi ymlaen</string>
     <string name="live_caption_title">Capisynau Byw</string>
     <string name="live_caption_summary">Isdeitlo cyfryngau yn awtomatig</string>
+    <string name="spatial_summary_off">I ffwrdd</string>
     <string name="zen_mode_settings_title">Dim Tarfu</string>
     <string name="zen_mode_settings_summary">Cael hysbysiadau dim ond gan bobol ac apiau pwysig</string>
     <string name="zen_mode_slice_subtitle">Cyfyngu ymyriadau</string>
@@ -3888,6 +3766,7 @@
     <string name="app_notification_field_summary">Rheoli hysbysiadau o apiau unigol</string>
     <string name="advanced_section_header">Cyffredinol</string>
     <string name="profile_section_header">Hysbysiadau gwaith</string>
+    <string name="profile_section_header_for_advanced_privacy">Proffil gwaith</string>
     <string name="smart_notifications_title">Hysbysiadau addasol</string>
     <string name="asst_capability_prioritizer_title">Blaenoriaeth hysbysiadau addasol</string>
     <string name="asst_capability_prioritizer_summary">Gosod hysbysiadau blaenoriaeth is yn awtomatig i Tyner</string>
@@ -3953,6 +3832,7 @@
     <string name="keywords_lockscreen_bypass">Sgrin cloi, sgrincloi, sgrin gloi, sgrîn cloi, neidio, osgoi</string>
     <string name="locked_work_profile_notification_title">Pan mae\'r proffil gwaith ar glo</string>
     <string name="lock_screen_notifs_title">Hysbysiadau ar y sgrin cloi</string>
+    <string name="lock_screen_notifs_show_all_summary">Dangos sgyrsiau, rhagosodedig a tawel</string>
     <string name="lock_screen_notifs_show_all">Dangos sgyrsiau, rhagosodedig a tawel</string>
     <string name="lock_screen_notifs_show_alerting">Cuddio sgyrsiau a hysbysiadau tawel</string>
     <string name="lock_screen_notifs_show_none">Peidio â dangos unrhyw hysbysiadau</string>
@@ -4035,22 +3915,6 @@
     <string name="notification_switch_label">Pob hysbysiad <xliff:g id="app_name" example="Android Services">%1$s</xliff:g></string>
     <string name="notification_app_switch_label">Pob hysbysiad <xliff:g id="app_name" example="Android Services">%1$s</xliff:g></string>
     <string name="default_notification_assistant">Hysbysiadau Addasol</string>
-    <plurals name="notifications_sent_daily">
-        <item quantity="zero">~<xliff:g id="number">%d</xliff:g> hysbysiadau y dydd</item>
-        <item quantity="one">~<xliff:g id="number">%d</xliff:g> hysbysiad y dydd</item>
-        <item quantity="two">~<xliff:g id="number">%d</xliff:g> hysbysiad y dydd</item>
-        <item quantity="few">~<xliff:g id="number">%d</xliff:g> hysbysiad y dydd</item>
-        <item quantity="many">~<xliff:g id="number">%d</xliff:g> hysbysiad y dydd</item>
-        <item quantity="other">~<xliff:g id="number">%d</xliff:g> hysbysiad y dydd</item>
-    </plurals>
-    <plurals name="notifications_sent_weekly">
-        <item quantity="zero">~<xliff:g id="number">%d</xliff:g> hysbysiadau yr wythnos</item>
-        <item quantity="one">~<xliff:g id="number">%d</xliff:g> hysbysiad yr wythnos</item>
-        <item quantity="two">~<xliff:g id="number">%d</xliff:g> hysbysiad yr wythnos</item>
-        <item quantity="few">~<xliff:g id="number">%d</xliff:g> hysbysiad yr wythnos</item>
-        <item quantity="many">~<xliff:g id="number">%d</xliff:g> hysbysiad yr wythnos</item>
-        <item quantity="other">~<xliff:g id="number">%d</xliff:g> hysbysiad yr wythnos</item>
-    </plurals>
     <string name="notifications_sent_never">Byth</string>
     <string name="manage_notification_access_title">Hysbysiadau\u2019r ddyfais ac apiau</string>
     <string name="manage_notification_access_summary">Rheoli pa apiau a dyfeisiau sydd gallu darllen hysbysiadau</string>
@@ -4077,11 +3941,6 @@
         fel ateb galwadau ffôn a rheoli Dim Tarfu.
     </string>
     <string name="notification_listener_security_warning_title">Caniatáu i <xliff:g id="service" example="NotificationReader">%1$s</xliff:g> gael mynediad at hysbysiadau?</string>
-    <string name="notification_listener_security_warning_summary">        Bydd <xliff:g id="notification_listener_name">%1$s</xliff:g> yn gallu darllen pob hysbysiad,
-        gan gynnwys gwybodaeth bersonol megis enwau cysylltiadau a chynnwys negeseuon testun rwyt yn eu derbyn.
-        Bydd yr ap hwn hefyd yn gallu diystyru neu hepian hysbysiadau neu weithredu botymau mewn hysbysiadau, gan gynnwys ateb galwadau.
-        \n\nBydd hyn hefyd yn rhoi i\'r ap y gallu i droi Dim Tarfu ymlaen ac i ffwrdd a newid gosodiadau perthynol.
-    </string>
     <string name="notification_listener_disable_warning_summary">Os fyddi\'n gwrthod mynediad <xliff:g id="notification_listener_name">%1$s</xliff:g> at hysbysiadau, mae\'n bosib y bydd mynediad at Dim Tarfu hefyd yn cael ei wrthod.
     </string>
     <string name="notification_listener_disable_warning_confirm">Troi i ffwrdd</string>
@@ -4489,7 +4348,6 @@
         <item quantity="many"><xliff:g id="count" example="1">%d</xliff:g> ap heb eu defnyddio</item>
         <item quantity="other"><xliff:g id="count" example="1">%d</xliff:g> ap heb eu defnyddio</item>
     </plurals>
-    <string name="unused_apps_switch">Tynnu caniatâd yn ôl a rhyddhau lle</string>
     <string name="filter_all_apps">Pob ap</string>
     <string name="filter_enabled_apps">Apiau wedi eu gosod</string>
     <string name="filter_instant_apps">Apiau ar unwaith</string>
@@ -4591,8 +4449,6 @@
     <string name="high_power_system">Dyw optimeiddiad batri ddim ar gael</string>
     <string name="high_power_desc">Peidio â rhoi optimeiddiad batri ar waith. Gall y batri rhedeg allan yn gynt.</string>
     <string name="high_power_prompt_title">Gadael i\'r ap redeg yn y cefndir o hyd?</string>
-    <string name="high_power_prompt_body">        Gall caniatáu <xliff:g id="app_name" example="Settings">%1$s</xliff:g> i redeg yn y cefndir o hyd leihau oes batri.
-        \n\nGellir newid hyn yn hwyrach yn Gosodiadau &gt; Apiau a hysbysiadau.</string>
     <string name="battery_summary"><xliff:g id="percentage" example="2">%1$s</xliff:g> ers gwefru\'n llawn</string>
     <string name="battery_summary_24hr"><xliff:g id="percentage" example="2">%1$s</xliff:g> defnydd dros y 24 awr ddiwethaf</string>
     <string name="no_battery_summary">Dim defnydd batri ers gwefru\'n llawn</string>
@@ -4725,7 +4581,6 @@
     <string name="camera_double_tap_power_gesture_title">Gwasgu\'r botwm pŵer dwywaith am y camera</string>
     <string name="camera_double_tap_power_gesture_desc">Agor y camera yn gyflym heb orfod datgloi dy sgrin</string>
     <string name="screen_zoom_title">Maint y dangosydd</string>
-    <string name="screen_zoom_short_summary">Gwneud eitmau ar y sgrin yn fwy neu\'n llai</string>
     <string name="screen_zoom_keywords">dwysedd dangos, chwyddiant sgrin, graddfa, graddio, maint</string>
     <string name="screen_zoom_summary">Gwneud eitemau ar dy sgrin yn llai neu\'n fwy. Gall rhai apiau ar dy sgrin symud lleoliad.</string>
     <string name="screen_zoom_preview_title">Rhagolwg</string>
@@ -4977,8 +4832,6 @@
         <item quantity="other">Gall <xliff:g id="count" example="10">%d</xliff:g> ap defnyddio data yn ddiderfyn</item>
     </plurals>
     <string name="special_access_more">Gweld mwy</string>
-    <string name="confirm_convert_to_fbe_warning">Wyt ti wir eisiau clicio data defnyddiwr a thrawsnewid i amgryptiad ffeiliau?</string>
-    <string name="button_confirm_convert_fbe">Clirio a throsi</string>
     <string name="reset_shortcut_manager_throttling">Ailosod cyfyngu cyfradd ShortcutManager</string>
     <string name="reset_shortcut_manager_throttling_complete">Mae cyfyngu cyfradd ShortcutManager wedi ei ailosod</string>
     <string name="notification_suggestion_title">Rheoli gwybodaeth ar y sgrin cloi</string>
@@ -4997,8 +4850,6 @@
     <string name="ambient_camera_summary_battery_saver_on">Wedi\u2019i analluogi dros dro oherwydd Arbedwr Batri</string>
     <string name="ambient_camera_battery_saver_off">Troi Arbedwr Batri i ffwrdd.</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_off">Wedi\u2019i droi ymlaen dros dro oherwydd Arbedwr Batri</string>
-    <string name="dark_ui_settings_dark_summary">Bydd apiau sy\u2019n gytûn hefyd yn enwid i\u2019r thema dywyll</string>
-    <string name="dark_ui_settings_dialog_acknowledge">Deall yn iawn</string>
     <string name="dark_theme_slice_title">Rhoi gynnig ar y thema dywyll</string>
     <string name="dark_theme_slice_subtitle">Mae\u2019n helpu ymestyn oes batri</string>
     <string name="quick_settings_developer_tiles">Teils gosodiadau cyflym datblygwr</string>
@@ -5069,7 +4920,6 @@
     <string name="right_edge">Ymyl dde</string>
     <string name="back_sensitivity_dialog_message">Gall sensitifrwydd uwch gwrthdaro ag unrhyw ystumiau apiau ar hyd ymylon y sgrin</string>
     <string name="back_sensitivity_dialog_title">Sensitifrwydd y cefn</string>
-    <string name="gesture_settings_activity_title">Gosodiadau Ystumiau</string>
     <string name="keywords_gesture_navigation_settings">llywio ystum, ystum, sensitfrwydd nôl, ystum yn ôl, ystum nôl</string>
     <string name="ambient_display_title" product="default">Tariad dwbl i wirio\'r ffôn</string>
     <string name="ambient_display_title" product="tablet">Tariad dwbl i wirio\'r llechen</string>
@@ -5193,6 +5043,7 @@
     <string name="do_disclosure_generic">Rheolir y ddyfais hon gan dy sefydliad.</string>
     <string name="do_disclosure_with_name">Rheolir y ddyfais hon gan <xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g>.</string>
     <string name="learn_more">Dysgu mwy</string>
+    <string name="financed_privacy_developer_options">Defnyddio dewisiadau datblygwyr</string>
     <plurals name="default_camera_app_title">
         <item quantity="zero">Apiau camera</item>
         <item quantity="one">Ap camera</item>
@@ -5507,6 +5358,7 @@
     <string name="sim_action_yes">Iawn</string>
     <string name="sim_action_reboot">Ailgychwyn</string>
     <string name="sim_action_no_thanks">Dim diolch</string>
+    <string name="sim_action_cancel">Diddymu</string>
     <string name="sim_switch_button">Newid</string>
     <string name="dsds_activation_failure_title">Methu â gweithredu\'r SIM</string>
     <string name="dsds_activation_failure_body_msg1">Tynna\'r SIM a\'i osod eto. Os yw\'r broblem yn parhau, ail-ddechreua dy ddyfais.</string>
@@ -5548,6 +5400,7 @@
     <string name="hwui_force_dark_summary">Mae\u2019n gwrthwneud y nodwedd gorfodi-tywyll i fod ymlaen o hyd</string>
     <string name="privacy_dashboard_title">Preifatrwydd</string>
     <string name="privacy_dashboard_summary">Caniatâd, gweithgaredd cyfrif, data personol</string>
+    <string name="privacy_controls_title">Rheolaeth</string>
     <string name="contextual_card_dismiss_remove">Tynnu</string>
     <string name="contextual_card_dismiss_keep">Cadw</string>
     <string name="contextual_card_dismiss_confirm_message">Tynnu\u2019r awgrym hwn?</string>
@@ -5680,7 +5533,7 @@
     <string name="default_active_sim_calls">galwadau</string>
     <string name="default_active_sim_sms">SMS</string>
     <string name="default_active_sim_mobile_data">data symudol</string>
-    <string name="wifi_scan_notify_message">I wella profiad gyda\'r ddyfais, gall apiau a gwasanaethau dal i sganio am rwydweithiau Wi\u2011Fi unrhyw bryd, hyd yn oed pan fo Wi\u2011Fi i ffwrdd. Gellir defnyddio hyn, er enghraifft, i wella nodweddion a gwasanaethau sy\'n dibynnu ar leoliad. Gellir newid hyn yng ngosodiadau sganio am Wi\u2011Fi. <annotation id="link">Newid</annotation></string>
+    <string name="wifi_scan_change">Newid</string>
     <string name="preference_summary_default_combination"><xliff:g id="state" example="Connected">%1$s</xliff:g> / <xliff:g id="networkMode" example="LTE">%2$s</xliff:g></string>
     <string name="mobile_data_connection_active">Wedi cysylltu</string>
     <string name="mobile_data_no_connection">Dim cysylltiad</string>
@@ -5712,7 +5565,6 @@
     <string name="app_pinning_main_switch_title">Defnyddio pinio apiau</string>
     <string name="developer_options_main_switch_title">Defnyddio dewisiadau datblygwyr</string>
     <string name="default_print_service_main_switch_title">Defnyddio gwasanaethau argraffu</string>
-    <string name="multiple_users_main_switch_title">Defnyddio defnyddwyr amryfal</string>
     <string name="wireless_debugging_main_switch_title">Defnyddio dadfygio di\u2011wifr</string>
     <string name="graphics_driver_main_switch_title">Defnyddio dewisiadau gyrrwr graffig</string>
     <string name="battery_saver_main_switch_title">Defnyddio arbedwr batri</string>
@@ -5737,15 +5589,12 @@
     <string name="smart_forwarding_missing_mdn_text">Mae rhif ffôn ar goll.</string>
     <string name="smart_forwarding_missing_alert_dialog_text">Iawn</string>
     <string name="enable_2g_title">Caniatáu 2G</string>
-    <string name="enable_2g_summary">Defnyddio cysylltiadau 2G. Ar gyfer galwadau brys, mae 2G ymlaen o hyd.</string>
     <string name="all_apps">Pob ap</string>
     <string name="request_manage_bluetooth_permission_dont_allow">Peidio â chaniatáu</string>
     <string name="uwb_settings_summary_airplane_mode">Rhaid diffodd modd awyren er mwyn defnyddio UWB </string>
     <string name="camera_toggle_title">Mynediad at gamera</string>
     <string name="mic_toggle_title">Mynediad at feicroffon</string>
-    <string name="cam_toggle_description">I apiau a wasanaethau</string>
-    <string name="game_settings_title">Gosodiadau Game</string>
-    <string name="game_settings_summary">Troi llwybr byr y dashfwrdd Game ymlaen, ayyb</string>
+    <string name="perm_toggle_description">I apiau a wasanaethau</string>
     <string name="previous_page_content_description">Blaenorol</string>
     <string name="next_page_content_description">Nesaf</string>
     <string name="colors_viewpager_content_description">Rhagolwg lliw</string>
@@ -5759,4 +5608,17 @@
     <string name="bluetooth_connect_access_dialog_content">Mae <xliff:g id="device_name" example="My device">%1$s</xliff:g> eisiau cysylltu â\'r ffôn hwn.\n\nNid wyt wedi cysylltu â <xliff:g id="device_name" example="My device">%2$s</xliff:g> o\'r blaen.</string>
     <string name="bluetooth_connect_access_dialog_negative">Peidio â chysylltu</string>
     <string name="bluetooth_connect_access_dialog_positive">Cysylltu</string>
+    <string name="tare_on">Ymlaen</string>
+    <string name="tare_off">I ffwrdd</string>
+    <string-array name="tare_modifiers_subfactors">
+        <item>Yn gwefru</item>
+        <item>Doze</item>
+        <item>Power Save Mode</item>
+        <item>Process State</item>
+    </string-array>
+    <string name="tare_dialog_confirm_button_title">Cadarnhau</string>
+    <string name="dream_preview_button_title">Rhagolwg</string>
+    <string name="bluetooth_find_broadcast_button_scan">Sganio cod QR</string>
+    <string name="find_broadcast_password_dialog_password_error">Cyfrinair Anghywir</string>
+    <string name="bt_le_audio_qr_code_is_not_valid_format">Nid yw\'r cod QR mewn fformat dilys</string>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-eo/arrays.xml b/overlay/packages/apps/Settings/res/values-eo/arrays.xml
index 3f8549c..2e831ef 100644
--- a/overlay/packages/apps/Settings/res/values-eo/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-eo/arrays.xml
@@ -204,4 +204,9 @@
         <item>Run in background</item>
         <item>Accessibility volume</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>Neniam</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-eo/strings.xml b/overlay/packages/apps/Settings/res/values-eo/strings.xml
index df1193d..ac03ce5 100644
--- a/overlay/packages/apps/Settings/res/values-eo/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-eo/strings.xml
@@ -21,8 +21,9 @@
     <string name="radioInfo_unknown">Nekonata</string>
     <string name="sdcard_setting" product="default">SD-karto</string>
     <string name="bluetooth_disconnect_dialog_ok">Malkonekti</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Nuligi</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">Nuligi</string>
     <string name="locale_remove_menu">Forigi</string>
+    <string name="app_locale_preference_title">Lingvo</string>
     <string name="sd_card_settings_label" product="default">SD-karto</string>
     <string name="cancel">Nuligi</string>
     <string name="save">Konservi</string>
@@ -78,6 +79,7 @@
     <string name="install_text">Instali</string>
     <string name="unknown">Nekonata</string>
     <string name="dlg_cancel">Nuligi</string>
+    <string name="dlg_delete">Forigi</string>
     <string name="service_client_name"><xliff:g id="client_name">%1$s</xliff:g></string>
     <string name="running_process_item_removed_user_label">Forigita uzanto</string>
     <string name="running_processes_header_system_prefix">Sistemo</string>
@@ -93,6 +95,7 @@
     <string name="input_method_settings">Agordoj</string>
     <string name="input_method_settings_button">Agordoj</string>
     <string name="accessibility_settings">Alirebleco</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">Nuligi</string>
     <string name="accessibility_button_location_title">Loko</string>
     <string name="accessibility_menu_item_settings">Agordoj</string>
     <string name="captioning_locale">Lingvo</string>
@@ -106,6 +109,7 @@
     <string name="print_job_summary"><xliff:g id="printer">%1$s</xliff:g>\n<xliff:g id="time">%2$s</xliff:g></string>
     <string name="battery_tip_unrestrict_app_dialog_ok">Forigi</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel">Nuligi</string>
+    <string name="process_removed_apps">Forigitaj aplikaĵoj</string>
     <string name="battery_saver_turn_on_automatically_never">Neniam</string>
     <string name="menu_duration_3h">3 horoj</string>
     <string name="menu_duration_6h">6 horoj</string>
@@ -130,8 +134,6 @@
     <string name="backup_pw_cancel_button_text">Nuligi</string>
     <string name="user_delete_user_description">Forigi uzanton</string>
     <string name="user_delete_button">Forigi</string>
-    <string name="user_guest">Gasto</string>
-    <string name="user_exit_guest_title">Forigi gaston</string>
     <string name="user_exit_guest_dialog_remove">Forigi</string>
     <string name="user_remove_user">Forigi uzanton</string>
     <string name="nfc_payment_favor_default">Ĉiam</string>
@@ -183,6 +185,7 @@
     <string name="network_operator_category">Reto</string>
     <string name="network_select_title">Reto</string>
     <string name="sim_action_yes">Jes</string>
+    <string name="sim_action_cancel">Nuligi</string>
     <string name="contextual_card_dismiss_remove">Forigi</string>
     <string name="wfc_disclaimer_location_title_text">Loko</string>
     <string name="wifi_disconnect_button_text">Malkonekti</string>
diff --git a/overlay/packages/apps/Settings/res/values-gd/arrays.xml b/overlay/packages/apps/Settings/res/values-gd/arrays.xml
index e2e187d..3427a05 100644
--- a/overlay/packages/apps/Settings/res/values-gd/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-gd/arrays.xml
@@ -51,6 +51,12 @@
         <item>@string/dark_ui_auto_mode_custom</item>
         <item>@string/dark_ui_auto_mode_auto</item>
     </string-array>
+    <string-array name="dark_ui_scheduler_with_bedtime_preference_titles">
+        <item>@string/dark_ui_auto_mode_never</item>
+        <item>@string/dark_ui_auto_mode_custom</item>
+        <item>@string/dark_ui_auto_mode_auto</item>
+        <item>@string/dark_ui_auto_mode_custom_bedtime</item>
+    </string-array>
     <string-array name="lock_after_timeout_entries">
         <item>Sa bhad</item>
         <item>Às dèidh 5 diogan</item>
@@ -380,17 +386,10 @@
     <string-array name="captioning_font_size_selector_titles">
         <item>Glè bheag</item>
         <item>Beag</item>
-        <item>Bun-roghainn</item>
+        <item>Meadhanach</item>
         <item>Mòr</item>
         <item>Glè mhòr</item>
     </string-array>
-    <string-array name="captioning_font_size_selector_summaries">
-        <item>Meud teacsa glè bheag</item>
-        <item>Meud teacsa beag</item>
-        <item>Meud teacsa bunaiteach</item>
-        <item>Meud teacsa mòr</item>
-        <item>Meud teacsa glè mhòr</item>
-    </string-array>
     <string-array name="captioning_edge_type_selector_titles">
         <item>Bun-roghainn</item>
         <item>Gun oir</item>
@@ -577,4 +576,9 @@
         <item>@string/rtt_settings_visible_during_call</item>
         <item>@string/rtt_settings_always_visible</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>Chan ann idir</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-gd/strings.xml b/overlay/packages/apps/Settings/res/values-gd/strings.xml
index 3f185a8..fac7625 100644
--- a/overlay/packages/apps/Settings/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-gd/strings.xml
@@ -143,10 +143,10 @@
     <string name="bluetooth_pref_summary" product="device">Leig leis an uidheam agad conaltradh le uidheaman Bluetooth faisg air</string>
     <string name="bluetooth_pref_summary" product="default">Leig leis an fhòn agad conaltradh le uidheaman Bluetooth faisg air</string>
     <string name="bluetooth_disable_a2dp_hw_offload">Cuir Bluetooth A2DP hardware offload à comas</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title">A bheil thu airson an t-uidheam ath-thòiseachadh?</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message">Feumaidh thu an t-uidheam agad ath-thòiseachadh gus an roghainn seo atharrachadh.</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Ath-thòisich</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Sguir dheth</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title">A bheil thu airson an t-uidheam ath-thòiseachadh?</string>
+    <string name="bluetooth_disable_hw_offload_dialog_message">Feumaidh thu an t-uidheam agad ath-thòiseachadh gus an roghainn seo atharrachadh.</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm">Ath-thòisich</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">Sguir dheth</string>
     <string name="connected_device_media_device_title">Uidheaman mheadhanan</string>
     <string name="connected_device_call_device_title">Uidheaman gairme</string>
     <string name="connected_device_other_device_title">Uidheaman eile</string>
@@ -207,6 +207,8 @@
     <string name="language_picker_title">Cànain</string>
     <string name="locale_remove_menu">Thoir air falbh</string>
     <string name="add_a_language">Cuir cànan ris</string>
+    <string name="app_locale_preference_title">Cànan</string>
+    <string name="preference_of_system_locale_summary">Bun-roghainn an t-siostaim</string>
     <plurals name="dlg_remove_locales_title">
         <item quantity="one">An doir thu an cànan a thagh thu air falbh?</item>
         <item quantity="two">An doir thu na cànain a thagh thu air falbh?</item>
@@ -309,9 +311,9 @@
     <string name="security_settings_title">Tèarainteachd</string>
     <string name="encryption_and_credential_settings_title">Crioptachadh ⁊ teisteasan</string>
     <string name="encryption_and_credential_settings_summary" product="default">Tha am fòn crioptaichte</string>
-    <string name="decryption_settings_summary" product="default">Chan eil am fòn crioptaichte</string>
+    <string name="not_encrypted_summary" product="default">Chan eil am fòn crioptaichte</string>
     <string name="encryption_and_credential_settings_summary" product="tablet">Tha an t-uidheam crioptaichte</string>
-    <string name="decryption_settings_summary" product="tablet">Chan eil an t-uidheam crioptaichte</string>
+    <string name="not_encrypted_summary" product="tablet">Chan eil an t-uidheam crioptaichte</string>
     <string name="lockscreen_settings_title">An sgrìn-ghlasaidh</string>
     <string name="lockscreen_settings_what_to_show_category">Na thèid a shealltainn</string>
     <string name="security_settings_summary">Suidhich an t-ionad agam, neo-ghlasadh na sgrìn, glas na cairt SIM, glasadh stòras nan teisteasan</string>
@@ -402,9 +404,6 @@
     <string name="fingerprint_enroll_button_add">Cuir tè eile ris</string>
     <string name="fingerprint_enroll_button_next">Air adhart</string>
     <string name="security_settings_fingerprint_enroll_disclaimer">A bharrachd air neo-ghlasadh an fhòn, ’s urrainn dhut an lorg-mheòir agad a chleachdadh airson ceannachdan ’s inntrigeadh aplacaidean ùghdarrachadh. <annotation id="url">Barrachd fiosrachaidh</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled">        Chaidh roghainn na sgrìn-ghlasaidh a chur à comas. Airson barrachd fiosrachaidh, cuir fios gu rianaire a’ bhuidhinn agad. 
-<annotation id="admin_details">Barrachd fiosrachaidh</annotation>\n\n’S urrainn dhut do lorg-meòir a chleachdadh fhathast airson ceannachdan ùghdarrachadh agus aplacaidean inntrigeadh. 
-<annotation id="url">Barrachd fiosrachaidh</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again">Tog do chorrag agus suath ris a’ mhothaichear a-rithist</string>
     <string name="fingerprint_add_max">’S urrainn dhut suas ri <xliff:g id="count" example="5">%d</xliff:g> lorg(an)-meòir a chur ris</string>
     <string name="fingerprint_intro_error_max">Chuir thu na tha ceadaichte de lorgan-meòir ris</string>
@@ -413,75 +412,11 @@
     <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="crypt_keeper_settings_title">Crioptachadh</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet">Crioptaich an tablaid</string>
-    <string name="crypt_keeper_encrypt_title" product="default">Crioptaich am fòn</string>
-    <string name="crypt_keeper_encrypted_summary">Crioptaichte</string>
-    <string name="crypt_keeper_desc" product="tablet">    ’S urrainn dhut na cunntasan, na roghainnean, na h-aplacaidean air an luchdadh a-nuas,
-    na meadhanan agus faidhlichean eile a chrioptachadh. Nuair a bhios tu air an tablaid agad a chrioptachadh agus glas na sgrìn
-    (seo pàtran, PIN àireamhan no facal-faire)  a shuidheachadh, feumaidh tu a’ ghlas a thoirt far na sgrìn airson an tablaid a dhì-chrioptachadh
-    gach turas a chuireas tu air i. ’S e aiseag dàta an fhactaraidh a tha san dòigh eile airson a dhì-chrioptachadh
-    ach suathaidh sin às a h-uile dàta agad.\n\nBheir an crioptachadh uair no dhà a thìde. Feumaidh tu tòiseachadh air le
-    làn-teàirrds air a’ bhataraidh ’s feumaidh tu an tablaid agad a chumail plugte a-staigh gus am bi e deiseil. Ma chuireas tu stad air,
-    ’s ann gun caill thu cuid no a h-uile gin dhen dàta agad</string>
-    <string name="crypt_keeper_desc" product="default">’S urrainn dhut na cunntasan, na roghainnean, na h-aplacaidean air an luchdadh a-nuas, na meadhanan agus faidhlichean eile a chrioptachadh. Nuair a bhios tu air a fòn agad a chrioptachadh agus glas na sgrìn (seo pàtran, PIN àireamhan no facal-faire) a shuidheachadh, feumaidh tu a’ ghlas a thoirt far na sgrìn airson am fòn a dhì-chrioptachadh gach turas a chuireas tu air e. ’S e aiseag dàta an fhactaraidh a tha san dòigh eile airson a dhì-chrioptachadh ach suathaidh sin às a h-uile dàta agad.\n\nBheir an crioptachadh uair no dhà a thìde. Feumaidh tu tòiseachadh air le làn-teàirrds air a’ bhataraidh ’s feumaidh tu am fòn agad a chumail plugte a-staigh gus am bi e deiseil. Ma chuireas tu stad air, ’s ann gun caill thu cuid no a h-uile gin dhen dàta agad.</string>
-    <string name="crypt_keeper_button_text" product="tablet">Crioptaich an tablaid</string>
-    <string name="crypt_keeper_button_text" product="default">Crioptaich am fòn</string>
-    <string name="crypt_keeper_low_charge_text">Teàirrds am bataraidh agad is feuch ris a-rithist.</string>
-    <string name="crypt_keeper_unplugged_text">Ceangail teàirrdsear ris is feuch ris a-rithist.</string>
-    <string name="crypt_keeper_dialog_need_password_title">Chan eil PIN no facal-faire aig an sgrìn-ghlasaidh agad</string>
-    <string name="crypt_keeper_dialog_need_password_message">Feumaidh tu PIN no facal-faire
-    a shuidheachadh dhan sgrìn-ghlasaidh mus urrainn dhut tòiseachadh air a’ chrioptachadh.</string>
-    <string name="crypt_keeper_confirm_title">An crioptaich thu e?</string>
-    <string name="crypt_keeper_final_desc" product="tablet">    Cha ghabh an crioptachadh a neo-dhèanamh agus ma chuireas tu stad air, caillidh tu dàta.
-    Bheir an crioptachadh uair no dhà a thìde ’s thèid an tablaid ath-thòiseachadh iomadh turas.
-    </string>
-    <string name="crypt_keeper_final_desc" product="default">    Cha ghabh an crioptachadh a neo-dhèanamh agus ma chuireas tu stad air, caillidh tu dàta.
-    Bheir an crioptachadh uair no dhà a thìde ’s thèid am fòn ath-thòiseachadh iomadh turas.
-    </string>
-    <string name="crypt_keeper_setup_title">’Ga chrioptachadh</string>
-    <string name="crypt_keeper_setup_description" product="tablet">Fuiridh fhad ’s a tha an tablaid agad
-    ’ga crioptachadh. Tha <xliff:g id="percent" example="50">^1</xliff:g>% dheth deiseil.</string>
-    <string name="crypt_keeper_setup_description" product="default">Fuiridh fhad ’s a tha am fòn agad
-    ’ga chrioptachadh. Tha <xliff:g id="percent" example="50">^1</xliff:g>% dheth deiseil.</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet">Fuiridh fhad ’s a tha an tablaid agad
-    ’ga crioptachadh. An ùine air fhàgail: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_setup_time_remaining" product="default">Fuiridh fhad ’s a tha am fòn agad
-    ’ga chrioptachadh. An ùine air fhàgail: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet">Airson a’ ghlas a thoirt far na tablaid, cuir dheth is air i.</string>
-    <string name="crypt_keeper_force_power_cycle" product="default">Airson a’ ghlas a thoirt far an fhòn, cuir dheth is air e.</string>
-    <string name="crypt_keeper_warn_wipe">Rabhadh: Thèid an t-uidheam agad a shuathadh bàn ma dh’fhàilligeas
-    <xliff:g id="count" example="7">^1</xliff:g> oidhirp(ean) neo-ghlasaidh eile!
-    </string>
-    <string name="crypt_keeper_enter_password">Cuir am facal-faire agad a-steach</string>
-    <string name="crypt_keeper_failed_title">Cha deach leis a’ chrioptachaidh</string>
-    <string name="crypt_keeper_failed_summary" product="tablet">      Chaidh stad a chur air a’ chrioptachadh agus cha ghabh a choileanadh. A thoradh air sin, cha ghabh an dàta air an tablaid agad
-      ruigsinn tuilleadh.
-      \n\n
-      Feumaidh tu bun-roghainnean an fhactaraidh aiseag mus urrainn dhut an tablaid a chleachdadh a-rithist.
-      Nuair a bhios tu a’ suidheachadh na tablaid às dèidh an ath-shuidheachaidh, bidh cothrom agad
-      dàta sam bith aiseag aig a bheil lethbhreac-glèidhidh sa chunntas Google agad.
-    </string>
-    <string name="crypt_keeper_failed_summary" product="default">      Chaidh stad a chur air a’ chrioptachadh agus cha ghabh a choileanadh. A thoradh air sin, cha ghabh an dàta air an fhòn agad
-      ruigsinn tuilleadh.
-      \n\nFeumaidh tu bun-roghainnean an fhactaraidh aiseag mus urrainn dhut am fòn a chleachdadh a-rithist.
-      Nuair a bhios tu a’ suidheachadh an fhòn às dèidh an ath-shuidheachaidh, bidh cothrom agad
-      dàta sam bith aiseag aig a bheil lethbhreac-glèidhidh sa chunntas Google agad.
-    </string>
-    <string name="crypt_keeper_data_corrupt_title">Cha deach leis an dì-chrioptachadh</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet">      Tha am facal-faire a chuir thu a-steach ceart ach gu mì-fhortanach,
-      tha an dàta agad coirbte.
-      \n\nFeumaidh tu bun-roghainnean an fhactaraidh aiseag mus urrainn dhut an tablaid a chleachdadh a-rithist.
-      Nuair a bhios tu a’ suidheachadh na tablaid às dèidh an ath-shuidheachaidh, bidh cothrom agad
-      dàta sam bith aiseag aig a bheil lethbhreac-glèidhidh sa chunntas Google agad.
-    </string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default">      Tha am facal-faire a chuir thu a-steach ceart ach gu mì-fhortanach,
-      tha an dàta agad coirbte.
-      \n\nFeumaidh tu bun-roghainnean an fhactaraidh aiseag mus urrainn dhut am fòn a chleachdadh a-rithist.
-      Nuair a bhios tu a’ suidheachadh an fhòn às dèidh an ath-shuidheachaidh, bidh cothrom agad
-      dàta sam bith aiseag aig a bheil lethbhreac-glèidhidh sa chunntas Google agad.
-    </string>
-    <string name="crypt_keeper_switch_input_method">Geàrr leum gu modh ion-chuir eile</string>
+    <string name="encryption_settings_title">Crioptachadh</string>
+    <string name="encrypt_title" product="tablet">Crioptaich an tablaid</string>
+    <string name="encrypt_title" product="default">Crioptaich am fòn</string>
+    <string name="encrypted_summary">Crioptaichte</string>
+    <string name="no_screen_lock_issue_action_label">Suidhich glas na sgrìn</string>
     <string name="suggested_lock_settings_title">Dèan am fòn agad tèarainte</string>
     <string name="suggested_lock_settings_summary" product="tablet">Suidhich glas na sgrìn airson an tablaid a dhìon</string>
     <string name="suggested_lock_settings_summary" product="device">Suidhich glas na sgrìn airson an t-uidheam a dhìon</string>
@@ -552,10 +487,6 @@
     <string name="lock_last_pattern_attempt_before_wipe_profile">Ma chuireas tu a-steach pàtran ceàrr a-rithist, thèid pròifil na h-obrach agad ’s an dàta aice a sguabadh às</string>
     <string name="lock_last_pin_attempt_before_wipe_profile">Ma chuireas tu a-steach PIN ceàrr a-rithist, thèid pròifil na h-obrach agad ’s an dàta aice a sguabadh às</string>
     <string name="lock_last_password_attempt_before_wipe_profile">Ma chuireas tu a-steach facal-faire ceàrr a-rithist, thèid pròifil na h-obrach agad ’s an dàta aice a sguabadh às</string>
-    <string name="lock_failed_attempts_now_wiping_device">Chaidh cus oidhirpean cearra a dhèanamh. Thèid dàta an uidheim seo a sguabadh às.</string>
-    <string name="lock_failed_attempts_now_wiping_user">Chaidh cus oidhirpean cearra a dhèanamh. Thèid an cleachdaiche seo a sguabadh às.</string>
-    <string name="lock_failed_attempts_now_wiping_profile">Chaidh cus oidhirpean cearra a dhèanamh. Thèid pròifil na h-obrach seo ’s an dàta aice a sguabadh às.</string>
-    <string name="lock_failed_attempts_now_wiping_dialog_dismiss">Leig seachad</string>
     <plurals name="lockpassword_password_too_short">
         <item quantity="one">Feumaidh co-dhiù <xliff:g id="count" example="1">%d</xliff:g> charactar a bhith ’na bhroinn</item>
         <item quantity="two">Feumaidh co-dhiù <xliff:g id="count" example="3">%d</xliff:g> charactar a bhith ’na bhroinn</item>
@@ -917,7 +848,6 @@
     <string name="wifi_use_system_certs">Cleachd teisteanasan an t-siostaim</string>
     <string name="wifi_do_not_provide_eap_user_cert">Na dèan solar</string>
     <string name="wifi_do_not_validate_eap_server">Na dèan dearbhadh</string>
-    <string name="wifi_do_not_validate_eap_server_warning">Cha deach teisteanas a shònrachadh. Cha bhi an ceangal agad prìobhaideach.</string>
     <string name="wifi_ssid_too_long">Tha ainm an lìonraidh ro fhada.</string>
     <string name="wifi_no_domain_warning">Feumaidh tu àrainn a shònrachadh.</string>
     <string name="wifi_no_user_cert_warning">Tha teisteanas riatanach.</string>
@@ -995,9 +925,6 @@
     <string name="wifi_ip_settings_invalid_network_prefix_length">Cuir a-steach ro-leasachan lìonraidh a tha eadar 0 is 32 a dh’fhaid.</string>
     <string name="wifi_gateway">Bealach</string>
     <string name="wifi_network_prefix_length">Faid ro-leasachan an lìonraidh</string>
-    <string name="wifi_type_11AX">WiFi 6</string>
-    <string name="wifi_type_11AC">WiFi 5</string>
-    <string name="wifi_type_11N">WiFi 4</string>
     <string name="wifi_p2p_settings_title">WiFi Direct</string>
     <string name="wifi_p2p_device_info">Mun uidheam</string>
     <string name="wifi_p2p_persist_network">Cuir an ceangal seo an cuimhne</string>
@@ -1068,7 +995,6 @@
     <string name="wifi_calling_mode_cellular_preferred_summary">Cleachd WiFi mur eil lìonra mobile ri làimh</string>
     <string name="wifi_calling_mode_wifi_only_summary">Gairm air WiFi. Ma thèid WiFi air chall, thig crìoch air a’ ghairm.</string>
     <string name="wifi_calling_off_explanation">Nuair a bhios gairmean air WiFi air, ’s urrainn dhan fhòn agad gairmean a rùtadh thar lìonraidhean WiFi air lìonra a’ ghiùlanair agad a-rèir na roghainn agad agus dè an t-siognail a bhios nas treasa. Mus cuir thu an roghainn seo air, dearbh na tàillean agus fiosrachadh eile leis a’ ghiùlanair agad.<xliff:g id="additional_text" example="Learn More">%1$s</xliff:g></string>
-    <string name="emergency_address_title">Seòladh èiginn</string>
     <string name="emergency_address_summary">Thèid seo a chleachdadh mar d’ ionad nuair a nì thu gairm-èiginn thar WiFi</string>
     <string name="private_dns_help_message"><annotation id="url">Barrachd fiosrachaidh</annotation> air roghainnean DNS phrìobhaidich</string>
     <string name="private_dns_mode_on">Air</string>
@@ -1079,7 +1005,6 @@
     <string name="wifi_disconnected_from">Chaidh an ceangal ri <xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g> a bhriseadh</string>
     <string name="carrier">Giùlanair</string>
     <string name="display_settings_title">Taisbeanadh</string>
-    <string name="sound_settings">Fuaim</string>
     <string name="all_volume_title">Àirde nam fuaimean</string>
     <string name="musicfx_title">Èifeachdan ciùil</string>
     <string name="ring_volume_title">Àirde na seirme ⁊ nam brathan</string>
@@ -1243,7 +1168,6 @@
     <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_dream_start">Tòisich an-dràsta</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>
@@ -1254,7 +1178,6 @@
     <string name="doze_always_on_title">Seall an t-àm ’s am fiosrachadh an-còmhnaidh</string>
     <string name="doze_always_on_summary">Caitheamh nas àirde a’ bhataraidh</string>
     <string name="title_font_size">Meud a’ chrutha-chlò</string>
-    <string name="short_summary_font_size">Dèan an teacsa nas motha no nas lugha</string>
     <string name="sim_lock_settings">Roghainnean glasaidh na cairt SIM</string>
     <string name="sim_lock_settings_category">Glas na cairt SIM</string>
     <string name="sim_lock_settings_summary_off">Dheth</string>
@@ -1308,7 +1231,6 @@
     <string name="firmware_version">Tionndadh dhe Android</string>
     <string name="security_patch">Ùrachadh tèarainteachd Android</string>
     <string name="model_info">Modail</string>
-    <string name="hardware_info">Modail ⁊ bathar-cruaidh</string>
     <string name="hardware_revision">Tionndadh dhen bhathar-chruaidh</string>
     <string name="fcc_equipment_id">ID na h-uidheamachd</string>
     <string name="baseband_version">Tionndadh dhen bhann bhunasach</string>
@@ -1428,7 +1350,6 @@
     <string name="storage_internal_title">Stòras air an uidheam</string>
     <string name="storage_external_title">Stòras so-ghiùlan</string>
     <string name="storage_size_large"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small></string>
-    <string name="storage_volume_used">’Ga chleachdadh de <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
     <string name="storage_mount_success">Chaidh <xliff:g id="name" example="SD card">%1$s</xliff:g> a mhunntachadh</string>
     <string name="storage_mount_failure">Cha b’ urrainn dhuinn <xliff:g id="name" example="SD card">%1$s</xliff:g> a mhunntachadh</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>
@@ -1605,15 +1526,14 @@
     <string name="reset_esim_error_msg">Cha b’ urrainn dhuinn na SIMaichean a chaidh a luchdadh a-nuas a shuathadh bàn ri linn mearachd.\n\nAth-shuidhich an t-uidheam agad is feuch ris a-rithist.</string>
     <string name="main_clear_title">Suath bàn an dàta air fad</string>
     <string name="main_clear_short_title">Suath bàn an dàta air fad</string>
-    <string name="main_clear_desc" product="tablet">Suathaidh seo bàn a h-uile dàta a tha ann an <b>stòras inntearnail</b> na tablaid agad, a’ gabhail a-staigh:\n\n<li>An cunntas Google agad</li>\n<li>roghainnean agus dàta an t-siostaim ’s nan aplacaidean</li>\n<li>Na h-aplacaidean a chaidh a luchdadh a-nuas</li></string>
-    <string name="main_clear_desc" product="default">Suathaidh seo bàn a h-uile dàta a tha ann an <b>stòras inntearnail</b> an fhòn agad, a’ gabhail a-staigh:\n\n<li>An cunntas Google agad</li>\n<li>roghainnean agus dàta an t-siostaim ’s nan aplacaidean</li>\n<li>Na h-aplacaidean a chaidh a luchdadh a-nuas</li></string>
-    <string name="main_clear_accounts" product="default">\n\nTha thu air do chlàradh a-steach dha na cunntasan seo an-dràsta:\n</string>
-    <string name="main_clear_other_users_present" product="default">\n\nTha cleachdaichean eile air an uidheam seo.\n</string>
-    <string name="main_clear_desc_also_erases_external"><li>Ceòl</li>\n<li>Dealbhan</li>\n<li>Dàta eile a’ chleachdaiche</li></string>
-    <string name="main_clear_desc_also_erases_esim"><li>eSIMichean</li></string>
-    <string name="main_clear_desc_no_cancel_mobile_plan">\n\nCha chuir seo crìoch air plana na seirbheise mobile agad.</string>
-    <string name="main_clear_desc_erase_external_storage" product="nosdcard">\n\nAirson an ceòl, na dealbhan agus dàta eile a’ chleachdaiche fhalamhachadh, feumaidh tu an <b>stòras USB</b> a shuathadh bàn.</string>
-    <string name="main_clear_desc_erase_external_storage" product="default">\n\nAirson an ceòl, na dealbhan agus dàta eile a’ chleachdaiche fhalamhachadh, feumaidh tu a’ <b>chairt SD</b> a shuathadh bàn.</string>
+    <string name="main_clear_desc" product="tablet">"Suathaidh seo bàn a h-uile dàta a tha ann an <b>stòras inntearnail</b> na tablaid agad, a’ gabhail a-staigh:\n\n<li>An cunntas Google agad</li>\n<li>roghainnean agus dàta an t-siostaim ’s nan aplacaidean</li>\n<li>Na h-aplacaidean a chaidh a luchdadh a-nuas</li>"</string>
+    <string name="main_clear_desc" product="default">"Suathaidh seo bàn a h-uile dàta a tha ann an <b>stòras inntearnail</b> an fhòn agad, a’ gabhail a-staigh:\n\n<li>An cunntas Google agad</li>\n<li>roghainnean agus dàta an t-siostaim ’s nan aplacaidean</li>\n<li>Na h-aplacaidean a chaidh a luchdadh a-nuas</li>"</string>
+    <string name="main_clear_accounts" product="default">"\n\nTha thu air do chlàradh a-steach dha na cunntasan seo an-dràsta:\n"</string>
+    <string name="main_clear_other_users_present" product="default">"\n\nTha cleachdaichean eile air an uidheam seo.\n"</string>
+    <string name="main_clear_desc_also_erases_external">"<li>Ceòl</li>\n<li>Dealbhan</li>\n<li>Dàta eile a’ chleachdaiche</li>"</string>
+    <string name="main_clear_desc_also_erases_esim">"<li>eSIMichean</li>"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard">"\n\nAirson an ceòl, na dealbhan agus dàta eile a’ chleachdaiche fhalamhachadh, feumaidh tu an <b>stòras USB</b> a shuathadh bàn."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default">"\n\nAirson an ceòl, na dealbhan agus dàta eile a’ chleachdaiche fhalamhachadh, feumaidh tu a’ <b>chairt SD</b> a shuathadh bàn."</string>
     <string name="erase_external_storage" product="nosdcard">Suath bàn an stòras USB</string>
     <string name="erase_external_storage" product="default">Suath bàn a’ chairt SD</string>
     <string name="erase_external_storage_description" product="nosdcard">Suath bàn an dàta gu lèir air an stòras USB inntearnail, can ceòl no dealbhan</string>
@@ -1759,7 +1679,6 @@
     <string name="module_license_title">Ceadachasan air ùrachadh siostam Google Play</string>
     <string name="terms_title">Teirmichean is cumhaichean</string>
     <string name="webview_license_title">Ceadachas sealladh-lìn an t-siostaim</string>
-    <string name="wallpaper_attributions">Pàipearan-balla</string>
     <string name="wallpaper_attributions_values">Solaraichean dhealbhan saideil:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
     <string name="settings_manual_activity_title">Leabhar-mìneachaidh</string>
     <string name="settings_manual_activity_unavailable">Thachair duilgheadas le luchdadh an leabhair-mhìneachaidh.</string>
@@ -1950,6 +1869,7 @@
     <string name="clear_data_dlg_title">An sguab sinn às dàta na h-aplacaid?</string>
     <string name="dlg_ok">Ceart ma-thà</string>
     <string name="dlg_cancel">Sguir dheth</string>
+    <string name="dlg_delete">Sguab às</string>
     <string name="app_not_found_dlg_text"> Cha deach an aplacaid a lorg air liosta nan aplacaidean stàlaichte.</string>
     <string name="clear_failed_dlg_text">Tha b’ urrainn dhuinn an stòras a ghlanadh dhan aplacaid.</string>
     <string name="join_two_items"><xliff:g id="first_item">%1$s</xliff:g> agus <xliff:g id="second_item">%2$s</xliff:g></string>
@@ -2146,11 +2066,14 @@
     <string name="accessibility_screen_magnification_title">Meudachadh</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary">Làn-sgrìn</string>
     <string name="accessibility_magnification_mode_dialog_option_window">Meudaich pàirt dhen sgrìn</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">Sguir dheth</string>
     <string name="accessibility_magnification_service_settings_title">Roghainnean a’ mheudachaidh</string>
     <string name="accessibility_screen_magnification_gestures_title">Meudaich le trì gnogagan</string>
     <string name="accessibility_screen_magnification_navbar_title">Meudaich le ath-ghoirid</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture">Meudaich le ath-ghoirid ⁊ trì gnogagan</string>
     <string name="accessibility_introduction_title">Mu dhèidhinn <xliff:g id="service" example="Select to Speak">%1$s</xliff:g></string>
+    <string name="accessibility_text_reading_reset_button_title">Ath-shuidhich na roghainnean</string>
+    <string name="accessibility_text_reading_confirm_dialog_reset_button">Ath-shuidhich</string>
     <string name="accessibility_screen_option">Roghainnean</string>
     <string name="accessibility_preference_magnification_summary">Sùm a-steach air an sgrìn</string>
     <string name="accessibility_screen_magnification_short_summary">Thoir gnogag 3 tursan airson sùm</string>
@@ -2212,21 +2135,10 @@
     <string name="accessibility_timeout_2mins">Às dèidh 2 mhionaid</string>
     <string name="accessibility_setting_item_control_timeout_title">Ùine fantainn do ghnìomh (crìoch-ùine na so-ruigsinneachd)</string>
     <string name="accessibility_control_timeout_preference_title">Ùine fantainn do ghnìomh</string>
-    <string name="accessibility_control_timeout_preference_summary">Tagh dè cho fada ’s a mhaireas teachdaireachdan a dh’iarras gnìomh ort agus nach nochd ach greis.\n\nCha chuir a h-uile aplacaid taic ris an roghainn seo.</string>
     <string name="accessibility_long_press_timeout_preference_title">Dàil an suathaidh ris ⁊ cumail sìos</string>
     <string name="accessibility_display_inversion_preference_title">Ais-thionndadh nan dathan</string>
     <string name="accessibility_display_inversion_switch_title">Cleachd ais-thionndadh nan dathan</string>
-    <string name="accessibility_display_inversion_preference_subtitle"><![CDATA[Nì ais-thionndadh nan dathan sgrìnichean soilleir dorcha.<br/><br/>
-        An aire:
-        <ol>
-            <li>\u00a0Nì ais-thionndadh nan dathan sgrìnichean dorcha soilleir cuideachd.</li>
-            <li>\u00a0Thèid na dathan sna meadhanan is dealbhan atharrachadh.</li>
-            <li>\u00a0Gabhaidh ùrlar dorcha a chleachdadh airson cùlaibh dorcha a shealltainn. Obraichidh an t-ùrlar dorcha le aplacaidean a chuireas taic ris. Obraichidh ais-thionndadh nan dathan air aplacaid sam bith.</li>
-        </ol>
-        ]]></string>
     <string name="accessibility_autoclick_preference_title">Briogadh fèin-obrachail (tìmeachadh an tàimh)</string>
-    <string name="accessibility_autoclick_description">Obraichidh am briogadh fèin-obrachail nuair a bhios luchag ceangailte. ’S urrainn dhut cùrsair na luchaig a shuidheachadh ach an dèan e briogadh gu fèin-obrachail nuair a sguireas an cùrsair dhen ghluasad rè ùine shònraichte.</string>
-    <string name="accessibility_autoclick_default_title">Dheth</string>
     <string name="accessibility_autoclick_short_title">Goirid</string>
     <string name="accessibility_autoclick_short_summary">0.2 diog</string>
     <string name="accessibility_autoclick_medium_title">Meadhanach</string>
@@ -2237,19 +2149,21 @@
     <string name="accessibility_autoclick_shorter_desc">Nas giorra</string>
     <string name="accessibility_autoclick_longer_desc">Nas fhaide</string>
     <string name="accessibility_autoclick_seekbar_desc">Ùine a’ bhriogaidh fhèin-obrachail</string>
-    <string name="accessibility_vibration_settings_title">Neart na crith ⁊ freagairt suathaidh</string>
-    <string name="accessibility_notification_vibration_title">Crith nam brathan</string>
+    <string name="accessibility_vibration_settings_state_on">Air</string>
+    <string name="accessibility_vibration_settings_state_off">Dheth</string>
+    <string name="accessibility_call_vibration_category_title">Gairmean</string>
     <string name="accessibility_ring_vibration_title">Crith na seirme</string>
+    <string name="accessibility_notification_vibration_title">Crith nam brathan</string>
     <string name="accessibility_touch_vibration_title">Freagairt suathaidh</string>
     <string name="accessibility_service_primary_switch_title">Cleachd <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
     <string name="accessibility_service_primary_open_title">Fosgail <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
+    <string name="accessibility_quick_settings_tooltip_dismiss">Leig seachad</string>
     <string name="accessibility_daltonizer_primary_switch_title">Cleachd ceartachadh nan dathan</string>
     <string name="accessibility_caption_primary_switch_title">Seall fo-thiotalan</string>
     <string name="accessibility_caption_primary_switch_summary">Dha na h-aplacaidean a chuireas taic ris a-mhàin</string>
     <string name="captioning_caption_appearance_title">Gnàthaich meud is stoidhle nam fo-thiotalan</string>
     <string name="captioning_caption_appearance_summary">Meud <xliff:g id="accessibility_font_size" example="Large">%1$s</xliff:g> an teacsa</string>
     <string name="captioning_more_options_title">Barrachd roghainnean</string>
-    <string name="accessibility_caption_preference_summary">Cha chuir a h-uile aplacaid taic ris na roghainnean fho-thiotalan seo</string>
     <string name="accessibility_shortcut_type_software">Putan na so-ruigsinneachd</string>
     <string name="accessibility_shortcut_type_software_gesture">Grad-shlaighd suas on bhonn le 2 chorrag</string>
     <string name="accessibility_shortcut_type_hardware">Cùm sìos na h-iuchraichean fuaime</string>
@@ -2258,8 +2172,6 @@
     <string name="accessibility_hearingaid_title">Innealan-claisneachd</string>
     <string name="accessibility_hearingaid_not_connected_summary">Cha deach inneal-claisneachd a cheangal</string>
     <string name="accessibility_hearingaid_adding_summary">Cuir ris innealan-claisneachd</string>
-    <string name="accessibility_hearingaid_pair_instructions_message">Airson na h-innealan-claisneachd agad a phaidhreachadh, lorg an t-uidheam agad is thoir gnogag air air an ath-sgrìn. Dèan cinnteach gu bheil na h-innealan-claisneachd agad sa mhodh phaidhreachaidh.</string>
-    <string name="accessibility_hearingaid_active_device_summary">Tha <xliff:g id="device_name">%1$s</xliff:g> gnìomhach</string>
     <plurals name="show_number_hearingaid_count">
         <item quantity="one"><xliff:g id="number_device_count">%1$d</xliff:g> inneal-claisneachd air a shàbhaladh</item>
         <item quantity="two"><xliff:g id="number_device_count">%1$d</xliff:g> inneal-claisneachd air a shàbhaladh</item>
@@ -2273,14 +2185,11 @@
     <string name="accessibility_summary_state_stopped">Chan eil seo ag obair. Thoir gnogag airson fiosrachaidh.</string>
     <string name="accessibility_description_state_stopped">Chan eil an t-seirbheis seo ag obair mar bu chòir.</string>
     <string name="enable_quick_setting">Seall sna grad-roghainnean</string>
-    <string name="daltonizer_type">Modh ceartachaidh</string>
-    <string name="daltonizer_mode_deuteranomaly_title">Deuteranomaly</string>
-    <string name="daltonizer_mode_protanomaly_title">Protanomaly</string>
-    <string name="daltonizer_mode_tritanomaly_title">Tritanomaly</string>
+    <string name="daltonizer_mode_deuteranomaly_title">Dearg is uaine</string>
+    <string name="daltonizer_mode_protanomaly_title">Dearg is uaine</string>
+    <string name="daltonizer_mode_tritanomaly_title">Gorm is buidhe</string>
     <string name="daltonizer_mode_grayscale_title">Liath-sgèile</string>
-    <string name="daltonizer_mode_deuteranomaly_summary">Dearg is uaine</string>
-    <string name="daltonizer_mode_protanomaly_summary">Dearg is uaine</string>
-    <string name="daltonizer_mode_tritanomaly_summary">Gorm is buidhe</string>
+    <string name="daltonizer_mode_tritanomaly_summary">Tritanomaly</string>
     <string name="reduce_bright_colors_intensity_preference_title">Dèine</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay">
         <item quantity="one">Goirid (<xliff:g id="click_delay_label" example="200">%1$s</xliff:g> diog)</item>
@@ -2306,15 +2215,6 @@
         <item quantity="few"><xliff:g id="click_delay_label">%1$s</xliff:g> diogan</item>
         <item quantity="other"><xliff:g id="click_delay_label">%1$s</xliff:g> diog</item>
     </plurals>
-    <string name="accessibility_vibration_summary">Seirm <xliff:g id="summary_ring" example="Medium">%1$s</xliff:g>, brath<xliff:g id="summary_notification" example="Low">%2$s</xliff:g>, suathadh<xliff:g id="summary_touch" example="High">%3$s</xliff:g></string>
-    <string name="accessibility_vibration_summary_off">Chaidh an t-seirm ⁊ na brathan a chur dheth</string>
-    <string name="accessibility_vibration_summary_low">Chaidh an t-seirm ⁊ na brathan a chur air ìre ìseal</string>
-    <string name="accessibility_vibration_summary_medium">Chaidh an t-seirm ⁊ na brathan a chur air ìre meadhanach</string>
-    <string name="accessibility_vibration_summary_high">Chaidh an t-seirm ⁊ na brathan a chur air ìre àrd</string>
-    <string name="accessibility_vibration_intensity_off">Dheth</string>
-    <string name="accessibility_vibration_intensity_low">Fann</string>
-    <string name="accessibility_vibration_intensity_medium">Meadhanach</string>
-    <string name="accessibility_vibration_intensity_high">Àrd</string>
     <string name="accessibility_menu_item_settings">Roghainnean</string>
     <string name="accessibility_feature_state_on">Air</string>
     <string name="accessibility_feature_state_off">Dheth</string>
@@ -2355,16 +2255,6 @@
 <xliff:g id="service" example="TalkBack">%1$s</xliff:g>:</string>
     <string name="touch_filtered_warning">Air sgàth ’s gu bheil aplacaid a’ falach iarrtas air cead, chan urrainn
         do ghleus nan roghainnean an fhreagairt agad a dhearbhadh.</string>
-    <string name="enable_service_encryption_warning">Ma chuireas tu <xliff:g id="service" example="TalkBack">%1$s</xliff:g> air, cha chleachd an t-uidheam agad glas na sgrìn agad airson piseach a thoir air
-        crioptachadh an dàta.</string>
-    <string name="secure_lock_encryption_warning">On a chuir thu seirbheis na so-ruigsinneachd air,
-       cha chleachd an t-uidheam agad glas na sgrìn agad airson piseach a thoir air crioptachadh an dàta.</string>
-    <string name="enable_service_pattern_reason">On a bheir <xliff:g id="service" example="TalkBack">%1$s</xliff:g> buaidh air crioptachadh an dàta nuair a chuireas tu air e, feumaidh tu am pàtran agad a dhearbhadh.
-    </string>
-    <string name="enable_service_pin_reason">On a bheir <xliff:g id="service" example="TalkBack">%1$s</xliff:g> buaidh air crioptachadh an dàta nuair a chuireas tu air e, feumaidh tu am PIN agad a dhearbhadh.
-    </string>
-    <string name="enable_service_password_reason">On a bheir <xliff:g id="service" example="TalkBack">%1$s</xliff:g> buaidh air crioptachadh an dàta nuair a chuireas tu air e, feumaidh tu am facal-faire agad a dhearbhadh.
-    </string>
     <string name="accessibility_service_warning">Tha <xliff:g id="service" example="TalkBack">%1$s</xliff:g> ag iarraidh làn-smachd air an uidheam seo. ’S urrainn dhan t-seirbheis
         an sgrìn a leughadh agus gnìomhan a ghabhail às leth cleachdaidhean le feumalachdan so-ruigsinneachd.
         Chan eil an ìre seo de smachd iomchaidh dhan mhòrchuid a dh’aplacaidean.
@@ -2649,6 +2539,8 @@
     <string name="menu_stats_refresh">Ath-nuadhaich</string>
     <string name="process_mediaserver_label">Frithealaiche mheadhanan</string>
     <string name="process_dex2oat_label">Piseachadh aplacaidean</string>
+    <string name="process_network_tethering">Teadhrachadh</string>
+    <string name="process_removed_apps">Aplacaidean a chaidh a thoirt air falbh</string>
     <string name="battery_saver">Caomhnaiche a’ bhataraidh</string>
     <string name="battery_saver_auto_title">Cuir air gu fèin-obrachail</string>
     <string name="battery_saver_auto_no_schedule">Gun sgeideal</string>
@@ -2868,14 +2760,6 @@
     <string name="remove_account_failed">Cha cheadaich an rianaire agad an t-atharrachadh seo</string>
     <string name="cant_sync_dialog_title">Cha ghabh a shioncronachadh a làimh</string>
     <string name="cant_sync_dialog_message">Tha an sioncronachadh dheth dhan nì seo an-dràsta. Airson an roghainn seo atharrachadh, cuir an dàta sa chùlaibh ’s an sioncronachadh fèin-obrachail air greis.</string>
-    <string name="enter_password">Airson Android a chur gu dol, cuir a-steach am facal-faire agad</string>
-    <string name="enter_pin">Airson Android a chur gu dol, cuir a-steach am PIN agad</string>
-    <string name="enter_pattern">Airson Android a chur gu dol, tarraing am pàtran agad</string>
-    <string name="cryptkeeper_wrong_pattern">Pàtran ceàrr</string>
-    <string name="cryptkeeper_wrong_password">Facal-faire ceàrr</string>
-    <string name="cryptkeeper_wrong_pin">PIN ceàrr</string>
-    <string name="checking_decryption">’Ga dhearbhadh\u2026</string>
-    <string name="starting_android">A’ tòiseachadh Android\u2026</string>
     <string name="delete">Sguab às</string>
     <string name="misc_files">Faidhlichean measgaichte</string>
     <string name="misc_files_selected_count">chaidh <xliff:g id="number" example="3">%1$d</xliff:g> à <xliff:g id="total" example="15">%2$d</xliff:g> a thaghadh</string>
@@ -2971,8 +2855,6 @@
     <string name="data_usage_metered_yes">Meadaraichte</string>
     <string name="data_usage_metered_no">Neo-mheadaraichte</string>
     <string name="data_usage_disclaimer">Dh’fhaoidte gum bi cunntasachd a’ ghiùlanair air an dàta eadar-dhealaichte on uidheam agad.</string>
-    <string name="cryptkeeper_emergency_call">Gairm-èiginn</string>
-    <string name="cryptkeeper_return_to_call">Till dhan ghairm</string>
     <string name="vpn_name">Ainm</string>
     <string name="vpn_type">Seòrsa</string>
     <string name="vpn_server">Seòladh an fhrithealaiche</string>
@@ -3074,18 +2956,6 @@
         <item quantity="few">Cuir earbsa sna teisteanasan no thoir air falbh iad</item>
         <item quantity="other">Cuir earbsa sna teisteanasan no thoir air falbh iad</item>
     </plurals>
-    <plurals name="ssl_ca_cert_info_message_device_owner">
-        <item quantity="one">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarras theisteanasan air an uidheam agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh an uidheim agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mun teisteanas seo, cuir fios gun rianaire agad.</item>
-        <item quantity="two">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarrasan theisteanasan air an uidheam agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh an uidheim agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mu na teisteanasan seo, cuir fios gun rianaire agad.</item>
-        <item quantity="few">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarrasan theisteanasan air an uidheam agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh an uidheim agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mu na teisteanasan seo, cuir fios gun rianaire agad.</item>
-        <item quantity="other">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarrasan theisteanasan air an uidheam agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh an uidheim agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mu na teisteanasan seo, cuir fios gun rianaire agad.</item>
-    </plurals>
-    <plurals name="ssl_ca_cert_info_message">
-        <item quantity="one">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarras theisteanasan airson pròifil na h-obrach agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh na h-obrach agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mun teisteanas seo, cuir fios gun rianaire agad.</item>
-        <item quantity="two">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarrasan theisteanasan airson pròifil na h-obrach agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh na h-obrach agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mu na teisteanasan seo, cuir fios gun rianaire agad.</item>
-        <item quantity="few">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarrasan theisteanasan airson pròifil na h-obrach agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh na h-obrach agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mu na teisteanasan seo, cuir fios gun rianaire agad.</item>
-        <item quantity="other">Stàlaich <xliff:g id="managing_domain">%s</xliff:g> ùghdarrasan theisteanasan airson pròifil na h-obrach agad agus dh’fhaoidte gun doir sin comas dhaibh gun cùm iad sùil air gnìomhachd lìonraidh na h-obrach agad, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nAirson barrachd fiosrachaidh mu na teisteanasan seo, cuir fios gun rianaire agad.</item>
-    </plurals>
     <string name="ssl_ca_cert_warning_message">Tha comas aig treas-phàrtaidh sùil a chumail air do ghnìomhachd lìonraidh, a’ gabhail a-staigh puist-d, aplacaidean is làraichean-lìn tèarainte.\n\nThug teisteas earbsach a chaidh a stàladh air an uidheam agad an comas sin dha.</string>
     <plurals name="ssl_ca_cert_settings_button">
         <item quantity="one">Thoir sùil air an teisteanas</item>
@@ -3099,14 +2969,12 @@
     <string name="user_settings_footer_text" product="default">Co-roinn am fòn agad ’s tu a’ cur cleachdaichean ùra ris. Bidh àite phearsanta aig gach cleachdaiche air an fhòn agad airson sgrìnichean dachaigh, cunntasan, aplacaidean, roghainnean ’s a bharrachd a ghnàthachadh dhaibh fhèin.</string>
     <string name="user_list_title">Cleachdaichean ⁊ pròifilean</string>
     <string name="user_add_user_or_profile_menu">Cuir cleachdaiche no pròifil ris</string>
-    <string name="user_add_user_menu">Cuir cleachdaiche ris</string>
     <string name="user_summary_restricted_profile">Pròifil chuingichte</string>
     <string name="user_summary_not_set_up">Cha deach seo a shuidheachadh</string>
     <string name="user_summary_restricted_not_set_up">Cha deach pròifil chuingichte a shuidheachadh</string>
     <string name="user_summary_managed_profile_not_set_up">Cha deach pròifil obrach a shuidheachadh</string>
     <string name="user_admin">Rianaire</string>
     <string name="user_you">Thusa (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
-    <string name="user_add_max_count">’S urrainn dhut suas ri <xliff:g id="user_count">%1$d</xliff:g> cleachdaiche(an) a chur ris</string>
     <string name="user_cannot_manage_message" product="tablet">Chan fhaod ach seilbheadair na tablaid cleachdaichean a stiùireadh.</string>
     <string name="user_cannot_manage_message" product="default">Chan fhaod ach seilbheadair an fhòn cleachdaichean a stiùireadh.</string>
     <string name="user_cannot_add_accounts_message">Chan fhaod pròifil chuingichte cunntas a chur ris</string>
@@ -3125,9 +2993,6 @@
     <string name="user_adding_new_user">A’ cur cleachdaiche ùir ris\u2026</string>
     <string name="user_delete_user_description">Sguab às an cleachdaiche</string>
     <string name="user_delete_button">Sguab às</string>
-    <string name="user_guest">Aoigh</string>
-    <string name="user_exit_guest_title">Thoir an t-aoigh air falbh</string>
-    <string name="user_exit_guest_confirm_title">An doir thu an t-aoigh air falbh?</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="user_enable_calling">Cuir gairmean fòn air</string>
@@ -3143,12 +3008,12 @@
     <string name="apps_with_restrictions_header">Aplacaidean le cuingeachaidhean</string>
     <string name="apps_with_restrictions_settings_button">Leudaich roghainnean na h-aplacaid</string>
     <string name="nfc_payment_settings_title">Pàighidhean gun cho-thadhal</string>
+    <string name="nfc_more_details">Barrachd fiosrachaidh</string>
     <string name="nfc_payment_how_it_works">Mar a dh’obraicheas e</string>
     <string name="nfc_payment_no_apps">Pàigh leis an fhòn agad ann am bùithtean</string>
     <string name="nfc_payment_default">Bun-roghainn a’ phàighidh</string>
     <string name="nfc_payment_default_not_set">Cha deach a shuidheachadh</string>
     <string name="nfc_payment_app_and_desc"><xliff:g id="app">%1$s</xliff:g> – <xliff:g id="description">%2$s</xliff:g></string>
-    <string name="nfc_payment_use_default">Cleachd a’ bhun-roghainn</string>
     <string name="nfc_payment_favor_default">An-còmhnaidh</string>
     <string name="nfc_payment_favor_open">Ach nuair a bhios aplacaid pàighidh eile fosgailte</string>
     <string name="nfc_payment_pay_with">Aig tèirmineal gun cho-thadhal, pàigh le:</string>
@@ -3165,6 +3030,7 @@
     </string>
     <string name="nfc_payment_btn_text_set_deault">Suidhich mar a’ bhun-roghainn</string>
     <string name="nfc_payment_btn_text_update">Ùraich</string>
+    <string name="nfc_work_text">Obair</string>
     <string name="restriction_settings_title">Cuingeachaidhean</string>
     <string name="restriction_menu_reset">Thoir air falbh na cuingeachaidhean</string>
     <string name="restriction_menu_change_pin">Atharraich am PIN</string>
@@ -3229,7 +3095,6 @@
     <string name="sim_cellular_data_unavailable">Chan eil dàta mobile ri làimh</string>
     <string name="sim_cellular_data_unavailable_summary">Thoir gnogag gus SIM dàta a thaghadh</string>
     <string name="sim_calls_always_use">Cleachd seo airson fòn a chur an-còmhnaidh</string>
-    <string name="select_sim_for_data">Tagh SIM airson dàta</string>
     <string name="select_sim_for_sms">Tagh SIM dha SMS</string>
     <string name="select_sim_for_calls">Cuir fòn le </string>
     <string name="sim_select_card">Tagh cairt SIM</string>
@@ -3287,7 +3152,6 @@
     <string name="keywords_wifi">wifi, wi-fi, network connection, internet, wireless, data, wi fi, ceangal lìonraidh, ceangal dhan lìonra, eadar-lìon, lìonra, gun uèir, dàta</string>
     <string name="keywords_wifi_notify_open_networks">Wi\u2011Fi notification, wifi notification, brath WiFi</string>
     <string name="keywords_wifi_data_usage">caitheamh dàta</string>
-    <string name="keywords_vibrate_on_touch">Stop vibration, tap, keyboard, stad, crith, gnogag, meur-chlàr</string>
     <string name="keywords_time_format">Cleachd fòrmat 24 uair a thìde</string>
     <string name="keywords_storage_files">Luchdaich a-nuas</string>
     <string name="keywords_app_default">Fosgail le</string>
@@ -3313,11 +3177,9 @@
     <string name="keywords_network_reset">reset, restore, factory, ath-shuidhich, ath-shuidheachadh, aisig, aiseag, factaraidh</string>
     <string name="keywords_factory_data_reset">wipe, delete, restore, clear, remove, factory reset, sguab às, sguabadh às, suath às, suathadh às, aisig, aiseag, glan, glanadh, falamhaich, falamhachadh, thoirt air falbh, thoir air falbh, ath-shuidhich, ath-shuidheachadh, factaraidh</string>
     <string name="keywords_printing">printer clò-bhualadh clò-bhualadair clò-bhuail</string>
-    <string name="keywords_sounds">speaker beep, speaker, volume, mute, silence, audio, music, bìog, glaodhaire, àirde na fuaime, àirde, fuaim, mùch, mùchadh, tost, tosd, sàmhchair, sàmhach, ceòl </string>
     <string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb, interrupt, interruption, break, na bris a-steach orm, bris a-steach, briseadh a-steach, buaireadh, fois</string>
     <string name="keywords_app">RAM</string>
     <string name="keywords_location">nearby, location, history, reporting, GPS, faisg ort, am fagas, ionad, eachdraidh, aithriseadh</string>
-    <string name="keywords_accounts">account, add an account, work profile, add account, cunntas, cuir ris cunntas, cuir cunntas ris, pròifil na h-obrach, obair</string>
     <string name="keywords_users">restriction, restrict, restricted, cuingich, cuingeachadh, cuingichte</string>
     <string name="keywords_keyboard_and_ime">text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international, ceartachadh teacsa, teacsa, ceartaich, ceart, fuaim, crith, fèin-obrachail, cànan, gluasad, mol, moladh, ùrlar, droch, facal, sgrìobh, sgrìobhadh, emoji, eadar-nàiseanta</string>
     <string name="keywords_reset_apps">reset, preferences, default, ath-shuidhich, aisig, aiseag, roghainnean, bun-roghainn, tùsail, bunaiteach</string>
@@ -3358,7 +3220,6 @@
     <string name="keywords_hotspot_tethering">usb tether, bluetooth tether, wifi hotspot, teadhrachadh, usb, bluetooth, hotspot, wifi</string>
     <string name="keywords_touch_vibration">haptics, vibrate, screen, sensitivity, faireachdainn, suathadh, crith, dèan crith, sgrìn, mothalachd</string>
     <string name="keywords_ring_vibration">haptics, vibrate, phone, call, sensitivity, ring, faireachdainn, suathadh, crith, dèan crith, fòn, cuir fòn, gairm, mothalachd, seirm</string>
-    <string name="keywords_notification_vibration">haptics, vibrate, sensitivity, faireachdainn, suathadh, crith, dèan crith, mothalachd</string>
     <string name="keywords_battery_saver_sticky">battery saver, sticky, persist, power saver, battery, caomhnaiche a’ bhataraidh, steigeach, mair, caomhnaiche cumhachd, cumhachd, bataraidh</string>
     <string name="keywords_battery_saver_schedule">routine, schedule, battery saver, power saver, battery, automatic, percent, cunbhalach, sgeideal, caomhnaiche a’ bhataraidh, caomhnaiche cumhachd, cumhachd, bataraidh, fèin-obrachail, ceudad</string>
     <string name="keywords_enhance_4g_lte">volte, advanced calling, 4g calling, gairm adhartach, gairmean adhartach, 4g</string>
@@ -3391,8 +3252,6 @@
     <string name="charging_sounds_title">Fuaimean ’s crith an teàirrdsidh</string>
     <string name="docking_sounds_title">Fuaimean docaidh</string>
     <string name="touch_sounds_title">Fuaimean suathaidh</string>
-    <string name="vibrate_on_touch_title">Crith suathaidh</string>
-    <string name="vibrate_on_touch_summary">Freagairt suathaidh airson gnogagan, a’ mheur-chlàir ’s a bharrachd</string>
     <string name="dock_audio_media_title">Cluichidh glaodhaire an doca</string>
     <string name="dock_audio_media_disabled">A h-uile fuaim</string>
     <string name="dock_audio_media_enabled">Fuaim nam meadhanan a-mhàin</string>
@@ -3402,6 +3261,7 @@
     <string name="boot_sounds_title">Cuir a’ chumachd air le fuaimean</string>
     <string name="live_caption_title">Fo-thiotalan beòtha</string>
     <string name="live_caption_summary">Cuir fo-thiotalan ri meadhanan gu fèin-obrachail</string>
+    <string name="spatial_summary_off">Dheth</string>
     <string name="zen_mode_settings_title">Na bris a-steach orm</string>
     <string name="zen_mode_settings_summary">Na faigh brathan ach o dhaoine is aplacaidean cudromach</string>
     <string name="zen_mode_slice_subtitle">Cuingich am briseadh a-steach ort</string>
@@ -3509,6 +3369,7 @@
     <string name="recent_notifications_see_all_title">Seall na h-uile o na 7 làithean seo chaidh</string>
     <string name="app_notification_field">Roghainnean nan aplacaid</string>
     <string name="profile_section_header">Brathan na h-obrach</string>
+    <string name="profile_section_header_for_advanced_privacy">Pròifil na h-obrach</string>
     <string name="smart_notifications_title">Brathan co-fhreagrach</string>
     <string name="asst_capability_prioritizer_title">Prìomhachas nam brathan co-fhreagrach</string>
     <string name="asst_capability_prioritizer_summary">Dèan brathan ciùine dhen fheadhainn le prìomhachas ìosal gu fèin-obrachail</string>
@@ -3570,6 +3431,7 @@
     <string name="keywords_lockscreen_bypass">Lock screen, Lockscreen, Skip, Bypass, sgrìn-ghlasaidh, geàrr leum, leig seachad</string>
     <string name="locked_work_profile_notification_title">Nuair a bhios pròifil na h-obrach glaiste</string>
     <string name="lock_screen_notifs_title">Brathan air an sgrìn-ghlasaidh</string>
+    <string name="lock_screen_notifs_show_all_summary">Seall na còmhraidhean, bun-roghainnean, agus tostach</string>
     <string name="lock_screen_notifs_show_all">Seall na còmhraidhean, bun-roghainnean, agus tostach</string>
     <string name="lock_screen_notifs_show_alerting">Falaich na còmhraidhean ’s brathan tostach</string>
     <string name="lock_screen_notifs_show_none">Na seall brath sam bith</string>
@@ -3645,18 +3507,6 @@
     <string name="notification_switch_label">Gach brath o “<xliff:g id="app_name" example="Android Services">%1$s</xliff:g>”</string>
     <string name="notification_app_switch_label">Gach brath o <xliff:g id="app_name" example="Android Services">%1$s</xliff:g></string>
     <string name="default_notification_assistant">Brathan co-fhreagrach</string>
-    <plurals name="notifications_sent_daily">
-        <item quantity="one">~<xliff:g id="number">%d</xliff:g> bhrath gach latha</item>
-        <item quantity="two">~<xliff:g id="number">%d</xliff:g> bhrath gach latha</item>
-        <item quantity="few">~<xliff:g id="number">%d</xliff:g> brathan gach latha</item>
-        <item quantity="other">~<xliff:g id="number">%d</xliff:g> brath gach latha</item>
-    </plurals>
-    <plurals name="notifications_sent_weekly">
-        <item quantity="one">~<xliff:g id="number">%d</xliff:g> bhrath gach seachdain</item>
-        <item quantity="two">~<xliff:g id="number">%d</xliff:g> bhrath gach seachdain</item>
-        <item quantity="few">~<xliff:g id="number">%d</xliff:g> brathan gach seachdain</item>
-        <item quantity="other">~<xliff:g id="number">%d</xliff:g> brath gach seachdain</item>
-    </plurals>
     <string name="notifications_sent_never">Chan ann idir</string>
     <string name="work_profile_notification_access_blocked_summary">Tha an t-inntrigeadh gu brathan pròifil na h-obrach bacte</string>
     <string name="manage_notification_access_summary_zero">Chan fhaod aplacaidean brathan a leughadh</string>
@@ -4132,8 +3982,6 @@
     <string name="high_power_system">Chan eil piseachadh a’ bhataraidh ri fhaighinn</string>
     <string name="high_power_desc">Na cuir piseachadh a’ bhataraidh an sàs. Faodaidh seo am bataraidh agad a thraoghadh nas luaithe.</string>
     <string name="high_power_prompt_title">Am faod an aplacaid ruith sa chùlaibh an-an-còmhnaidh?</string>
-    <string name="high_power_prompt_body">        Ma leigeas tu le <xliff:g id="app_name" example="Settings">%1$s</xliff:g> ruith sa chùlaibh an-còmhnaidh, dh’fhaoidte gun traogh sin am bataraidh nas luaithe.
-        \n\n’S urrainn dhut seo atharrachadh uair sam bith o “Roghainnean” &gt; “Aplacaidean ⁊ brathan”.</string>
     <string name="battery_summary"><xliff:g id="percentage" example="2">%1$s</xliff:g> air a chaitheamh on làn-teàirrds mu dheireadh</string>
     <string name="no_battery_summary">Cha deach gin dhen bhataraidh a chaitheamh on làn-teàirrds mu dheireadh</string>
     <string name="app_notification_preferences">Roghainnean na h-aplacaid</string>
@@ -4256,7 +4104,6 @@
     <string name="camera_double_tap_power_gesture_title">Brùth dà thuras air putan na cumhachd airson camara fhaighinn</string>
     <string name="camera_double_tap_power_gesture_desc">Fosgail an camara gu luath gun neo-ghlasadh na sgrìn</string>
     <string name="screen_zoom_title">Meud an taisbeanaidh</string>
-    <string name="screen_zoom_short_summary">Dèan rudan air an sgrìn nas motha no nas lugha</string>
     <string name="screen_zoom_keywords">display density, screen zoom, scale, scaling, dùmhlachd, sgrìn, sùm, sgèile</string>
     <string name="screen_zoom_summary">Dèan nithean nas lugha no nas motha air an sgrìn agad. Dh’fhaoidte gun atharraich cuid dhe na h-aplacaidean air an sgrìn an ionad.</string>
     <string name="screen_zoom_preview_title">Ro-shealladh</string>
@@ -4490,8 +4337,6 @@
         <item quantity="other">Faodaidh <xliff:g id="count" example="10">%d</xliff:g> aplacaid dàta gun chuingeachadh a chleachdadh</item>
     </plurals>
     <string name="special_access_more">Seall barrachd</string>
-    <string name="confirm_convert_to_fbe_warning">An suath thu bàn dàta a’ cleachdaiche ’s an iompaich thu gu crioptachadh fhaidhlichean e?</string>
-    <string name="button_confirm_convert_fbe">Suath bàn is iompaich</string>
     <string name="reset_shortcut_manager_throttling">Ath-shuidhich cuingeachadh ghairmean API a’ ShortcutManager</string>
     <string name="reset_shortcut_manager_throttling_complete">Chaidh cuingeachadh ghairmean API a’ ShortcutManager ath-shuidheachadh</string>
     <string name="notification_suggestion_title">Stiùirich am fiosrachadh air an sgrìn-ghlasaidh</string>
@@ -4508,8 +4353,6 @@
     <string name="demo_mode">Modh demo air UI an t-siostaim</string>
     <string name="dark_ui_mode">Ùrlar dorcha</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_off">’Ga chur an comas greis le caomhnaiche a’ bhataraidh</string>
-    <string name="dark_ui_settings_dark_summary">Atharraichidh na h-aplacaidean a chuireas taic ris dhan ùrlar dorcha cuideachd</string>
-    <string name="dark_ui_settings_dialog_acknowledge">Tha mi agaibh</string>
     <string name="dark_theme_slice_title">Feuch an t-ùrlar dorcha</string>
     <string name="dark_theme_slice_subtitle">Cuiridh seo ri beatha a’ bhataraidh</string>
     <string name="quick_settings_developer_tiles">Leacagan grad-roghainnean an luchd-leasachaidh</string>
@@ -4574,7 +4417,6 @@
     <string name="right_edge">Oir dheas</string>
     <string name="back_sensitivity_dialog_message">Dh’fhaoidte gum bi còmhstri eadar a’ mhothalachd as àirde agus gluasadan aplacaidean aig oirean na sgrìn.</string>
     <string name="back_sensitivity_dialog_title">Mothalachd “Air ais”</string>
-    <string name="gesture_settings_activity_title">Roghainnean nan gluasadan</string>
     <string name="keywords_gesture_navigation_settings">gesture navigation, back sensitivity, back gesture, seòladaireachd, gluasadan, mothalachd, gluasad, air ais</string>
     <string name="ambient_display_title" product="default">Thoir gnogag dhùbailte a thoirt sùil air an fhòn</string>
     <string name="ambient_display_title" product="tablet">Thoir gnogag dhùbailte a thoirt sùil air an tablaid</string>
@@ -4972,6 +4814,7 @@
     <string name="sim_action_yes">Tha</string>
     <string name="sim_action_reboot">Ath-thòisich</string>
     <string name="sim_action_no_thanks">Chan iarr mi seo</string>
+    <string name="sim_action_cancel">Sguir dheth</string>
     <string name="erase_sim_dialog_title">An suath thu bàn an SIM air a luchdadh a-nuas seo?</string>
     <string name="erase_sim_confirm_button">Suath bàn</string>
     <string name="network_connection_request_dialog_title">Ceangail ri uidheam</string>
@@ -4999,6 +4842,7 @@
     <string name="hwui_force_dark_summary">Tar-àithnidh seo gleus sparradh a’ mhodh dhuirch ach am bi e air an-còmhnaidh</string>
     <string name="privacy_dashboard_title">Prìobhaideachd</string>
     <string name="privacy_dashboard_summary">Ceadan, gnìomhachd a’ chunntais, dàta pearsanta</string>
+    <string name="privacy_controls_title">Uidheaman-smachd</string>
     <string name="contextual_card_dismiss_remove">Thoir air falbh</string>
     <string name="contextual_card_dismiss_keep">Cùm</string>
     <string name="contextual_card_dismiss_confirm_message">A bheil thu airson am moladh seo a thoirt air falbh?</string>
@@ -5089,6 +4933,7 @@
     <string name="turn_on_wifi">Cuir WiFi air</string>
     <string name="sim_category_title">SIM</string>
     <string name="default_active_sim_calls">gairmean</string>
+    <string name="wifi_scan_change">Atharraich</string>
     <string name="mobile_data_connection_active">Ceangailte</string>
     <string name="mobile_data_disable_title">An cuir thu dheth dàta mobile?</string>
     <string name="aware_summary_when_bedtime_on">Chan eil seo ri fhaighinn air sgàth ’s gu bheil modh an ama-cadail air</string>
@@ -5117,4 +4962,17 @@
     <string name="bluetooth_connect_access_dialog_content">Tha <xliff:g id="device_name" example="My device">%1$s</xliff:g> airson ceangal a dhèanamh ris an fhòn seo.\n\nCha do rinn thu ceangal ri <xliff:g id="device_name" example="My device">%2$s</xliff:g> roimhe riamh.</string>
     <string name="bluetooth_connect_access_dialog_negative">Na ceangail</string>
     <string name="bluetooth_connect_access_dialog_positive">Ceangail</string>
+    <string name="tare_on">Air</string>
+    <string name="tare_off">Dheth</string>
+    <string-array name="tare_modifiers_subfactors">
+        <item>’Ga theàirrdseadh</item>
+        <item>Doze</item>
+        <item>Power Save Mode</item>
+        <item>Process State</item>
+    </string-array>
+    <string name="tare_dialog_confirm_button_title">Dearbh</string>
+    <string name="dream_preview_button_title">Ro-shealladh</string>
+    <string name="bluetooth_find_broadcast_button_scan">Sganaich an còd QR</string>
+    <string name="find_broadcast_password_dialog_password_error">Facal-faire ceàrr</string>
+    <string name="bt_le_audio_qr_code_is_not_valid_format">Chan eil fòrmat dligheach air a’ chòd QR seo</string>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-kab-rDZ/arrays.xml b/overlay/packages/apps/Settings/res/values-kab-rDZ/arrays.xml
index a774def..3372ced 100644
--- a/overlay/packages/apps/Settings/res/values-kab-rDZ/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-kab-rDZ/arrays.xml
@@ -350,7 +350,7 @@
     <string-array name="captioning_font_size_selector_titles">
         <item>Very small</item>
         <item>Meẓẓi</item>
-        <item>Akk-a kan</item>
+        <item>Alemmas</item>
         <item>Ameqran</item>
         <item>Very large</item>
     </string-array>
@@ -487,4 +487,9 @@
         <item>NR/LTE/TDSCDMA/GSM/WCDMA</item>
         <item>NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>Weṛǧin</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
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 bbe4329..70a5ee5 100644
--- a/overlay/packages/apps/Settings/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-kab-rDZ/strings.xml
@@ -39,8 +39,8 @@
     <string name="bluetooth_disconnect_dialog_ok">Ffeɣ</string>
     <string name="bluetooth_connection_permission_request">"Asuter n tuqqna n Bluetooth"</string>
     <string name="bluetooth_map_request">"Asuter ɣer unekcum n izen"</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Ales tanekra</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Sefsex</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm">Ales tanekra</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">Sefsex</string>
     <string name="previous_connected_see_all">Wali akk</string>
     <string name="date_and_time">Azemz d wakud</string>
     <string name="proxy_settings_title">Apṛuksi</string>
@@ -53,6 +53,7 @@
     <string name="language_picker_title">Tutlayin</string>
     <string name="locale_remove_menu">Kkes</string>
     <string name="add_a_language">Rnu tutlayt</string>
+    <string name="app_locale_preference_title">Tutlayt</string>
     <string name="action_drag_label_move_up">Ali d asawen</string>
     <string name="action_drag_label_move_down">Ader d akesser</string>
     <string name="display_label">Agdil</string>
@@ -111,9 +112,8 @@
     <string name="security_settings_fingerprint_enroll_done">Immed</string>
     <string name="fingerprint_enroll_button_next">Γer zdat</string>
     <string name="fingerprint_last_delete_confirm">Ih, ekkes</string>
-    <string name="crypt_keeper_settings_title">Awgelhen</string>
-    <string name="crypt_keeper_encrypted_summary">Yettwawgelhen</string>
-    <string name="crypt_keeper_setup_title">Awgelhen</string>
+    <string name="encryption_settings_title">Awgelhen</string>
+    <string name="encrypted_summary">Yettwawgelhen</string>
     <string name="setup_lock_settings_picker_title" product="default">Mmesten tiliɣri-ik</string>
     <string name="unlock_set_unlock_launch_picker_title">Aseḍru n wegdil</string>
     <string name="unlock_set_unlock_off_title">Ulac</string>
@@ -126,7 +126,6 @@
     <string name="unlock_set_unlock_mode_pattern">Talɣa</string>
     <string name="unlock_set_unlock_mode_password">Awal uffir</string>
     <string name="unlock_disable_frp_warning_ok">Kkes</string>
-    <string name="lock_failed_attempts_now_wiping_dialog_dismiss">Suref</string>
     <string name="lockpassword_continue_label">Kemmel</string>
     <string name="lockpassword_confirm_label">Sentem</string>
     <string name="lockpassword_cancel_label">Sefsex</string>
@@ -212,7 +211,6 @@
         <item>Aziraz</item>
     </string-array>
     <string name="display_settings_title">Sken</string>
-    <string name="sound_settings">Imesli</string>
     <string name="all_volume_title">Iblaɣ</string>
     <string name="incoming_call_volume_title">Aṭenṭen</string>
     <string name="notification_volume_title">Ilɣa</string>
@@ -323,7 +321,6 @@
     <string name="manual">S ufus</string>
     <string name="copyright_title">Izerfan ttwaḥerzen</string>
     <string name="license_title">Turagt</string>
-    <string name="wallpaper_attributions">Tugniwin n ugilal</string>
     <string name="settings_manual_activity_title">S ufus</string>
     <string name="settings_license_activity_loading">Asali\u2026</string>
     <string name="settings_safetylegal_activity_loading">Asali\u2026</string>
@@ -360,6 +357,7 @@
     <string name="internal_storage">Asekles agensan</string>
     <string name="dlg_ok">IH</string>
     <string name="dlg_cancel">Semmet</string>
+    <string name="dlg_delete">Kkes</string>
     <string name="move_app">Senkez</string>
     <string name="app_install_details_group_title">Taḥanut</string>
     <string name="app_install_details_title">Talqayt n wesnas</string>
@@ -410,6 +408,8 @@
     <string name="display_category_title">Sken</string>
     <string name="experimental_category_title">Expérimental</string>
     <string name="accessibility_screen_magnification_title">Asemɣer</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">Sefsex</string>
+    <string name="accessibility_text_reading_confirm_dialog_reset_button">Wennez</string>
     <string name="accessibility_tutorial_dialog_button">Gziɣ</string>
     <string name="accessibility_shortcut_edit_dialog_title_advance">Talqayt</string>
     <string name="accessibility_button_location_title">Adig</string>
@@ -422,19 +422,17 @@
     <string name="accessibility_timeout_1min">1 n tisdat</string>
     <string name="accessibility_timeout_2mins">2 n tisdatin</string>
     <string name="accessibility_display_inversion_preference_title">Inversion de couleur</string>
-    <string name="accessibility_autoclick_default_title">Insa</string>
     <string name="accessibility_autoclick_medium_title">Alemmas</string>
     <string name="accessibility_autoclick_custom_title">Udmawan</string>
+    <string name="accessibility_vibration_settings_state_off">Insa</string>
+    <string name="accessibility_call_vibration_category_title">Appels</string>
+    <string name="accessibility_quick_settings_tooltip_dismiss">Suref</string>
     <string name="captioning_more_options_title">Ugar n iɣewwaṛen</string>
     <string name="accessibility_hearingaid_instruction_continue_button">Kemmel</string>
     <string name="accessibility_summary_shortcut_disabled">Insa</string>
     <string name="accessibility_summary_state_disabled">Insa</string>
     <string name="daltonizer_mode_grayscale_title">Tifesniwin n umliɣdi</string>
     <string name="reduce_bright_colors_intensity_preference_title">Intensité</string>
-    <string name="accessibility_vibration_intensity_off">Insa</string>
-    <string name="accessibility_vibration_intensity_low">Faible</string>
-    <string name="accessibility_vibration_intensity_medium">Alemmas</string>
-    <string name="accessibility_vibration_intensity_high">Haut</string>
     <string name="accessibility_menu_item_settings">Iɣewwaṛen</string>
     <string name="accessibility_feature_state_off">Insa</string>
     <string name="captioning_preview_title">Timeẓriwt</string>
@@ -492,6 +490,7 @@
     <string name="battery_action_app_settings">Iɣewwaṛen</string>
     <string name="battery_action_display">Iγewwaṛen n unagraw</string>
     <string name="menu_stats_refresh">Sismeḍ</string>
+    <string name="process_removed_apps">Isnasen ittwakksen</string>
     <string name="battery_saver">Aḥraz n uẓru</string>
     <string name="battery_saver_seekbar_title_placeholder">Rmed</string>
     <string name="battery_saver_turn_on_automatically_never">Weṛǧin</string>
@@ -549,8 +548,6 @@
     <string name="data_usage_uninstalled_apps">Isnasen ittwakksen</string>
     <string name="data_usage_uninstalled_apps_users">Isnasen d iseqdacen ittwakksen</string>
     <string name="data_usage_metered_auto">Awurman</string>
-    <string name="cryptkeeper_emergency_call">Isawalen uɛjilen</string>
-    <string name="cryptkeeper_return_to_call">Uɣal ɣer usiwel</string>
     <string name="vpn_name">Isem</string>
     <string name="vpn_type">Ṣṣenf</string>
     <string name="vpn_show_options">Afficher les options avancées</string>
@@ -578,18 +575,17 @@
     <string name="trusted_credentials_remove_label">Kkes asebded</string>
     <string name="backup_pw_cancel_button_text">Semmet</string>
     <string name="done_button">Immed</string>
-    <string name="user_add_user_menu">Rnu aseqdac</string>
     <string name="user_admin">Anedbal</string>
     <string name="user_delete_user_description">Kkes aseqdac</string>
     <string name="user_delete_button">Mḥu</string>
-    <string name="user_guest">Inebgi</string>
     <string name="user_exit_guest_dialog_remove">Kkes</string>
     <string name="user_remove_user">Kkes aseqdac</string>
+    <string name="nfc_more_details">Issin ugar</string>
     <string name="nfc_payment_default_not_set">Ur ittwasbadu ara</string>
-    <string name="nfc_payment_use_default">Seqdec udem amezwer</string>
     <string name="nfc_payment_favor_default">Dima</string>
     <string name="nfc_how_it_works_got_it">Gziɣ</string>
     <string name="nfc_payment_btn_text_update">Lqem</string>
+    <string name="nfc_work_text">Axeddim</string>
     <string name="help_label">Tallelt &amp; tiktiwin</string>
     <string name="repeat_title">Ales</string>
     <string name="preferred_network_type_title">Anaw n uẓeṭṭa anurif</string>
@@ -612,6 +608,7 @@
     <string name="notification_volume_option_title">Imesli n ilɣa</string>
     <string name="ringtone_title">Taṭenṭant n tiliγri</string>
     <string name="emergency_tone_silent">Sgugem</string>
+    <string name="spatial_summary_off">Insa</string>
     <string name="zen_mode_automation_settings_title">Planifications</string>
     <string name="zen_mode_schedule_delete">Kkes</string>
     <string name="zen_mode_rule_name_edit">Ẓreg</string>
@@ -774,7 +771,6 @@
     <string name="page_tab_title_summary">Tous</string>
     <string name="bluetooth_disabled">Insa</string>
     <string name="dark_ui_mode">Asentel aberkan</string>
-    <string name="dark_ui_settings_dialog_acknowledge">Gziɣ</string>
     <string name="automatic_storage_manager_settings">Sefrek aḥraz</string>
     <string name="deletion_helper_automatic_title">Awurman</string>
     <string name="deletion_helper_manual_title">S ufus</string>
@@ -837,6 +833,7 @@
     <string name="sim_action_yes">Ih</string>
     <string name="sim_action_reboot">Ales tanekra</string>
     <string name="sim_action_no_thanks">Uhu tannemmit</string>
+    <string name="sim_action_cancel">Sefsex</string>
     <string name="erase_sim_confirm_button">Effacer</string>
     <string name="network_connection_timeout_dialog_ok">Ɛreḍ tikkelt nniḍen</string>
     <string name="network_connection_request_dialog_showall">Sken meṛṛa</string>
@@ -844,6 +841,7 @@
     <string name="bluetooth_right_name">Ayeffus</string>
     <string name="volume_connectivity_panel_title">Imesli</string>
     <string name="privacy_dashboard_title">Tabaḍnit</string>
+    <string name="privacy_controls_title">Contrôles</string>
     <string name="contextual_card_dismiss_remove">Kkes</string>
     <string name="contextual_card_dismiss_keep">Eǧǧ</string>
     <string name="contextual_card_undo_dismissal_text">Err-d</string>
@@ -857,6 +855,7 @@
     <string name="keywords_media_controls">amidya</string>
     <string name="bluetooth_setting_off">Insa</string>
     <string name="calls_preference_title">Appels</string>
+    <string name="wifi_scan_change">Senfel</string>
     <string name="mobile_data_connection_active">Iqqen</string>
     <string name="apps_dashboard_title">Isnasen</string>
     <string name="category_name_brightness">Abruṛeq</string>
@@ -864,4 +863,15 @@
     <string name="smart_forwarding_missing_alert_dialog_text">IH</string>
     <string name="next_page_content_description">Γer zdat</string>
     <string name="bluetooth_connect_access_dialog_positive">Qqen</string>
+    <string name="tare_off">Insa</string>
+    <string-array name="tare_modifiers_subfactors">
+        <item>Ittɛemmiṛ</item>
+        <item>Doze</item>
+        <item>Power Save Mode</item>
+        <item>Process State</item>
+    </string-array>
+    <string name="tare_dialog_confirm_button_title">Sentem</string>
+    <string name="dream_preview_button_title">Timeẓriwt</string>
+    <string name="bluetooth_find_broadcast_button_scan">Semḍen tangalt QR</string>
+    <string name="find_broadcast_password_dialog_password_error">Awal n uɛeddi d armeɣtu</string>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-ku/arrays.xml b/overlay/packages/apps/Settings/res/values-ku/arrays.xml
index 01bc71c..10cc7c8 100644
--- a/overlay/packages/apps/Settings/res/values-ku/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-ku/arrays.xml
@@ -353,7 +353,7 @@
     <string-array name="captioning_font_size_selector_titles">
         <item>زۆر بچووک</item>
         <item>بچوک</item>
-        <item>بنێڕه‌ت</item>
+        <item>ناوه‌ند</item>
         <item>گه‌وره‌</item>
         <item>زۆر گه‌وره‌</item>
     </string-array>
@@ -447,4 +447,9 @@
         <item>NR/LTE/TDSCDMA/GSM/WCDMA</item>
         <item>NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>هه‌رگیز</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-ku/strings.xml b/overlay/packages/apps/Settings/res/values-ku/strings.xml
index 28cf647..bd1e41a 100644
--- a/overlay/packages/apps/Settings/res/values-ku/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-ku/strings.xml
@@ -72,8 +72,8 @@
     <string name="bluetooth_phonebook_request">"داواکاری ده‌سته‌ڵاتی ژماره‌ پاشه‌که‌وتکراوه‌کان"</string>
     <string name="bluetooth_map_request">"داواکاری ده‌سته‌ڵاتی نامه‌"</string>
     <string name="bluetooth_map_acceptance_dialog_text">%1$s ئه‌یه‌وێ بچێته‌ ناو نامه‌کانت ، ده‌سه‌ڵات ده‌ده‌یت به‌ %2$s بۆ ئه‌م کاره‌؟</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">ده‌ستپێكردنه‌وه‌</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">لابردن</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm">ده‌ستپێكردنه‌وه‌</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">لابردن</string>
     <string name="choose_timezone">هه‌ڵبژاردنی شوێنی کات</string>
     <string name="intent_sender_data_label"><xliff:g id="data">ڕۆژ:</xliff:g></string>
     <string name="intent_sender_sendbroadcast_text">ناردی <xliff:g id="broadcast"> بۆ برۆدکاستی </xliff:g></string>
@@ -111,6 +111,7 @@
     <string name="skip_label">تێپەڕاندن</string>
     <string name="next_label">دواتر</string>
     <string name="locale_remove_menu">لابردن</string>
+    <string name="app_locale_preference_title">زمان</string>
     <string name="activity_picker_label">هه‌ڵبژاردنی چالاکی</string>
     <string name="debug_intent_sender_label">هه‌ڵدۆزینه‌وه‌ی نێردره‌ر</string>
     <string name="display_label">ڕوونما</string>
@@ -166,23 +167,10 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete">سڕینه‌وه‌</string>
     <string name="security_settings_fingerprint_enroll_done">ئه‌نجام درا</string>
     <string name="fingerprint_enroll_button_next">دواتر</string>
-    <string name="crypt_keeper_settings_title">نهێنیکاری</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet">نهێنی کردنی تابڵیت</string>
-    <string name="crypt_keeper_encrypt_title" product="default">نهێنی کردنی مۆبایل</string>
-    <string name="crypt_keeper_encrypted_summary">نهێنیکراوه‌</string>
-    <string name="crypt_keeper_button_text" product="tablet">نهێنیکردنی تابڵیت</string>
-    <string name="crypt_keeper_button_text" product="default">نهێنیکردنی مۆبایل</string>
-    <string name="crypt_keeper_low_charge_text">پاترییه‌که‌ت بگۆڕه‌ و دووباره‌ هه‌وڵبده‌ره‌وه‌.</string>
-    <string name="crypt_keeper_unplugged_text">بارگه‌پڕکه‌ره‌وه‌ بکه‌ پێوه‌ی و دووباره‌ هه‌وڵبده‌ره‌وه‌.</string>
-    <string name="crypt_keeper_dialog_need_password_title">هیچ قوفڵی ڕوونمایه‌ک نییه‌  PIN یان وشه‌ی نهێنی</string>
-    <string name="crypt_keeper_dialog_need_password_message">پێویسته‌ قوفلی ڕوونمایه‌ک دیاری بکه‌یت PIN یان Password پێش ئه‌وه‌ی ده‌ستبکه‌یت به‌ نهێنیکردن.</string>
-    <string name="crypt_keeper_confirm_title">به‌نهێنیکردن؟</string>
-    <string name="crypt_keeper_setup_title">به‌نهێنیکردن</string>
-    <string name="crypt_keeper_setup_description" product="tablet">چاوه‌ڕێبکه‌ کاتێک که‌ تابلێته‌که‌ت خه‌ریکی به‌نهێنیکردنه‌.. <xliff:g id="percent" example="50">^1</xliff:g>% ته‌واو بووه‌.</string>
-    <string name="crypt_keeper_setup_description" product="default">چاوه‌ڕێبکه‌ کاتێک که‌ مۆبایله‌که‌ت خه‌ریکی به‌نهێنیکردنه‌.. <xliff:g id="percent" example="50">^1</xliff:g>% ته‌واو بووه‌.</string>
-    <string name="crypt_keeper_enter_password">وشه‌ نهێنییه‌که‌ت بنووسه‌</string>
-    <string name="crypt_keeper_failed_title">به‌ نهێنیکردن سه‌رکه‌وتوونه‌بوو</string>
-    <string name="crypt_keeper_switch_input_method">گۆڕینی ته‌خته‌کلیل</string>
+    <string name="encryption_settings_title">نهێنیکاری</string>
+    <string name="encrypt_title" product="tablet">نهێنی کردنی تابڵیت</string>
+    <string name="encrypt_title" product="default">نهێنی کردنی مۆبایل</string>
+    <string name="encrypted_summary">نهێنیکراوه‌</string>
     <string name="lock_settings_picker_title">ده‌ستنیشانکردنی قوفڵی ڕوونما</string>
     <string name="unlock_set_unlock_launch_picker_title">قوفڵی ڕوونما</string>
     <string name="unlock_set_unlock_launch_picker_change_title">گۆڕینی قوفڵی ڕوونما</string>
@@ -365,7 +353,6 @@
     <string name="wifi_tether_configure_ssid_default">ئەندرۆیدHotspot</string>
     <string name="private_dns_mode_on">چالاککردن</string>
     <string name="display_settings_title">شاشە</string>
-    <string name="sound_settings">دەنگ</string>
     <string name="all_volume_title">قەبارەی دەنگەکان</string>
     <string name="musicfx_title">تاییبەتمەندییەکانی مۆسیقا</string>
     <string name="vibrate_in_silent_title">لەرزین کاتی بێدەنگکردن</string>
@@ -431,7 +418,6 @@
     <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_dream_start">ئێستا ده‌ست پێبکه‌</string>
     <string name="screensaver_settings_button">رێکخستەکان</string>
     <string name="automatic_brightness">ڕوناکی خۆکارانه‌</string>
     <string name="title_font_size">قه‌باره‌ی فۆنت</string>
@@ -584,10 +570,10 @@
     <string name="menu_restore">ڕێکخستنه‌وه‌ بۆ بنێڕه‌ت</string>
     <string name="restore_default_apn_completed">ڕێکخستنەوەی APN بۆ باری بنەڕەتی تەواوبوو.</string>
     <string name="reset_network_confirm_title">ڕێکخستنەوە?</string>
-    <string name="main_clear_accounts" product="default">\n\nئێستا تۆ لە ژورەوەیت بۆ ئەم هەژمارانەی خوارەوە:\n</string>
-    <string name="main_clear_desc_also_erases_external"><li>مۆسیقا</li>\n<li>وێنەکان</li>\n<li>دراوەکانی دیکەی بەکارهێنەر</li></string>
-    <string name="main_clear_desc_erase_external_storage" product="nosdcard">\n\nبۆ پاککردنەوەی مۆسیقا، وێنەکان و دیکەی دراوەکانی بەکارهێنەر  <b>بیرگەی یو ئێس بی</b> پێویستە بسڕدرێتەوە.</string>
-    <string name="main_clear_desc_erase_external_storage" product="default">\n\nبۆ پاککردنەوەی مۆسیقا، وێنەکان و دیکەی دراوەکانی بەکارهێنەر  <b>بیرگەی هەڵگرتنی</b> پێویستە بسڕدرێتەوە.</string>
+    <string name="main_clear_accounts" product="default">"\n\nئێستا تۆ لە ژورەوەیت بۆ ئەم هەژمارانەی خوارەوە:\n"</string>
+    <string name="main_clear_desc_also_erases_external">"<li>مۆسیقا</li>\n<li>وێنەکان</li>\n<li>دراوەکانی دیکەی بەکارهێنەر</li>"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard">"\n\nبۆ پاککردنەوەی مۆسیقا، وێنەکان و دیکەی دراوەکانی بەکارهێنەر  <b>بیرگەی یو ئێس بی</b> پێویستە بسڕدرێتەوە."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default">"\n\nبۆ پاککردنەوەی مۆسیقا، وێنەکان و دیکەی دراوەکانی بەکارهێنەر  <b>بیرگەی هەڵگرتنی</b> پێویستە بسڕدرێتەوە."</string>
     <string name="erase_external_storage" product="nosdcard">سڕینه‌وه‌ی كۆگای USB</string>
     <string name="erase_external_storage" product="default">پاککردنەوەی بیرگەی دەرەکی</string>
     <string name="erase_external_storage_description" product="nosdcard">سڕینەوەی هەموو داتاکان لەسەر بیرگەی ناوەکی ،وەکو گۆرانی و وێنەکان</string>
@@ -727,6 +713,7 @@
     <string name="clear_data_dlg_title">سڕینەوەی داتای بەرنامە؟</string>
     <string name="dlg_ok">باشه‌</string>
     <string name="dlg_cancel">هەڵوەشاندنەوە</string>
+    <string name="dlg_delete">سڕینه‌وه‌</string>
     <string name="join_two_items"><xliff:g id="first_item">%1$s</xliff:g> و <xliff:g id="second_item">%2$s</xliff:g></string>
     <string name="computing_size">کۆمپیوتەرکردن\u2026</string>
     <string name="version_text">وەشان <xliff:g id="version_num">%1$s</xliff:g></string>
@@ -853,6 +840,7 @@
     <string name="vision_settings_suggestion_title">گوڕینی جۆره‌پیت قەبارە</string>
     <string name="audio_category_title">ده‌نگ</string>
     <string name="display_category_title">شاشە</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">لابردن</string>
     <string name="accessibility_shortcut_edit_dialog_title_advance">پەرەسەندوو</string>
     <string name="accessibility_button_location_title">ناوچه‌</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title">خۆکارانە
@@ -862,15 +850,14 @@
     <string name="accessibility_power_button_ends_call_prerefence_title">دوگمەی هێز بۆ کۆتایهێنان بە تەلەفۆن</string>
     <string name="accessibility_timeout_default">بنێڕه‌ت</string>
     <string name="accessibility_long_press_timeout_preference_title">دەستلێدان وamp; ڕاگرتنی بۆ دواخستن</string>
-    <string name="accessibility_autoclick_default_title">کوژاندنەوە</string>
     <string name="accessibility_autoclick_medium_title">ناوه‌ندی</string>
+    <string name="accessibility_vibration_settings_state_on">چالاککردن</string>
+    <string name="accessibility_vibration_settings_state_off">کوژاندنەوە</string>
     <string name="captioning_more_options_title">بەربژاردەی زیاتر</string>
     <string name="accessibility_hearingaid_instruction_continue_button">بەردەوامبون</string>
     <string name="accessibility_summary_shortcut_disabled">کوژاندنەوە</string>
     <string name="accessibility_summary_state_enabled">چالاککردن</string>
     <string name="accessibility_summary_state_disabled">کوژاندنەوە</string>
-    <string name="accessibility_vibration_intensity_off">کوژاندنەوە</string>
-    <string name="accessibility_vibration_intensity_medium">ناوه‌ندی</string>
     <string name="accessibility_menu_item_settings">ڕێکخستنه‌کان</string>
     <string name="accessibility_feature_state_on">چالاککردن</string>
     <string name="accessibility_feature_state_off">کوژانه‌وه‌</string>
@@ -1000,6 +987,8 @@
     <string name="menu_stats_total">بەکارهێنانی گشتی</string>
     <string name="menu_stats_refresh">بوژاندنه‌وه‌</string>
     <string name="process_mediaserver_label">ڕاگەیەنە پارێز</string>
+    <string name="process_network_tethering">پەیوەندی ئینتەرنێت بە</string>
+    <string name="process_removed_apps">بەرنامەکە سڕایەوە</string>
     <string name="process_stats_summary_title">ئاماری پرۆسە</string>
     <string name="process_stats_summary"> ئامێرى جێگيركردنى گيكى دەربارەى ڕاكردنى كردار</string>
     <string name="app_memory_use">بەکارهێنانی بیرگە</string>
@@ -1142,8 +1131,6 @@
     <string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> نێردرا</string>
     <string name="data_usage_total_during_range"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> بەکارهات.</string>
     <string name="data_usage_metered_auto">خۆکارانە</string>
-    <string name="cryptkeeper_emergency_call">تەلەفۆنی فریاگوزاری</string>
-    <string name="cryptkeeper_return_to_call">گەڕانەوە بۆ تەلەفۆن</string>
     <string name="vpn_name">ناو</string>
     <string name="vpn_type">جۆر</string>
     <string name="vpn_server">ناونیشانی تۆڕ</string>
@@ -1213,6 +1200,7 @@
     <string name="application_restrictions">ڕێگەدان بە بەرنامە و ناوەڕۆک</string>
     <string name="apps_with_restrictions_header">بەرنامەکان لەگەڵ سنورەکان</string>
     <string name="apps_with_restrictions_settings_button">بڵاوکردنەوەی ڕێکخستنەکان بۆ بەرنامەکان</string>
+    <string name="nfc_more_details">زیاتر بزانە</string>
     <string name="nfc_payment_default_not_set">دانەنراوە</string>
     <string name="nfc_payment_btn_text_update">تازه‌کردنه‌وه‌</string>
     <string name="restriction_settings_title">سنووردارەکان</string>
@@ -1241,6 +1229,7 @@
     <string name="ringtone_title">زەنگی مۆبایل</string>
     <string name="notification_ringtone_title">دەنگی ئاگادارکردنەوەی بنەڕەت</string>
     <string name="notification_sound_default">دەنگی ئاگادارکردنەوەی بنەڕەت</string>
+    <string name="spatial_summary_off">کوژاندنەوە</string>
     <string name="zen_mode_schedule_delete">سڕینه‌وه‌</string>
     <string name="zen_mode_rule_name_edit">دەستکاری</string>
     <string name="zen_mode_no_exceptions">هیچ</string>
@@ -1358,6 +1347,8 @@
     <string name="sim_action_continue">بەردەوامبون</string>
     <string name="sim_action_yes">بەڵێ</string>
     <string name="sim_action_reboot">ده‌ستپێكردنه‌وه‌</string>
+    <string name="sim_action_cancel">لابردن</string>
+    <string name="privacy_controls_title">کۆنترۆڵ</string>
     <string name="contextual_card_dismiss_remove">لابردن</string>
     <string name="wfc_disclaimer_location_title_text">ناوچه‌</string>
     <string name="wifi_disconnect_button_text">پچڕاندنی پەیوەندی</string>
@@ -1370,4 +1361,14 @@
     <string name="smart_forwarding_missing_alert_dialog_text">OK</string>
     <string name="next_page_content_description">دواتر</string>
     <string name="bluetooth_connect_access_dialog_positive">گرێدان</string>
+    <string name="tare_on">چالاککردن</string>
+    <string name="tare_off">کوژاندنەوە</string>
+    <string-array name="tare_modifiers_subfactors">
+        <item>بارگاویکردنەوە</item>
+        <item>Doze</item>
+        <item>Power Save Mode</item>
+        <item>Process State</item>
+    </string-array>
+    <string name="tare_dialog_confirm_button_title">دلنیاکردنەوە</string>
+    <string name="dream_preview_button_title">دەرخستن</string>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-lb/arrays.xml b/overlay/packages/apps/Settings/res/values-lb/arrays.xml
index 3677359..19a4b06 100644
--- a/overlay/packages/apps/Settings/res/values-lb/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-lb/arrays.xml
@@ -359,7 +359,7 @@
     <string-array name="captioning_font_size_selector_titles">
         <item>Ganz kleng</item>
         <item>Kleng</item>
-        <item>Standard</item>
+        <item>Mëttel</item>
         <item>Grouss</item>
         <item>Ganz grouss</item>
     </string-array>
@@ -499,4 +499,9 @@
         <item>NR/LTE/TDSCDMA/GSM/WCDMA</item>
         <item>NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>Ni</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-lb/strings.xml b/overlay/packages/apps/Settings/res/values-lb/strings.xml
index 163433b..981bf37 100644
--- a/overlay/packages/apps/Settings/res/values-lb/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-lb/strings.xml
@@ -84,8 +84,8 @@
     <string name="bluetooth_phonebook_request">"Zougrëff op d'Telefonsbuch néideg"</string>
     <string name="bluetooth_map_request">"Ufro fir d'Zougrëff op d'Messagen"</string>
     <string name="bluetooth_map_acceptance_dialog_text">%1$s wëll op deng Messagen zougräifen. Zougrëff fir %2$s fräischalten?</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Nei starten</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Ofbriechen</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm">Nei starten</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">Ofbriechen</string>
     <string name="date_and_time">Datum an Zäit</string>
     <string name="choose_timezone">Zäitzon auswielen</string>
     <string name="intent_sender_data_label"><xliff:g id="data">Daten:</xliff:g></string>
@@ -125,6 +125,7 @@
     <string name="skip_label">Iwwersprangen</string>
     <string name="next_label">Weider</string>
     <string name="locale_remove_menu">Ewechhuelen</string>
+    <string name="app_locale_preference_title">Sprooch</string>
     <string name="activity_picker_label">Aktivitéit auswielen</string>
     <string name="debug_intent_sender_label">Debug intent sender</string>
     <string name="display_label">Schierm</string>
@@ -192,29 +193,10 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete">Läschen</string>
     <string name="security_settings_fingerprint_enroll_done">Fäerdeg</string>
     <string name="fingerprint_enroll_button_next">Weider</string>
-    <string name="crypt_keeper_settings_title">Verschlësselung</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet">Tablet verschlësselen</string>
-    <string name="crypt_keeper_encrypt_title" product="default">Telefon verschlësselen</string>
-    <string name="crypt_keeper_encrypted_summary">Verschlësselt</string>
-    <string name="crypt_keeper_button_text" product="tablet">Tablet verschlësselen</string>
-    <string name="crypt_keeper_button_text" product="default">Telefon verschlësselen</string>
-    <string name="crypt_keeper_low_charge_text">Akku oplueden an nees probéieren.</string>
-    <string name="crypt_keeper_unplugged_text">Schléiss däin Oplueder un a probéier nees.</string>
-    <string name="crypt_keeper_dialog_need_password_title">Kee Spärschierm oder Passwuert</string>
-    <string name="crypt_keeper_dialog_need_password_message">Du muss e PIN oder e Passwuert fir de Spärschierm setzen ier s de d\'Verschlësselung starte kanns.</string>
-    <string name="crypt_keeper_confirm_title">Verschlësselen?</string>
-    <string name="crypt_keeper_setup_title">Gëtt verschlësselt</string>
-    <string name="crypt_keeper_setup_description" product="tablet">Waart während den Tablet verschlësselt gëtt. <xliff:g id="percent" example="50">^1</xliff:g>% fäerdeg.</string>
-    <string name="crypt_keeper_setup_description" product="default">Waart während den Telefon verschlësselt gëtt. <xliff:g id="percent" example="50">^1</xliff:g>% fäerdeg.</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet">Waart, während däin Tablet verschlësselt gëtt. Verbleiwend Zäit: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_setup_time_remaining" product="default">Waart, während däin Telefon verschlësselt gëtt. Verbleiwend Zäit: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet">Fir däin Tablet z\'entspären, schalt däin Telefon aus an dann un.</string>
-    <string name="crypt_keeper_force_power_cycle" product="default">Fir däin Telefon z\'entspären, schalt däin Telefon aus an dann un.</string>
-    <string name="crypt_keeper_warn_wipe">Warnung: Den Apparat gëtt no <xliff:g id="count" example="7">^1</xliff:g> weidere feelgeschloenen Entspärversich komplett geläscht!</string>
-    <string name="crypt_keeper_enter_password">Passwuert aginn</string>
-    <string name="crypt_keeper_failed_title">Verschlësselung feelgeschloen</string>
-    <string name="crypt_keeper_data_corrupt_title">Entschlësselung feelgeschloen</string>
-    <string name="crypt_keeper_switch_input_method">Method fir anzeginn wiesselen</string>
+    <string name="encryption_settings_title">Verschlësselung</string>
+    <string name="encrypt_title" product="tablet">Tablet verschlësselen</string>
+    <string name="encrypt_title" product="default">Telefon verschlësselen</string>
+    <string name="encrypted_summary">Verschlësselt</string>
     <string name="lock_settings_picker_title">Schiermspär auswielen</string>
     <string name="unlock_set_unlock_launch_picker_title">Schiermspär</string>
     <string name="unlock_set_unlock_launch_picker_change_title">Spärschierm änneren</string>
@@ -429,7 +411,6 @@
     <string name="private_dns_mode_on">Un</string>
     <string name="carrier">Provider</string>
     <string name="display_settings_title">Usiicht</string>
-    <string name="sound_settings">Toun</string>
     <string name="all_volume_title">Lautstäerkt</string>
     <string name="musicfx_title">Musekeffekter</string>
     <string name="vibrate_in_silent_title">Vibréiere wa roueg geschalt</string>
@@ -502,7 +483,6 @@
     <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_dream_start">Elo starten</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>
@@ -662,11 +642,11 @@
     <string name="menu_restore">Op de Standard zrécksetzen</string>
     <string name="restore_default_apn_completed">Standard-APN-Astellunge goufen erëmhiergestallt.</string>
     <string name="reset_network_confirm_title">Zrécksetzen?</string>
-    <string name="main_clear_accounts" product="default">\n\nDu bass momentan an dëse Konten ugemellt:\n</string>
-    <string name="main_clear_other_users_present" product="default">\n\nOp dësem Apparat sinn aner Benotzer.\n</string>
-    <string name="main_clear_desc_also_erases_external"><li>Musek</li>\n<li>Fotoen</li>\n<li>Aner Benotzerdaten</li></string>
-    <string name="main_clear_desc_erase_external_storage" product="nosdcard">\n\nFir d\'Musek, Biller an aner Benotzerdaten ze läsche muss den <b>USB-Späicher</b> geläscht ginn.</string>
-    <string name="main_clear_desc_erase_external_storage" product="default">\n\nFir d\'Musek, Biller an aner Benotzerdaten ze läsche muss d\'<b>SD-Kaart</b> geläscht ginn.</string>
+    <string name="main_clear_accounts" product="default">"\n\nDu bass momentan an dëse Konten ugemellt:\n"</string>
+    <string name="main_clear_other_users_present" product="default">"\n\nOp dësem Apparat sinn aner Benotzer.\n"</string>
+    <string name="main_clear_desc_also_erases_external">"<li>Musek</li>\n<li>Fotoen</li>\n<li>Aner Benotzerdaten</li>"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard">"\n\nFir d'Musek, Biller an aner Benotzerdaten ze läsche muss den <b>USB-Späicher</b> geläscht ginn."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default">"\n\nFir d'Musek, Biller an aner Benotzerdaten ze läsche muss d'<b>SD-Kaart</b> geläscht ginn."</string>
     <string name="erase_external_storage" product="nosdcard">USB-Späicher läschen</string>
     <string name="erase_external_storage" product="default">SD-Kaart läschen</string>
     <string name="erase_external_storage_description" product="nosdcard">All d\'Daten um internen USB-Späicher läschen, wéi Musek oder Fotoen</string>
@@ -728,7 +708,6 @@
     <string name="license_title">Lizenz</string>
     <string name="terms_title">Geschäftsbedéngungen</string>
     <string name="webview_license_title">System-WebView-Lizenz</string>
-    <string name="wallpaper_attributions">Hannergrondbiller</string>
     <string name="wallpaper_attributions_values">Source vun de Satellittebiller:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
     <string name="settings_license_activity_unavailable">Et gëtt e Problem beim Luede vun de Lizenzen.</string>
     <string name="settings_license_activity_loading">Gëtt gelueden\u2026</string>
@@ -820,6 +799,7 @@
     <string name="clear_data_dlg_title">App-Date läschen?</string>
     <string name="dlg_ok">OK</string>
     <string name="dlg_cancel">Ofbriechen</string>
+    <string name="dlg_delete">Läschen</string>
     <string name="join_two_items"><xliff:g id="first_item">%1$s</xliff:g> a(n) <xliff:g id="second_item">%2$s</xliff:g></string>
     <string name="computing_size">Gëtt berechent\u2026</string>
     <string name="version_text">Versioun <xliff:g id="version_num">%1$s</xliff:g></string>
@@ -949,6 +929,7 @@
     <string name="vision_settings_suggestion_title">Schrëftgréisst änneren</string>
     <string name="audio_category_title">Toun</string>
     <string name="display_category_title">Usiicht</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">Ofbriechen</string>
     <string name="accessibility_shortcut_edit_dialog_title_advance">Erweidert</string>
     <string name="accessibility_button_location_title">Standuert</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title">Héich-Kontrasträichen Text</string>
@@ -958,17 +939,16 @@
     <string name="accessibility_timeout_default">Standard</string>
     <string name="accessibility_long_press_timeout_preference_title">Reaktiounszäit fir d\'Drécken an Unhalen</string>
     <string name="accessibility_display_inversion_preference_title">Faarwen invertéieren</string>
-    <string name="accessibility_autoclick_default_title">Aus</string>
     <string name="accessibility_autoclick_medium_title">Mëttel</string>
+    <string name="accessibility_vibration_settings_state_on">Un</string>
+    <string name="accessibility_vibration_settings_state_off">Aus</string>
+    <string name="accessibility_call_vibration_category_title">Uriff</string>
     <string name="captioning_more_options_title">Méi Optiounen</string>
     <string name="accessibility_hearingaid_instruction_continue_button">Weider</string>
     <string name="accessibility_summary_shortcut_disabled">Aus</string>
     <string name="accessibility_summary_state_enabled">Un</string>
     <string name="accessibility_summary_state_disabled">Aus</string>
     <string name="enable_quick_setting">An de séieren Astellungen uweisen</string>
-    <string name="daltonizer_type">Korrekturmodus</string>
-    <string name="accessibility_vibration_intensity_off">Aus</string>
-    <string name="accessibility_vibration_intensity_medium">Mëttel</string>
     <string name="accessibility_menu_item_settings">Astellungen</string>
     <string name="accessibility_feature_state_on">Un</string>
     <string name="accessibility_feature_state_off">Aus</string>
@@ -1003,10 +983,6 @@
     <string name="color_yellow">Giel</string>
     <string name="color_magenta">Magenta</string>
     <string name="capabilities_list_title"><xliff:g id="service" example="TalkBack">%1$s</xliff:g> wëll:</string>
-    <string name="enable_service_encryption_warning">Wann s du <xliff:g id="SERVICE">%1$s</xliff:g> aktivéiers, benotzt den Apparat net d\'Schiermspär, fir d\'Dateverschlësselung ze verbesseren.</string>
-    <string name="enable_service_pattern_reason">Well d\'Aktivéierung vu(n) <xliff:g id="service" example="TalkBack">%1$s</xliff:g> d\'Dateverschlësslung betrëfft, muss du däin Entspärmuster bestätegen.</string>
-    <string name="enable_service_pin_reason">Well d\'Aktivéierung vu(n) <xliff:g id="service" example="TalkBack">%1$s</xliff:g> d\'Dateverschlësslung betrëfft, muss du däi PIN bestätegen.</string>
-    <string name="enable_service_password_reason">Well d\'Aktivéierung vu(n) <xliff:g id="service" example="TalkBack">%1$s</xliff:g> d\'Dateverschlësslung betrëfft, muss du däi Passwuert bestätegen.</string>
     <string name="accessibility_dialog_button_allow">Erlaben</string>
     <string name="accessibility_dialog_button_deny">Verweigeren</string>
     <string name="accessibility_dialog_button_stop">Stopp</string>
@@ -1126,6 +1102,8 @@
     <string name="menu_stats_total">Gesamtverbrauch</string>
     <string name="menu_stats_refresh">Opfrëschen</string>
     <string name="process_mediaserver_label">Medieserver</string>
+    <string name="process_network_tethering">Tethering</string>
+    <string name="process_removed_apps">Geläscht Appen</string>
     <string name="battery_saver_auto_title">Automatesch uschalten</string>
     <string name="battery_saver_turn_on_automatically_title">Automatesch uschalten</string>
     <string name="battery_saver_turn_on_automatically_never">Ni</string>
@@ -1243,13 +1221,6 @@
     <string name="really_remove_account_message" product="tablet">Duerch d\'Läsche vun dësem Kont ginn all seng Messagen, Kontakter an aner Date vum Tablet geläscht!</string>
     <string name="really_remove_account_message" product="default">Duerch d\'Läsche vun dësem Kont ginn all seng Messagen, Kontakter an aner Date vum Telefon geläscht!</string>
     <string name="cant_sync_dialog_message">D\'Synchroniséierung vun dësem Element ass momentan desaktivéiert. Schalt virleefeg d\'Hannergronddaten an déi automatesch Synchroniséierung u fir dës Astellung z\'änneren.</string>
-    <string name="enter_password">Gëff däi Passwuert an, fir Android ze starten</string>
-    <string name="enter_pin">Gëff däi PIN an, fir Android ze starten</string>
-    <string name="enter_pattern">Zeechen däi Muster, fir Android ze starten</string>
-    <string name="cryptkeeper_wrong_pattern">Falscht Muster</string>
-    <string name="cryptkeeper_wrong_password">Falscht Passwuert</string>
-    <string name="cryptkeeper_wrong_pin">Falsche PIN</string>
-    <string name="checking_decryption">Iwwerpréiwung\u2026</string>
     <string name="delete">Läschen</string>
     <string name="misc_files">Verschidde Fichieren</string>
     <string name="misc_files_selected_count"><xliff:g id="number" example="3">%1$d</xliff:g> vu(n) <xliff:g id="total" example="15">%2$d</xliff:g> ausgewielt</string>
@@ -1318,8 +1289,6 @@
     <string name="data_usage_metered_wifi_disabled">Fir bezuelt Netzwierker auszewielen, schalt WLAN un.</string>
     <string name="data_usage_metered_auto">Automatesch</string>
     <string name="data_usage_disclaimer">De Provider berechent d\'Datebenotzung eventuell anescht als den Apparat.</string>
-    <string name="cryptkeeper_emergency_call">Noutruff</string>
-    <string name="cryptkeeper_return_to_call">Zréck bei d\'Gespréich</string>
     <string name="vpn_name">Numm</string>
     <string name="vpn_type">Typ</string>
     <string name="vpn_server">Serveradress</string>
@@ -1376,7 +1345,6 @@
     <string name="ssl_ca_cert_warning_message">Eng drëtt Partei kann deng Netzwierkaktivitéiten, inklusiv Emailen, Appen, a séchere Websäiten iwwerwaachen.\n\nVertrauenswierdeg Umeldungsdaten déi um Apparat installéiert sinn erméiglechen dat.</string>
     <string name="user_list_title">Benotzer a Profiller</string>
     <string name="user_add_user_or_profile_menu">Benotzer oder Profil dobäisetzen</string>
-    <string name="user_add_user_menu">Benotzer dobäisetzen</string>
     <string name="user_summary_restricted_profile">Ageschränkte Profil</string>
     <string name="user_summary_not_set_up">Net agestallt</string>
     <string name="user_summary_restricted_not_set_up">Net agestallt - Ageschränkte Profil</string>
@@ -1392,9 +1360,6 @@
     <string name="user_adding_new_user">Neie Benotzer gëtt dobäigesat\u2026</string>
     <string name="user_delete_user_description">Benotzer läschen</string>
     <string name="user_delete_button">Läschen</string>
-    <string name="user_guest">Gaascht</string>
-    <string name="user_exit_guest_title">Gaascht läschen</string>
-    <string name="user_exit_guest_confirm_title">Gaascht 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="user_remove_user">Benotzer läschen</string>
@@ -1403,8 +1368,10 @@
     <string name="application_restrictions">Appen an Inhalter erlaben</string>
     <string name="apps_with_restrictions_header">Appe mat Aschränkungen</string>
     <string name="apps_with_restrictions_settings_button">Astellunge fir d\'App opklappen</string>
+    <string name="nfc_more_details">Méi gewuer ginn</string>
     <string name="nfc_payment_default_not_set">Net gesat</string>
     <string name="nfc_payment_btn_text_update">Aktualiséieren</string>
+    <string name="nfc_work_text">Aarbecht</string>
     <string name="restriction_settings_title">Aschränkungen</string>
     <string name="restriction_menu_reset">Aschränkungen ophiewen</string>
     <string name="restriction_menu_change_pin">PIN änneren</string>
@@ -1450,7 +1417,6 @@
     <string name="sim_settings_summary"><xliff:g id="sim_name">%1$s</xliff:g> - <xliff:g id="sim_number">%2$s</xliff:g></string>
     <string name="sim_cards_changed_message">D\'SIM-Kaarte goufe gewiesselt</string>
     <string name="sim_calls_always_use">Dës SIM ëmmer fir Uriff benotzen</string>
-    <string name="select_sim_for_data">SIM-Kaart fir d\'Daten auswielen</string>
     <string name="select_sim_for_calls">Uruffe mat</string>
     <string name="sim_select_card">SIM-Kaart auswielen</string>
     <string name="sim_card_number_title">SIM <xliff:g id="card_number">%1$d</xliff:g></string>
@@ -1497,6 +1463,7 @@
     <string name="dock_audio_media_title">Dock-Lautsprecher spillt</string>
     <string name="dock_audio_media_disabled">All d\'Téin</string>
     <string name="dock_audio_media_enabled">Just Medientéin</string>
+    <string name="spatial_summary_off">Aus</string>
     <string name="zen_mode_schedule_delete">Läschen</string>
     <string name="zen_mode_rule_name_edit">Änneren</string>
     <string name="zen_mode_block_effect_summary_none">Ni</string>
@@ -1513,6 +1480,7 @@
     <string name="work_sync_dialog_yes">Bestätegen</string>
     <string name="configure_notification_settings">Notifikatiounen</string>
     <string name="app_notification_field">App-Astellungen</string>
+    <string name="profile_section_header_for_advanced_privacy">Aarbechtsprofil</string>
     <string name="bubbles_feature_disabled_button_cancel">Ofbriechen</string>
     <string name="lock_screen_notifications_summary_show">All Notifikatiounsinhalt uweisen</string>
     <string name="notifications_title">Notifikatiounen</string>
@@ -1682,6 +1650,8 @@
     <string name="sim_action_yes">Jo</string>
     <string name="sim_action_reboot">Nei starten</string>
     <string name="sim_action_no_thanks">Nee Merci</string>
+    <string name="sim_action_cancel">Ofbriechen</string>
+    <string name="privacy_controls_title">Steierelementer</string>
     <string name="contextual_card_dismiss_remove">Ewechhuelen</string>
     <string name="wfc_disclaimer_location_title_text">Standuert</string>
     <string name="wifi_disconnect_button_text">Deconnectéieren</string>
@@ -1700,4 +1670,14 @@
     <string name="smart_forwarding_missing_alert_dialog_text">OK</string>
     <string name="next_page_content_description">Weider</string>
     <string name="bluetooth_connect_access_dialog_positive">Connectéieren</string>
+    <string name="tare_on">Un</string>
+    <string name="tare_off">Aus</string>
+    <string-array name="tare_modifiers_subfactors">
+        <item>Gëtt opgelueden</item>
+        <item>Doze</item>
+        <item>Power Save Mode</item>
+        <item>Process State</item>
+    </string-array>
+    <string name="tare_dialog_confirm_button_title">Bestätegen</string>
+    <string name="dream_preview_button_title">Virschau</string>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-sc-rIT/arrays.xml b/overlay/packages/apps/Settings/res/values-sc-rIT/arrays.xml
index 27cea71..e64628a 100644
--- a/overlay/packages/apps/Settings/res/values-sc-rIT/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-sc-rIT/arrays.xml
@@ -323,7 +323,7 @@
     <string-array name="captioning_font_size_selector_titles">
         <item>Very small</item>
         <item>Small</item>
-        <item>Predefinidu</item>
+        <item>Mesana</item>
         <item>Large</item>
         <item>Very large</item>
     </string-array>
@@ -455,4 +455,9 @@
         <item>NR/LTE/TDSCDMA/GSM/WCDMA</item>
         <item>NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>Mai</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
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 ec60991..626b464 100644
--- a/overlay/packages/apps/Settings/res/values-sc-rIT/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-sc-rIT/strings.xml
@@ -76,7 +76,7 @@
     <string name="bluetooth_phonebook_request">"Rechesta de atzessu a sa rubrica de su telèfonu"</string>
     <string name="bluetooth_remember_choice">Non ddu torres a dimandare</string>
     <string name="bluetooth_pb_remember_choice">Non ddu torres a dimandare</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Annulla</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">Annulla</string>
     <string name="proxy_error_invalid_host">Su nùmene de retzidore chi as postu no est vàlidu.</string>
     <string name="proxy_error_invalid_exclusion_list">Sa lista de esclusione chi as postu no est formatada comente si depet. Iscrie una lista a separatzione a vìrgulas de domìnios esclùdidos.</string>
     <string name="proxy_error_empty_host_set_port">Su campu de sa porta depet èssere bòidu si su campu de su retzidore est bòidu.</string>
@@ -166,58 +166,6 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_title">Oops, cussu no est su sensore</string>
     <string name="fingerprint_intro_error_max">As agiuntu su nùmeru màssimu de imprentas</string>
     <string name="fingerprint_intro_error_unknown">Non podes agiùnghere àteras imprentas</string>
-    <string name="crypt_keeper_desc" product="tablet">    Podes tzifrare is contos, impostatziones, aplicatziones iscarrigadas e datos issoro,
-    cuntenutos multimediales e àteros archìvios. A pustis de àere tzifradu sa tauledda tua, ponende chi apas cunfiguradu unu blocu de ischermu
-    (podet èssere una cumbinada o unu PIN numèricu o una crae), t\'at a tocare de isblocare s\'ischermu pro detzifrare sa tauledda ògnia borta chi dd\'allues. S\'àtera ùnica manera pro detzifrare est a esecutare una resetada
-    de is datos, cantzellende totu is datos tuos.\n\nSa tzifradura istentat un\'ora o de prus. Depes cumintzare cun
-    una bateria càrriga e mantènnere sa tauledda atacada a sa currente durante totu su protzessu. Si ddu blocas,
-    as a pèrdere calicunu o totu is datos tuos</string>
-    <string name="crypt_keeper_desc" product="default">    Podes tzifrare is contos, impostatziones, aplicatziones iscarrigadas e datos issoro,
-    cuntenutos multimediales e àteros archìvios. A pustis de àere tzifradu su telèfonu tuo, ponende chi apas cunfiguradu unu blocu de ischermu
-    (podet èssere una cumbinada o unu PIN numèricu o una crae), t\'at a tocare de isblocare s\'ischermu pro detzifrare su telèfonu ògnia borta chi dd\'allues. S\'àtera ùnica manera pro detzifrare est a esecutare una resetada
-    de is datos, cantzellende totu is datos tuos.\n\nSa tzifradura istentat un\'ora o de prus. Depes cumintzare cun
-    una bateria càrriga e mantènnere su telèfonu atacadu a sa currente durante totu su protzessu. Si ddu blocas,
-    as a pèrdere calicunu o totu is datos tuos</string>
-    <string name="crypt_keeper_final_desc" product="tablet">    S\'operatzione de tzifradura non si podet annullare e si dda blocas as a pèrdere datos.
-    Sa tzifradura istentat un\'ora o de prus, in sa chi sa tauledda tua s\'at a torrare a aviare bortas medas.
-    </string>
-    <string name="crypt_keeper_final_desc" product="default">    S\'operatzione de tzifradura non si podet annullare e si dda blocas as a pèrdere datos.
-    Sa tzifradura istentat un\'ora o de prus, in sa chi su telèfonu tuo s\'at a torrare a aviare bortas medas.
-    </string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet">Abeta in su mentras chi sa tauledda s\'est tzifrende. Tempus chi abarrat: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_setup_time_remaining" product="default">Abeta in su mentras chi su telèfonu
-    s\'est tzifrende. Tempus chi abarrat: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet">Pro isblocare sa tauledda tua, istuda·dda e torra·dda a allùghere.</string>
-    <string name="crypt_keeper_force_power_cycle" product="default">Pro isblocare su telèfonu tuo, istuda·ddu e torra·ddu a allùghere.</string>
-    <string name="crypt_keeper_warn_wipe">Avisu: su dispositivu tuo s\'at a limpiare a pustis de <xliff:g id="count" example="7">^1</xliff:g> àteros tentativos de isblocu!</string>
-    <string name="crypt_keeper_enter_password">Iscrie sa crae tua</string>
-    <string name="crypt_keeper_failed_title">Tzifradura faddida</string>
-    <string name="crypt_keeper_failed_summary" product="tablet">      Sa tzifradura est istada blocada e non faghet a dda cumpletare. Comente resurtadu, is datos de
-      sa tauledda tua non sunt prus atzessìbiles.
-      \n\n Pro torrare a impreare sa tauledda tua, depes esecutare una resetada de fàbrica.
-      Cando cunfiguras sa tauledda a pustis de sa resetada, as a tènnere s\'oportunidade
-      de ripristinare is datos de chi as fatu sa còpia de seguresa in su contu tuo de Google.
-    </string>
-    <string name="crypt_keeper_failed_summary" product="default">      Sa tzifradura est istada blocada e non faghet a dda cumpletare. Comente resurtadu, is datos de
-      su telèfonu tuo non sunt prus atzessìbiles.
-      \n\n Pro torrare a impreare su telèfonu tuo, depes esecutare una resetada de fàbrica.
-      Cando cunfiguras su telèfonu a pustis de sa resetada, as a tènnere s\'oportunidade
-      de ripristinare is datos de chi as fatu sa còpia de seguresa in su contu tuo de Google.
-    </string>
-    <string name="crypt_keeper_data_corrupt_title">Detzifradura faddida</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet">      Sa crae insertada est curreta, ma a dolu mannu is datos tuos tenent
-      dannos.
-      \n\nPro torrare a impreare sa tauledda tua, depes esecutare una resetada de fàbrica.
-      Cando cunfiguras sa tauledda a pustis de sa resetada, as a tènnere s\'oportunidade
-      de ripristinare is datos de chi as fatu sa còpia de seguresa in su contu tuo de Google.
-    </string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default">      Sa crae insertada est curreta, ma a dolu mannu is datos tuos tenent
-      dannos.
-      \n\nPro torrare a impreare su telèfonu tuo, depes esecutare una resetada de fàbrica.
-      Cando cunfiguras su telèfonu a pustis de sa resetada, as a tènnere s\'oportunidade
-      de ripristinare is datos de chi as fatu sa còpia de seguresa in su contu tuo de Google.
-    </string>
-    <string name="crypt_keeper_switch_input_method">Càmbia mètodu de intrada</string>
     <string name="lock_settings_picker_title">Sèbera blocu de ischermu</string>
     <string name="lock_settings_picker_biometric_message">Sèbera su mètodu de còpia de su blocu de ischermu</string>
     <string name="unlock_set_unlock_launch_picker_title">Blocu de ischermu</string>
@@ -400,7 +348,6 @@
     <string name="wifi_calling_mode_dialog_title">Preferèntzia de mutida</string>
     <string name="wifi_calling_off_explanation">Cando is mutidas Wi-Fi sunt ativas, su telèfonu tuo podet deretare is mutidas tràmite retes Wi-Fi o sa rete de su frunidore tuo, cunforma a is preferèntzias tuas e a sa potèntzia de su signale. In antis de ativare custa funtzionalidade, controlla cun su frunidore tuo is tarifas e is àteros detàllios.<xliff:g id="additional_text" example="Learn More">%1$s</xliff:g></string>
     <string name="display_settings_title">Ischermu</string>
-    <string name="sound_settings">Sonu</string>
     <string name="all_volume_title">Volùmenes</string>
     <string name="musicfx_title">Efetos musicales</string>
     <string name="vibrate_in_silent_title">Vibra cando est a sa muda</string>
@@ -441,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_dream_start">Cumintza immoe</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>
@@ -641,14 +587,13 @@
     <string name="language_empty_list_user_restricted">Non tenes su permissu de cambiare sa limba de su dispositivu.</string>
     <string name="audio_category_title">Àudio</string>
     <string name="display_category_title">Ischermu</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">Annulla</string>
     <string name="accessibility_shortcut_edit_dialog_title_advance">Connoschèntzia avantzada</string>
     <string name="accessibility_button_location_title">Positzione</string>
     <string name="accessibility_autoclick_medium_title">Mesanu</string>
+    <string name="accessibility_call_vibration_category_title">Mutidas</string>
     <string name="captioning_more_options_title">Àteras optziones</string>
     <string name="accessibility_hearingaid_instruction_continue_button">Sighi</string>
-    <string name="accessibility_vibration_intensity_medium">Mesanu</string>
-    <string name="secure_lock_encryption_warning">Sigomente as ativadu unu servìtziu de atzessibilidade,
-        su dispositivu no at a impreare su blocu ischermu pro megiorare sa tzifradura de is datos.</string>
     <string name="accessibility_dialog_button_allow">Permite</string>
     <string name="accessibility_dialog_button_deny">Nega</string>
     <string name="accessibility_dialog_button_cancel">Annulla</string>
@@ -661,6 +606,7 @@
     <string name="battery_tip_dialog_summary_message" product="device">Is aplicatziones tuas ant a impreare unu tantu normale de bateria. Si is aplicatziones consumint tropu bateria, su dispositivu tuo t\'at a cussigiare ite fàghere.\n\nPodes semper ativare su Sarva-bateria si sa bateria est pro si nch\'agabbare.</string>
     <string name="smart_battery_summary" product="default">Lìmita sa bateria pro aplicatziones chi no impreas a s\'ispissu</string>
     <string name="smart_battery_footer">Cando su gestore de bateria rilevat chi is aplicatziones si sunt iscarrighende sa bateria, as a tènnere sa possibilidade de limitare custas aplicatziones. Is aplicatziones cun limitatziones diant pòdere non funtzionare in manera curreta e is notìficas diant pòdere subire ritardos.</string>
+    <string name="process_network_tethering">Ancoràgiu web</string>
     <string name="process_stats_os_kernel">Nùcleu</string>
     <string name="tts_install_voices_cancel">Annulla</string>
     <string name="ca_certificate">Tzertificadu CA</string>
@@ -686,6 +632,7 @@
     <string name="user_confirm_remove_self_message" product="default">As a pèrdere ispàtziu e datos in custu telèfonu. Non faghet a annullare custa atzione.</string>
     <string name="user_exit_guest_confirm_message">Totu is aplicatziones e datos in custa sessione ant a èssere cantzellados.</string>
     <string name="user_exit_guest_dialog_remove">Boga</string>
+    <string name="nfc_more_details">Àteras informatziones</string>
     <string name="nfc_payment_btn_text_update">Agiorna</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary">Bluetooth</string>
     <string name="keywords_time_format">Imprea su formadu 24 oras</string>
@@ -701,6 +648,7 @@
     <string name="zen_onboarding_settings">Impostatziones</string>
     <string name="zen_onboarding_new_setting_summary">No as a bìdere o intèndere notìficas. Is mutidas de cuntatos ispetziales e de chie mutit prus bortas sunt permitidas.</string>
     <string name="configure_notification_settings">Notìficas</string>
+    <string name="profile_section_header_for_advanced_privacy">Profilu de traballu</string>
     <string name="bubbles_feature_disabled_button_cancel">Annulla</string>
     <string name="notifications_title">Notìficas</string>
     <string name="notification_importance_low_title">Mesanu</string>
@@ -778,6 +726,7 @@
     <string name="mobile_network_sim_name_rename">Sarva</string>
     <string name="sim_action_continue">Sighi</string>
     <string name="sim_action_yes">Eja</string>
+    <string name="sim_action_cancel">Annulla</string>
     <string name="wfc_disclaimer_location_title_text">Positzione</string>
     <string name="wifi_disconnect_button_text">Disconnete</string>
     <string name="lockscreen_privacy_not_secure">Pro dd\'impreare, imposta unu blocu de ischermu</string>
@@ -787,4 +736,5 @@
     <string name="apps_dashboard_title">Aplicatziones</string>
     <string name="smart_forwarding_missing_alert_dialog_text">AB</string>
     <string name="bluetooth_connect_access_dialog_positive">Connete</string>
+    <string name="find_broadcast_password_dialog_password_error">Crae isballiada</string>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-ug/arrays.xml b/overlay/packages/apps/Settings/res/values-ug/arrays.xml
index 9f30444..d270c57 100644
--- a/overlay/packages/apps/Settings/res/values-ug/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-ug/arrays.xml
@@ -353,7 +353,7 @@
     <string-array name="captioning_font_size_selector_titles">
         <item>بەك كىچىك</item>
         <item>كىچىك</item>
-        <item>كۆڭۈلدىكى</item>
+        <item>ئوتتۇرا</item>
         <item>چوڭ</item>
         <item>بەك چوڭ</item>
     </string-array>
@@ -447,4 +447,9 @@
         <item>NR/LTE/TDSCDMA/GSM/WCDMA</item>
         <item>NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</item>
     </string-array>
+    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+        <item>ھەرگىز</item>
+        <item>After 1 minute</item>
+        <item>After 5 minutes</item>
+    </string-array>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values-ug/strings.xml b/overlay/packages/apps/Settings/res/values-ug/strings.xml
index b45b6ec..fce6f1c 100644
--- a/overlay/packages/apps/Settings/res/values-ug/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-ug/strings.xml
@@ -72,8 +72,8 @@
     <string name="bluetooth_phonebook_request">"تېلېفون دەپتەر زىيارەت ئىلتىماسى"</string>
     <string name="bluetooth_map_request">"ئۇچۇر زىيارەت ئىلتىماسى"</string>
     <string name="bluetooth_map_acceptance_dialog_text">%1$s ئۇچۇرلىرىڭىزنى زىيارەت قىلماقچى. %2$s غا زىيارەت ھوقۇقىنى بېرەمسىز؟</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">قايتا قوزغات</string>
-    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">ۋاز كەچ</string>
+    <string name="bluetooth_disable_hw_offload_dialog_confirm">قايتا قوزغات</string>
+    <string name="bluetooth_disable_hw_offload_dialog_cancel">ۋاز كەچ</string>
     <string name="choose_timezone">ۋاقىت رايونىنى تاللاڭ</string>
     <string name="intent_sender_data_label"><xliff:g id="data">سانلىق مەلۇمات:</xliff:g></string>
     <string name="intent_sender_sendbroadcast_text"><xliff:g id="BROADCAST">broadcast</xliff:g> يوللا</string>
@@ -111,6 +111,7 @@
     <string name="skip_label">ئاتلا</string>
     <string name="next_label">كېيىنكى</string>
     <string name="locale_remove_menu">چىقىرىۋەت</string>
+    <string name="app_locale_preference_title">تىل</string>
     <string name="activity_picker_label">پائالىيەت تاللاڭ</string>
     <string name="debug_intent_sender_label">سازلاشنى يوللىغۇچىنىڭ مەقسىتى</string>
     <string name="display_label">ئېكران</string>
@@ -166,23 +167,10 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete">ئۆچۈر</string>
     <string name="security_settings_fingerprint_enroll_done">تامام</string>
     <string name="fingerprint_enroll_button_next">كېيىنكى</string>
-    <string name="crypt_keeper_settings_title">شىفىرلاش</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet">تاختا كومپيۇتېر شىفىرلا</string>
-    <string name="crypt_keeper_encrypt_title" product="default">تېلېفون شىفىرلا</string>
-    <string name="crypt_keeper_encrypted_summary">شىفىرلانغان</string>
-    <string name="crypt_keeper_button_text" product="tablet">تاختا كومپيۇتېر شىفىرلا</string>
-    <string name="crypt_keeper_button_text" product="default">تېلېفون شىفىرلا</string>
-    <string name="crypt_keeper_low_charge_text">توكداننى توكلاپ ئاندىن قايتا سىناڭ.</string>
-    <string name="crypt_keeper_unplugged_text">توكلىغۇچنى چېتىپ ئاندىن قايتا سىناڭ.</string>
-    <string name="crypt_keeper_dialog_need_password_title">ئېكران قۇلۇپلاش PIN ياكى ئىم يوق</string>
-    <string name="crypt_keeper_dialog_need_password_message">سىز ئېكران قۇلۇپلاش PIN ياكى ئىم تەڭشىگەندىن كېيىن ئاندىن شىفىرلاشنى باشلىيالايسىز.</string>
-    <string name="crypt_keeper_confirm_title">شىفىرلامدۇ؟</string>
-    <string name="crypt_keeper_setup_title">شىفىرلاۋاتىدۇ</string>
-    <string name="crypt_keeper_setup_description" product="tablet">تاختا كومپيۇتېرىڭىزنى شىفىرلاۋاتىدۇ. %<xliff:g id="PERCENT">^1</xliff:g> تاماملاندى.</string>
-    <string name="crypt_keeper_setup_description" product="default">تېلېفونىڭىزنى شىفىرلاۋاتىدۇ. %<xliff:g id="PERCENT">^1</xliff:g> تاماملاندى.</string>
-    <string name="crypt_keeper_enter_password">ئىم كىرگۈزۈڭ</string>
-    <string name="crypt_keeper_failed_title">شىفىرلىيالمىدى</string>
-    <string name="crypt_keeper_switch_input_method">كىرگۈزگۈچ ئالماشتۇر</string>
+    <string name="encryption_settings_title">شىفىرلاش</string>
+    <string name="encrypt_title" product="tablet">تاختا كومپيۇتېر شىفىرلا</string>
+    <string name="encrypt_title" product="default">تېلېفون شىفىرلا</string>
+    <string name="encrypted_summary">شىفىرلانغان</string>
     <string name="lock_settings_picker_title">ئېكران قۇلۇپىنى تاللاڭ</string>
     <string name="unlock_set_unlock_launch_picker_title">ئېكران قۇلۇپلا</string>
     <string name="unlock_set_unlock_launch_picker_change_title">ئېكران قۇلۇپىنى ئۆزگەرت</string>
@@ -364,7 +352,6 @@
     <string name="wifi_tether_configure_ssid_default">Android قىزىق نۇقتا</string>
     <string name="private_dns_mode_on">ئوچۇق</string>
     <string name="display_settings_title">ئېكران</string>
-    <string name="sound_settings">ئاۋاز</string>
     <string name="all_volume_title">ئاۋاز مىقدارى</string>
     <string name="musicfx_title">ئاۋاز ئۈنۈملىرى</string>
     <string name="vibrate_in_silent_title">ئۈنسىز ھالەتتە تىترەت</string>
@@ -430,7 +417,6 @@
     <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_dream_start">ھازىرلا باشلا</string>
     <string name="screensaver_settings_button">تەڭشەكلەر</string>
     <string name="automatic_brightness">يورۇقلۇقنى ئۆزلۈكىدىن تەڭشەش</string>
     <string name="title_font_size">خەت چوڭلۇقى</string>
@@ -577,10 +563,10 @@
     <string name="menu_restore">كۆڭۈلدىكىگە قايتۇر</string>
     <string name="restore_default_apn_completed">كۆڭۈلدىكى APN تەڭشەككە ئەسلىگە قايتۇرۇش تاماملاندى</string>
     <string name="reset_network_confirm_title">ئەسلىگە قايتۇرامدۇ؟</string>
-    <string name="main_clear_accounts" product="default">\n\nنۆۋەتتە سىز تۆۋەندىكى ھېساباتقا تىزىمغا كىردىڭىز :\n</string>
-    <string name="main_clear_desc_also_erases_external"><li>\"نەغمە\"</li>\n<li>\"سۈرەتلەر\"</li>\n<li>\"باشقا ئىشلەتكۈچى سانلىق مەلۇماتى\"</li></string>
-    <string name="main_clear_desc_erase_external_storage" product="nosdcard">\n\nنەغمە، رەسىملەر ۋە باشقا ئىشلەتكۈچى سانلىق مەلۇماتىنى تازىلاشتا، \"<b>\"USB ساقلىغۇچ\"</b>\" نى تازىلىشىڭىز كېرەك.</string>
-    <string name="main_clear_desc_erase_external_storage" product="default">\n\nنەغمە، رەسىملەر ۋە باشقا ئىشلەتكۈچى سانلىق مەلۇماتىنى تازىلاشتا، \"<b>\"SD كارتا\"</b>\" نى تازىلىشىڭىز كېرەك.</string>
+    <string name="main_clear_accounts" product="default">"\n\nنۆۋەتتە سىز تۆۋەندىكى ھېساباتقا تىزىمغا كىردىڭىز :\n"</string>
+    <string name="main_clear_desc_also_erases_external">"<li>\"نەغمە\"</li>\n<li>\"سۈرەتلەر\"</li>\n<li>\"باشقا ئىشلەتكۈچى سانلىق مەلۇماتى\"</li>"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard">"\n\nنەغمە، رەسىملەر ۋە باشقا ئىشلەتكۈچى سانلىق مەلۇماتىنى تازىلاشتا، \"<b>\"USB ساقلىغۇچ\"</b>\" نى تازىلىشىڭىز كېرەك."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default">"\n\nنەغمە، رەسىملەر ۋە باشقا ئىشلەتكۈچى سانلىق مەلۇماتىنى تازىلاشتا، \"<b>\"SD كارتا\"</b>\" نى تازىلىشىڭىز كېرەك."</string>
     <string name="erase_external_storage" product="nosdcard">بۇ USB ساقلىغۇچنى ئۆچۈرىدۇ</string>
     <string name="erase_external_storage" product="default">SD كارتىنى ئۆچۈر</string>
     <string name="erase_external_storage_description" product="nosdcard">ئىچىدىكى USB ساقلىغۇچتىكى نەغمە ياكى سۈرەتكە ئوخشاش ھەممە سانلىق مەلۇماتلارنى ئۆچۈرىدۇ</string>
@@ -719,6 +705,7 @@
     <string name="clear_data_dlg_title">ئەپ سانلىق مەلۇماتىنى ئۆچۈرەمدۇ؟</string>
     <string name="dlg_ok">جەزملە</string>
     <string name="dlg_cancel">ۋاز كەچ</string>
+    <string name="dlg_delete">ئۆچۈر</string>
     <string name="join_two_items"><xliff:g id="FIRST_ITEM">%1$s</xliff:g> ۋە <xliff:g id="SECOND_ITEM">%2$s</xliff:g></string>
     <string name="computing_size">ھېسابلاۋاتىدۇ…</string>
     <string name="version_text">نەشرى <xliff:g id="VERSION_NUM">%1$s</xliff:g></string>
@@ -834,6 +821,7 @@
     <string name="vision_settings_suggestion_title">خەت نۇسخا چوڭلۇقى ئۆزگەرت</string>
     <string name="audio_category_title">ئۈن</string>
     <string name="display_category_title">ئېكران</string>
+    <string name="accessibility_magnification_triple_tap_warning_negative_button">ۋاز كەچ</string>
     <string name="accessibility_shortcut_edit_dialog_title_advance">ئالىي</string>
     <string name="accessibility_button_location_title">ئورنى</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title">ئېكران چوڭايتىش ھالىتىنى ئۆزلۈكىدىن يېڭىلا</string>
@@ -841,15 +829,14 @@
     <string name="accessibility_power_button_ends_call_prerefence_title">توك مەنبە توپچىسى بېسىلسا سۆزلىشىش ئاخىرلىشىدۇ</string>
     <string name="accessibility_timeout_default">كۆڭۈلدىكى</string>
     <string name="accessibility_long_press_timeout_preference_title">چېكىش ۋە كېچىكتۈرۈش</string>
-    <string name="accessibility_autoclick_default_title">تاقاق</string>
     <string name="accessibility_autoclick_medium_title">ئوتتۇرا</string>
+    <string name="accessibility_vibration_settings_state_on">ئوچۇق</string>
+    <string name="accessibility_vibration_settings_state_off">تاقاق</string>
     <string name="captioning_more_options_title">تېخىمۇ كۆپ تاللانما</string>
     <string name="accessibility_hearingaid_instruction_continue_button">داۋاملاشتۇر</string>
     <string name="accessibility_summary_shortcut_disabled">تاقاق</string>
     <string name="accessibility_summary_state_enabled">ئوچۇق</string>
     <string name="accessibility_summary_state_disabled">تاقاق</string>
-    <string name="accessibility_vibration_intensity_off">تاقاق</string>
-    <string name="accessibility_vibration_intensity_medium">ئوتتۇرا</string>
     <string name="accessibility_menu_item_settings">تەڭشەكلەر</string>
     <string name="accessibility_feature_state_on">ئوچۇق</string>
     <string name="accessibility_feature_state_off">تاقاق</string>
@@ -977,6 +964,8 @@
     <string name="menu_stats_total">ئومۇمى ئىشلىتىش مىقدارى</string>
     <string name="menu_stats_refresh">يېڭىلا</string>
     <string name="process_mediaserver_label">ۋاسىتە مۇلازىمېتىر</string>
+    <string name="process_network_tethering">ھەمبەھىر</string>
+    <string name="process_removed_apps">چىقىرىۋېتىلگەن ئەپلەر</string>
     <string name="process_stats_summary_title">جەريان سىتاتىستىكىسى</string>
     <string name="process_stats_summary">ئىجرا قىلىنىۋاتقان جەريانغا ئائىت تېخنىكىلىق سىتاتىستىكا ئۇچۇرى</string>
     <string name="app_memory_use">ئەسلەك ئىشلىتىشى</string>
@@ -1116,8 +1105,6 @@
     <string name="data_usage_received_sent"><xliff:g id="RECEIVED">%1$s</xliff:g> قوبۇللاندى، <xliff:g id="SENT">%2$s</xliff:g> يوللاندى</string>
     <string name="data_usage_total_during_range"><xliff:g id="RANGE">%2$s</xliff:g>: تەخمىنەن <xliff:g id="TOTAL">%1$s</xliff:g> ئىشلىتىلگەن.</string>
     <string name="data_usage_metered_auto">ئاپتوماتىك</string>
-    <string name="cryptkeeper_emergency_call">جىددىي چاقىرىش</string>
-    <string name="cryptkeeper_return_to_call">چاقىرىشقا قايتىش</string>
     <string name="vpn_name">ئاتى</string>
     <string name="vpn_type">تۈرى</string>
     <string name="vpn_server">مۇلازىمېتىر ئادرىسى</string>
@@ -1186,6 +1173,7 @@
     <string name="application_restrictions">ئەپ ۋە مەزمۇنغا يول قوي</string>
     <string name="apps_with_restrictions_header">چەكلىمىلىك ئەپلەر</string>
     <string name="apps_with_restrictions_settings_button">ئەپنىڭ تەڭشىكىنى ياي</string>
+    <string name="nfc_more_details">تەپسىلات بىلدۈرگۈسى</string>
     <string name="nfc_payment_default_not_set">تەڭشەلمىگەن</string>
     <string name="nfc_payment_btn_text_update">يېڭىلا</string>
     <string name="restriction_settings_title">چەكلىمەلەر</string>
@@ -1213,6 +1201,7 @@
     <string name="ringtone_title">تېلېفون قوڭغۇراق</string>
     <string name="notification_ringtone_title">كۆڭۈلدىكى ئۇقتۇرۇش ئاۋازى</string>
     <string name="notification_sound_default">كۆڭۈلدىكى ئۇقتۇرۇش ئاۋازى</string>
+    <string name="spatial_summary_off">تاقاق</string>
     <string name="zen_mode_schedule_delete">ئۆچۈر</string>
     <string name="zen_mode_rule_name_edit">تەھرىر</string>
     <string name="zen_mode_no_exceptions">يوق</string>
@@ -1326,6 +1315,8 @@
     <string name="sim_action_continue">داۋاملاشتۇر</string>
     <string name="sim_action_yes">ھەئە</string>
     <string name="sim_action_reboot">قايتا قوزغات</string>
+    <string name="sim_action_cancel">ۋاز كەچ</string>
+    <string name="privacy_controls_title">تىزگىنلەشلەر</string>
     <string name="contextual_card_dismiss_remove">چىقىرىۋەت</string>
     <string name="wfc_disclaimer_location_title_text">ئورنى</string>
     <string name="wifi_disconnect_button_text">ئۈز</string>
@@ -1338,4 +1329,14 @@
     <string name="smart_forwarding_missing_alert_dialog_text">جەزملە</string>
     <string name="next_page_content_description">كېيىنكى</string>
     <string name="bluetooth_connect_access_dialog_positive">باغلان</string>
+    <string name="tare_on">ئوچۇق</string>
+    <string name="tare_off">تاقاق</string>
+    <string-array name="tare_modifiers_subfactors">
+        <item>توكلاۋاتىدۇ</item>
+        <item>Doze</item>
+        <item>Power Save Mode</item>
+        <item>Process State</item>
+    </string-array>
+    <string name="tare_dialog_confirm_button_title">جەزملە</string>
+    <string name="dream_preview_button_title">ئالدىن كۆزەت</string>
 </resources>
diff --git a/overlay/packages/apps/TV/res/values-ast-rES/arrays.xml b/overlay/packages/apps/TV/res/values-ast-rES/arrays.xml
index f3f2bc8..837c221 100644
--- a/overlay/packages/apps/TV/res/values-ast-rES/arrays.xml
+++ b/overlay/packages/apps/TV/res/values-ast-rES/arrays.xml
@@ -37,7 +37,7 @@
         <item>Entretenimientu</item>
         <item>Estilu de vida</item>
         <item>Música</item>
-        <item>D\'estrena</item>
+        <item>Premier</item>
         <item>Teunoloxía/Ciencia</item>
     </string-array>
 </resources>
diff --git a/overlay/packages/apps/Trebuchet/res/values-ast-rES/strings.xml b/overlay/packages/apps/Trebuchet/res/values-ast-rES/strings.xml
index 279d5b2..13fed30 100644
--- a/overlay/packages/apps/Trebuchet/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-ast-rES/strings.xml
@@ -19,7 +19,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="long_press_widget_to_add">Ten primío pa mover un widget.</string>
     <string name="widget_preview_context_description">Widget de: <xliff:g id="widget_name" example="Calendar month view">%1$s</xliff:g></string>
-    <string name="add_item_request_drag_hint">Ten primíu\'l widget pa movelu pela pantalla d\'Aniciu</string>
     <string name="widgets_count">        {count, plural, =1{# widget} other{# widgets}}
     </string>
     <string name="shortcuts_count">        {count, plural, =1{# atayu} other{# atayos}}
@@ -30,19 +29,12 @@
     <string name="no_search_results">Nun s\'atopó nengún widget nin nengún atayu</string>
     <string name="widget_category_conversations">Conversaciones</string>
     <string name="widget_education_header">Información útil al algame</string>
-    <string name="widget_education_content">Pa consiguir información ensin abrir les aplicaciones, pues amestar widgets a la pantalla d\'Aniciu</string>
     <string name="reconfigurable_widget_education_tip">Toca pa camudar los axustes del widget</string>
     <string name="widget_education_close_button">Entendílo</string>
     <string name="all_apps_label">Toles aplicaciones</string>
     <string name="notifications_header">Avisos</string>
-    <string name="out_of_space">Nun queda espaciu na pantalla d\'Aniciu</string>
     <string name="all_apps_search_results">Resultaos de la busca</string>
     <string name="gadget_error_text">Nun se pue cargar el widget</string>
-    <string name="dotted_app_label">        {count, plural, offset:1
-            =1      {{app_name} tien # avisu}
-            other   {{app_name} tien # avisos}
-        }
-    </string>
     <string name="folder_name_format_exact">Carpeta: <xliff:g id="name" example="Games">%1$s</xliff:g>, <xliff:g id="size" example="2">%2$d</xliff:g> elementos</string>
     <string name="folder_name_format_overflow">Carpeta: <xliff:g id="name" example="Games">%1$s</xliff:g>, <xliff:g id="size" example="2">%2$d</xliff:g> ó más elementos</string>
     <string name="styles_wallpaper_button_text">Fondu de pantalla y estilu</string>
@@ -54,6 +46,5 @@
     <string name="work_apps_paused_content_description">Les aplicaciones llaborales tán desactivaes y nun puen unviate avisos, consumir la batería o acceder a la llocalización</string>
     <string name="work_apps_paused_edu_banner">Les aplicaciones llaborales tienen una insignia y l\'alministrador de TI pue veles</string>
     <string name="work_apps_paused_edu_accept">Entendílo</string>
-    <string name="work_apps_pause_btn_text">Desactivar les aplicaciones llaborales</string>
     <string name="work_apps_enable_btn_text">Activar les aplicaciones llaborales</string>
 </resources>
diff --git a/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml b/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
index 7043ae7..05bd8f5 100644
--- a/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
@@ -35,8 +35,6 @@
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
     <string name="widget_accessible_dims_format">%1$d o led, %2$d o uchder</string>
     <string name="widget_preview_context_description">Teclyn <xliff:g id="widget_name" example="Calendar month view">%1$s</xliff:g></string>
-    <string name="add_item_request_drag_hint">Cyffyrdda a dal dy gyffwrdd ar y teclyn i\'w symud o gwmpas y sgrin Gartref</string>
-    <string name="add_to_home_screen">Ychwanegu i\'r sgrin gartref</string>
     <string name="added_to_home_screen_accessibility_text">Ychwanegwyd teclyn <xliff:g id="widget_name" example="Calendar month view">%1$s</xliff:g> i\'r sgrin Gartref</string>
     <string name="widgets_count">        {count, plural, zero {} one {# teclyn} two {# declyn} few {# theclyn} many {# theclyn} =1{# teclyn} other{# teclyn}}
     </string>
@@ -52,7 +50,6 @@
     <string name="widgets_full_sheet_work_tab">Gwaith</string>
     <string name="widget_category_conversations">Sgyrsiau</string>
     <string name="widget_education_header">Gwybodaeth ddefnyddiol ar flaenau dy fysedd</string>
-    <string name="widget_education_content">I gael gwybodaeth heb agor apiau, gellir ychwanegu teclynnau i\'r sgrin Gartref</string>
     <string name="reconfigurable_widget_education_tip">Tapia i newid gosodiadau teclyn</string>
     <string name="widget_education_close_button">Deall yn iawn</string>
     <string name="widget_reconfigure_button_content_description">Newid gosodiadau teclyn</string>
@@ -65,7 +62,6 @@
     <string name="notifications_header">Hysbysiadau</string>
     <string name="long_press_shortcut_to_add">Cyffyrdda a dal dy gyffwrdd i symud llwybr byr.</string>
     <string name="long_accessible_way_to_add_shortcut">Rho dap dwbl a dal dy gyffwrdd i symud llwybr byr neu ddefnyddio gweithredoedd addasu.</string>
-    <string name="out_of_space">Does dim lle ar y sgrin Gartref hon</string>
     <string name="hotseat_out_of_space">Does dim rhagor o le yn y blwch ffefrynnau</string>
     <string name="all_apps_button_label">Rhestr apiau</string>
     <string name="all_apps_search_results">Canlyniadau chwilio</string>
@@ -79,10 +75,6 @@
     <string name="pin_prediction">Pinio Rhagfynegiad</string>
     <string name="permlab_install_shortcut">gosod llwybrau byr</string>
     <string name="permdesc_install_shortcut">Mae\'n caniatáu ap i ychwanegu llwybrau byr heb ymyrraeth defnyddiwr.</string>
-    <string name="permlab_read_settings">darllen llwybrau byr a gosodiadau Cartref</string>
-    <string name="permdesc_read_settings">Mae\'n caniatáu yr ap i ddarllen gosodiadau a llwybrau byr yn Cartref.</string>
-    <string name="permlab_write_settings">ysgrifennu llwybrau byr a gosodiadau Cartref</string>
-    <string name="permdesc_write_settings">Mae\'n caniatáu yr ap i newid y gosodiadau a llwybrau byr yn Cartref.</string>
     <string name="msg_no_phone_permission">Dyw <xliff:g id="app_name" example="Launcher3">%1$s</xliff:g> ddim yn cael gwneud galwadau.</string>
     <string name="gadget_error_text">Methu llwytho\'r teclyn</string>
     <string name="gadget_setup_text">Gosodiadau teclyn</string>
@@ -90,11 +82,6 @@
     <string name="uninstall_system_app_text">Mae hwn yn ap system a ni ellir ei ddadosod.</string>
     <string name="folder_hint_text">Enw Ffolder</string>
     <string name="disabled_app_label">Analluogwyd <xliff:g id="app_name" example="Messenger">%1$s</xliff:g></string>
-    <string name="dotted_app_label">        {count, plural,
-=1 {Mae gan {app_name} # hysbysiad} 
-other {Mae gan {app_name} # hysbysiad} 
-        }
-    </string>
     <string name="default_scroll_format">Tudalen %1$d o %2$d</string>
     <string name="workspace_scroll_format">Sgrin gartref %1$d o %2$d</string>
     <string name="workspace_new_page">Tudalen sgrin gartref newydd</string>
@@ -109,7 +96,6 @@
     <string name="styles_wallpaper_button_text">Papur wal ac arddull</string>
     <string name="settings_button_text">Gosodiadau cartref</string>
     <string name="msg_disabled_by_admin">Analluogwyd gan dy weinyddwr</string>
-    <string name="allow_rotation_title">Caniatáu troi\'r sgrin gartref</string>
     <string name="allow_rotation_desc">Pan gaiff y ffôn ei throi</string>
     <string name="notification_dots_title">Dotiau hysbysiadau</string>
     <string name="notification_dots_desc_on">Ymlaen</string>
@@ -118,7 +104,6 @@
     <string name="msg_missing_notification_access">I ddangos Dotiau Hysbysiadau, tro hysbysiadau apiau ymlaen ar gyfer <xliff:g id="name" example="My App">%1$s</xliff:g></string>
     <string name="title_change_settings">Newid gosodiadau</string>
     <string name="notification_dots_service_title">Dangos dotiau hysbysiadau</string>
-    <string name="auto_add_shortcuts_label">Ychwanegu eiconau apiau i\'r sgrin Gartref</string>
     <string name="auto_add_shortcuts_description">Ar gyfer apiau newydd</string>
     <string name="package_state_unknown">Anhysybys</string>
     <string name="abandoned_clean_this">Tynnu</string>
@@ -129,9 +114,9 @@
     <string name="app_installing_title">Yn gosod <xliff:g id="name" example="Messenger">%1$s</xliff:g>, <xliff:g id="progress" example="30%">%2$s</xliff:g> yn gyflawn</string>
     <string name="app_downloading_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> yn lawrlwytho, <xliff:g id="progress" example="30%">%2$s</xliff:g> yn gyflawn</string>
     <string name="app_waiting_download_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> yn disgwyl i\'w osod</string>
+    <string name="dialog_remove">Tynnu</string>
     <string name="widgets_list">Rhestr teclynnau</string>
     <string name="widgets_list_closed">Rhestr teclynnau wedi\'i chau</string>
-    <string name="action_add_to_workspace">Ychwanegu i\'r sgrin gartref</string>
     <string name="action_move_here">Symud yr eitem yma</string>
     <string name="item_added_to_workspace">Ychwanegwyd yr item i\'r sgrin gartref</string>
     <string name="item_removed">Tynnwyd yr eitem</string>
@@ -146,7 +131,6 @@
     <string name="added_to_folder">Ychwanegwyd yr eitem i\'r ffolder</string>
     <string name="create_folder_with">Creu ffolder gyda: <xliff:g id="name" example="Game">%1$s</xliff:g></string>
     <string name="folder_created">Crëwyd y ffolder</string>
-    <string name="action_move_to_workspace">Symud i\'r sgrin Gartref</string>
     <string name="action_resize">Ailfeintio</string>
     <string name="action_increase_width">Cynyddu\'r lled</string>
     <string name="action_increase_height">Cynyddu\'r taldra</string>
@@ -168,7 +152,6 @@
     <string name="work_apps_paused_content_description">Mae\'r apiau gwaith i ffwrdd. Ni all dy apiau gwaith anfon hysbysiadau, defnyddio dy fatri, na chanfod dy leoliad</string>
     <string name="work_apps_paused_edu_banner">Mae apiau gwaith wedi\'u bathodynnu ac yn weladwy i dy weinyddwyr TG</string>
     <string name="work_apps_paused_edu_accept">Deall yn iawn</string>
-    <string name="work_apps_pause_btn_text">Troi apiau gwaith i ffwrdd</string>
     <string name="work_apps_enable_btn_text">Troi apiau gwaith ymlaen</string>
     <string name="developer_options_filter_hint">Hidlydd</string>
     <string name="remote_action_failed">Methiant: <xliff:g id="what" example="Pause">%1$s</xliff:g></string>
diff --git a/overlay/packages/apps/Trebuchet/res/values-eo/strings.xml b/overlay/packages/apps/Trebuchet/res/values-eo/strings.xml
index d08383c..20279a4 100644
--- a/overlay/packages/apps/Trebuchet/res/values-eo/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-eo/strings.xml
@@ -22,4 +22,5 @@
     <string name="uninstall_drop_target_label">Malinstali</string>
     <string name="abandoned_clean_this">Forigi</string>
     <string name="abandoned_search">Serĉi</string>
+    <string name="dialog_remove">Forigi</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 99aaac9..77eab60 100644
--- a/overlay/packages/apps/Trebuchet/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-gd/strings.xml
@@ -27,7 +27,6 @@
     <string name="home_screen">Dachaigh</string>
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
     <string name="widget_accessible_dims_format">%1$d a leud ’s %2$d a dh’àirde</string>
-    <string name="add_to_home_screen">Cuir ris an sgrìn dachaigh</string>
     <string name="widget_button_text">Widgets</string>
     <string name="widgets_full_sheet_search_bar_hint">Lorg</string>
     <string name="widgets_full_sheet_personal_tab">Pearsanta</string>
@@ -52,12 +51,6 @@
     <string name="permlab_install_shortcut">stàladh ath-ghoiridean</string>
     <string name="permdesc_install_shortcut">Leigidh seo le aplacaid 
         ath-ghoiridean a chur ris às aonais gnìomh cleachdaiche.</string>
-    <string name="permlab_read_settings">leughadh roghainnean is ath-ghoiridean na dachaigh</string>
-    <string name="permdesc_read_settings">Leigidh seo leis an aplacaid 
-        roghainnean is ath-ghoiridean na dachaigh a leughadh.</string>
-    <string name="permlab_write_settings">sgrìobhadh roghainnean is ath-ghoiridean na dachaigh</string>
-    <string name="permdesc_write_settings">Leigidh seo leis an aplacaid 
-        roghainnean is ath-ghoiridean na dachaigh atharrachadh.</string>
     <string name="msg_no_phone_permission">Chan fhaod <xliff:g id="app_name" example="Launcher3">%1$s</xliff:g> gairmean fòn a dhèanamh</string>
     <string name="uninstall_system_app_text">Seo aplacaid an t-siostaim agus cha ghabh a dì-stàladh.</string>
     <string name="folder_hint_text">Deasaich an t-ainm</string>
@@ -75,7 +68,6 @@
     <string name="wallpaper_button_text">Pàipearan-balla</string>
     <string name="settings_button_text">Roghainnean na dachaigh</string>
     <string name="msg_disabled_by_admin">Chaidh a chur à comas leis an rianaire agad</string>
-    <string name="allow_rotation_title">Ceadaich cuairteachadh na sgrìn dachaigh</string>
     <string name="allow_rotation_desc">Nuair bhios am fòn ’ga chuairteachadh</string>
     <string name="notification_dots_title">Dotagan bratha</string>
     <string name="notification_dots_desc_on">Air</string>
@@ -84,7 +76,6 @@
     <string name="msg_missing_notification_access">Airson dotagan bratha a shealltainn, cuir air brathan aplacaid airson <xliff:g id="name" example="My App">%1$s</xliff:g></string>
     <string name="title_change_settings">Atharraich na roghainnean</string>
     <string name="notification_dots_service_title">Seall dotagan bratha</string>
-    <string name="auto_add_shortcuts_label">Cuir ìomhaigheagan aplacaidean ris an sgrìn dachaigh</string>
     <string name="auto_add_shortcuts_description">Do dh’aplacaidean ùra</string>
     <string name="package_state_unknown">Chan eil fhios</string>
     <string name="abandoned_clean_this">Thoir air falbh</string>
@@ -95,9 +86,9 @@
     </string>
     <string name="app_downloading_title">Tha <xliff:g id="name" example="Messenger">%1$s</xliff:g> ’ga luchdadh a-nuas, <xliff:g id="progress" example="30%">%2$s</xliff:g> deiseil</string>
     <string name="app_waiting_download_title">Tha <xliff:g id="name" example="Messenger">%1$s</xliff:g> a’ feitheamh ri stàladh</string>
+    <string name="dialog_remove">Thoir air falbh</string>
     <string name="widgets_list">Liosta nan Widgets</string>
     <string name="widgets_list_closed">Chaidh liosta nan Widgets a dhùnadh</string>
-    <string name="action_add_to_workspace">Cuir ris an sgrìn dachaigh</string>
     <string name="action_move_here">Gluais an nì an-seo</string>
     <string name="item_added_to_workspace">Chaidh an nì a chur ris an sgrìn dachaigh</string>
     <string name="item_removed">Chaidh an nì a thoirt air falbh</string>
@@ -112,7 +103,6 @@
     <string name="added_to_folder">Chaidh an nì a chur ri pasgan</string>
     <string name="create_folder_with">Cruthaich pasgan le: <xliff:g id="name" example="Game">%1$s</xliff:g></string>
     <string name="folder_created">Chaidh am pasgan a chruthachadh</string>
-    <string name="action_move_to_workspace">Gluais dhan sgrìn dachaigh</string>
     <string name="action_resize">Ath-mheudaich</string>
     <string name="action_increase_width">Meudaich an leud</string>
     <string name="action_increase_height">Meudaich an àirde</string>
diff --git a/overlay/packages/apps/Trebuchet/res/values-kab-rDZ/strings.xml b/overlay/packages/apps/Trebuchet/res/values-kab-rDZ/strings.xml
index 0c9788f..e554afa 100644
--- a/overlay/packages/apps/Trebuchet/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-kab-rDZ/strings.xml
@@ -19,7 +19,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="work_folder_name">Axeddim</string>
     <string name="home_screen">Asebter agejdan</string>
-    <string name="add_to_home_screen">Rnu γer ugdil agejdan</string>
     <string name="widget_button_text">Iwiǧiten</string>
     <string name="widgets_full_sheet_search_bar_hint">Nadi</string>
     <string name="widgets_full_sheet_personal_tab">Udmawan</string>
@@ -38,7 +37,7 @@
     <string name="package_state_unknown">Arussin</string>
     <string name="abandoned_clean_this">Kkes</string>
     <string name="abandoned_search">Nadi</string>
-    <string name="action_add_to_workspace">Rnu γer ugdil agejdan</string>
+    <string name="dialog_remove">Kkes</string>
     <string name="item_removed">Aferdis yettwakkes.</string>
     <string name="undo">Err-d</string>
     <string name="folder_created">Akaram yettwarna</string>
diff --git a/overlay/packages/apps/Trebuchet/res/values-ku/strings.xml b/overlay/packages/apps/Trebuchet/res/values-ku/strings.xml
index b10c0e8..dd93136 100644
--- a/overlay/packages/apps/Trebuchet/res/values-ku/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-ku/strings.xml
@@ -21,7 +21,6 @@
     <string name="activity_not_found">بەرنامە دانه‌به‌زیوه‌.</string>
     <string name="home_screen">ماڵەوە</string>
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
-    <string name="add_to_home_screen">زیاکردن بۆ پاشبنەمای ڕوونما</string>
     <string name="widget_button_text">ویجێتەکان</string>
     <string name="hotseat_out_of_space">لە کەشەفەی دڵخوازەکانت دیوی تری لێ نییە</string>
     <string name="remove_drop_target_label">لابردن</string>
@@ -30,12 +29,6 @@
     <string name="permlab_install_shortcut">دامەزراندنی کورتەڕێگەکان</string>
     <string name="permdesc_install_shortcut">ڕێگە بە بەرنامەیەک بدە بۆ
         زیاکردنی کورتەڕێگەکان بەبێ دەستێوەردانی بەکارهێنەر.</string>
-    <string name="permlab_read_settings">خوێندنەوەی ڕێکخستنەکانی ماڵەوە و کورتەڕێگەکان</string>
-    <string name="permdesc_read_settings">ڕێگە بە بەرنامەکە بدە بۆ خوێندنەوەی ڕێکخستنەکان و
-        کورتەڕێگەکانی سەر ماڵ.</string>
-    <string name="permlab_write_settings">نووسینی ڕێکخستنەکانی ماڵەوە و کورتەڕێگەکان</string>
-    <string name="permdesc_write_settings">ڕێگە بە بەرنامەکە بدە بۆ نووسینی ڕێکخستنەکان و
-        کورتەڕێگەکانی سەر ماڵ.</string>
     <string name="uninstall_system_app_text">ئەمە بەرنامەیەکی سیستەمییە و ناتوانرێت دامەزرانسڕینەوەی بۆ بکرێت.</string>
     <string name="default_scroll_format">پەڕەی %1$d لە %2$d</string>
     <string name="workspace_scroll_format">ڕوونمای ماڵەوە %1$d of %2$d</string>
@@ -43,5 +36,5 @@
     <string name="folder_closed">بوخچە داخرا</string>
     <string name="folder_renamed">بوخچە نالێنرایەوە بۆ <xliff:g id="name" example="Games">%1$s</xliff:g></string>
     <string name="wallpaper_button_text">دیوارپۆشەکان</string>
-    <string name="action_add_to_workspace">زیاکردن بۆ پاشبنەمای ڕوونما</string>
+    <string name="dialog_remove">لابردن</string>
 </resources>
diff --git a/overlay/packages/apps/Trebuchet/res/values-lb/strings.xml b/overlay/packages/apps/Trebuchet/res/values-lb/strings.xml
index 5def8b4..f6c2129 100644
--- a/overlay/packages/apps/Trebuchet/res/values-lb/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-lb/strings.xml
@@ -24,7 +24,6 @@
     <string name="safemode_widget_error">Widgeten desaktivéiert am Sécherheetsmodus</string>
     <string name="home_screen">Startschierm</string>
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
-    <string name="add_to_home_screen">Op de Startschierm setzen</string>
     <string name="widget_button_text">Widgeten</string>
     <string name="widgets_full_sheet_search_bar_hint">Sichen</string>
     <string name="hotseat_out_of_space">Keng Plaz méi an der Favoritteläischt</string>
@@ -33,10 +32,6 @@
     <string name="app_info_drop_target_label">App-Info</string>
     <string name="permlab_install_shortcut">Ofkierzungen installéieren</string>
     <string name="permdesc_install_shortcut">Erlaabt der App, Ofkierzungen ouni Benotzerinterventioun dobäizesetzen.</string>
-    <string name="permlab_read_settings">Startschierm-Astellungen an Ofkierzunge liesen</string>
-    <string name="permdesc_read_settings">Erlaabt der App, d\'Startschierm-Astellungen an -Ofkierzungen ze liesen.</string>
-    <string name="permlab_write_settings">Startschierm-Astellungen an Ofkierzunge schreiwen</string>
-    <string name="permdesc_write_settings">Erlaabt der App, d\'Startschierm-Astellungen an -Ofkierzungen z\'änneren.</string>
     <string name="uninstall_system_app_text">Dëst ass eng System-App a kann net desinstalléiert ginn.</string>
     <string name="default_scroll_format">Säit %1$d / %2$d</string>
     <string name="workspace_scroll_format">Startschierm %1$d / %2$d</string>
@@ -49,5 +44,5 @@
     <string name="abandoned_search">Sichen</string>
     <string name="abandoned_promises_title">Dës App ass net installéiert</string>
     <string name="abandoned_promise_explanation">D\'App fir dëst Symbol ass net installéiert. Du kanns et läschen, oder no der App sichen a se manuell installéieren.</string>
-    <string name="action_add_to_workspace">Op de Startschierm setzen</string>
+    <string name="dialog_remove">Läschen</string>
 </resources>
diff --git a/overlay/packages/apps/TvSettings/Settings/res/values-ast-rES/strings.xml b/overlay/packages/apps/TvSettings/Settings/res/values-ast-rES/strings.xml
index 87ccbf3..bc2a805 100644
--- a/overlay/packages/apps/TvSettings/Settings/res/values-ast-rES/strings.xml
+++ b/overlay/packages/apps/TvSettings/Settings/res/values-ast-rES/strings.xml
@@ -32,17 +32,13 @@
     <string name="hdr_format_hlg">HLG</string>
     <string name="hdr_format_hdr10plus">HDR10+</string>
     <string name="hdr_format_dolby_vision">Dolby Vision</string>
+    <string name="resolution_selection_dialog_ok">D\'acuerdu</string>
     <string name="bluetooth_toggle_title">Bluetooth</string>
     <string name="bluetooth_known_devices_category">Accesorios</string>
     <string name="bluetooth_official_remote_category">Mandu</string>
     <string name="launch_help">Centru d\'ayuda</string>
-    <string name="system_buttons">Botones</string>
     <string name="system_developer_options">Opciones pa desendolcadores</string>
     <string name="number_of_device_admins_none">Nun hai nenguna aplicación activa</string>
-    <plurals name="enterprise_privacy_number_packages">
-        <item quantity="one"><xliff:g id="count">%d</xliff:g> aplicación</item>
-        <item quantity="other"><xliff:g id="count">%d</xliff:g> aplicaciones</item>
-    </plurals>
     <string name="enterprise_privacy_input_method">Tecláu predetermináu</string>
     <string name="do_disclosure_generic">La to organización xestiona esti preséu.</string>
     <string name="do_disclosure_with_name">«<xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g>» xestiona esti preséu.</string>
diff --git a/overlay/packages/apps/TvSettings/Settings/res/values-cy/strings.xml b/overlay/packages/apps/TvSettings/Settings/res/values-cy/strings.xml
index bbeee95..93f1598 100644
--- a/overlay/packages/apps/TvSettings/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/TvSettings/Settings/res/values-cy/strings.xml
@@ -41,29 +41,12 @@
     <string name="add_an_account">Ychwanegu cyfrif</string>
     <string name="accounts_category_title">Cyfrifon a mewngofnodi</string>
     <string name="accounts_category_summary_no_account">Dim cyfrifon</string>
-    <plurals name="accounts_category_summary">
-        <item quantity="zero"><xliff:g id="accounts_number">%1$d</xliff:g> cyfrifon</item>
-        <item quantity="one"><xliff:g id="accounts_number">%1$d</xliff:g> cyfrif</item>
-        <item quantity="two"><xliff:g id="accounts_number">%1$d</xliff:g> gyfrif</item>
-        <item quantity="few"><xliff:g id="accounts_number">%1$d</xliff:g> cyfrif</item>
-        <item quantity="many"><xliff:g id="accounts_number">%1$d</xliff:g> chyfrif</item>
-        <item quantity="other"><xliff:g id="accounts_number">%1$d</xliff:g> cyfrif</item>
-    </plurals>
     <string name="accounts_slice_summary">Gwasanaethau cyfryngau, Cynorthwyydd, Taliadau</string>
     <string name="connectivity_network_category_title">Rhwydwaith a\'r Rhyngrwyd</string>
     <string name="sound_category_title">Sain</string>
     <string name="applications_category_title">Apiau</string>
     <string name="device_pref_category_title">Dewisiadau\'r Ddyfais</string>
     <string name="remotes_and_accessories_category_title">Rheolaeth o bell ac ategolion</string>
-    <string name="remotes_and_accessories_category_summary_no_bluetooth_device">Dim dyfeisiau Bluetooth wedi cysylltu</string>
-    <plurals name="remotes_and_accessories_category_summary">
-        <item quantity="zero"><xliff:g id="accessories_number">%1$d</xliff:g> ategolion</item>
-        <item quantity="one"><xliff:g id="accessories_number">%1$d</xliff:g> ategolyn</item>
-        <item quantity="two"><xliff:g id="accessories_number">%1$d</xliff:g> ategolyn</item>
-        <item quantity="few"><xliff:g id="accessories_number">%1$d</xliff:g> ategolyn</item>
-        <item quantity="many"><xliff:g id="accessories_number">%1$d</xliff:g> ategolyn</item>
-        <item quantity="other"><xliff:g id="accessories_number">%1$d</xliff:g> ategolyn</item>
-    </plurals>
     <string name="display_and_sound_category_title">Dangosydd a seiniau</string>
     <string name="help_and_feedback_category_title">Cymorth ac Adborth</string>
     <string name="privacy_category_title">Preifatrwydd</string>
@@ -125,6 +108,8 @@
     <string name="game_mode_title">Galluogi modd gemau</string>
     <string name="match_content_frame_rate_never">Byth</string>
     <string name="hdr_format_selection_manual_title">Â llaw</string>
+    <string name="resolution_selection_dialog_cancel">Diddymu</string>
+    <string name="resolution_selection_dialog_ok">Iawn</string>
     <string name="device_storage_clear_cache_title">Clirio data wedi\'i guddstorio?</string>
     <string name="device_storage_clear_cache_message">Bydd hyn yn clirio\'r data wedi\'i guddstorio gan bob ap.</string>
     <string name="accessories_add">Ychwanegu ategolyn</string>
@@ -161,7 +146,6 @@
     <string name="send_feedback">Anfon adborth</string>
     <string name="launch_help">Canolfan Gymorth</string>
     <string name="system_cast">Google Cast (Bwrw)</string>
-    <string name="system_buttons">Botymau</string>
     <string name="system_language">Iaith</string>
     <string name="system_keyboard">Bysellfwrdd</string>
     <string name="system_keyboard_autofill">Bysellfwrdd ac awto-lenwi</string>
@@ -190,14 +174,6 @@
     <string name="about_license_activity_unavailable">Dyw data trwydded ddim ar gael</string>
     <string name="about_model">Model</string>
     <string name="about_serial">Rhif cyfres</string>
-    <plurals name="show_dev_countdown">
-        <item quantity="zero">Rwyt <xliff:g id="step_count">%1$d</xliff:g> camau i ffwrdd o fod yn ddatblygwr</item>
-        <item quantity="one">Rwyt <xliff:g id="step_count">%1$d</xliff:g> cam i ffwrdd o fod yn ddatblygwr</item>
-        <item quantity="two">Rwyt <xliff:g id="step_count">%1$d</xliff:g> gam i ffwrdd o fod yn ddatblygwr</item>
-        <item quantity="few">Rwyt <xliff:g id="step_count">%1$d</xliff:g> cam i ffwrdd o fod yn ddatblygwr</item>
-        <item quantity="many">Rwyt <xliff:g id="step_count">%1$d</xliff:g> cham i ffwrdd o fod yn ddatblygwr</item>
-        <item quantity="other">Rwyt <xliff:g id="step_count">%1$d</xliff:g> cam i ffwrdd o fod yn ddatblygwr</item>
-    </plurals>
     <string name="about_ads">Hysbysebion</string>
     <string name="show_dev_on">Rwyt bellach â mynediad fel datblygwr!</string>
     <string name="show_dev_already">Dim angen; rwyt eisoes yn ddatblygwr.</string>
@@ -352,6 +328,8 @@
     <string name="storage_device_storage_section">Storfa\'r ddyfais</string>
     <string name="storage_removable_storage_section">Storfa gellir ei dynnu allan</string>
     <string name="storage_reset_section">Ailosod</string>
+    <string name="storage_free_up_clear_cached_data_confirm_title">Clirio data wedi\'i guddstorio?</string>
+    <string name="storage_free_up_clear_cached_data_confirm_description">Bydd hyn yn clirio\'r data wedi\'i guddstorio gan bob ap.</string>
     <string name="storage_mount_success">Mae <xliff:g id="name" example="SD card">%1$s</xliff:g> wedi mowntio</string>
     <string name="storage_mount_failure">Methwyd â mowntio <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
     <string name="storage_mount_adopted">Storfa USB wedi\'i ailgysylltu</string>
@@ -638,32 +616,6 @@
     <string name="inputs_device_auto_off_desc">Troi dyfeisiau HDMI i ffwrdd gyda\'r teledu</string>
     <string name="inputs_tv_auto_on">Troi\'r teledu ymlaen yn awtomatig</string>
     <string name="inputs_tv_auto_on_desc">Troi\'r teledu ymlaen gyda dyfais HDMI</string>
-    <string name="inputs_volume_control_enabled">Rheolaeth Sain CEC</string>
-    <string name="inputs_volume_control_enabled_desc">Rheoli sain teledu/AVR yn hytrach na\'r sain fewnol</string>
-    <plurals name="inputs_header_connected_input">
-        <item quantity="zero">Dim Mewnbynnau wedi eu Cysylltu</item>
-        <item quantity="one">Mewnbwn wedi ei Gysylltu</item>
-        <item quantity="two">Dau Fewnbwn wedi eu Cysylltu</item>
-        <item quantity="few">Tri Mewnbwn wedi eu Cysylltu</item>
-        <item quantity="many">Chwe Mewnbwn wedi eu Cysylltu</item>
-        <item quantity="other">Mewnbynnau wedi eu Cysylltu</item>
-    </plurals>
-    <plurals name="inputs_header_standby_input">
-        <item quantity="zero">Dim Mewnbynnau yn Segur</item>
-        <item quantity="one">Mewnbwn Modd Segur</item>
-        <item quantity="two">Mewnbynnau Modd Segur</item>
-        <item quantity="few">Mewnbynnau Modd Segur</item>
-        <item quantity="many">Mewnbynnau Modd Segur</item>
-        <item quantity="other">Mewnbynnau Modd Segur</item>
-    </plurals>
-    <plurals name="inputs_header_disconnected_input">
-        <item quantity="zero">Dim Mewnbynnau heb eu Cysylltu</item>
-        <item quantity="one">Un Mewnbwn heb ei Gysylltu</item>
-        <item quantity="two">Dau Fewnbwn heb eu Cysylltu</item>
-        <item quantity="few">Tri Mewnbwn heb eu Cysylltu</item>
-        <item quantity="many">Chwe Mewnbwn heb eu Cysylltu</item>
-        <item quantity="other">Mewnbynnau heb eu Cysylltu</item>
-    </plurals>
     <string name="user_add_profile_item_summary">Cyfyngu mynediad at apiau a chynnwys arall yn dy gyfrif</string>
     <string name="user_new_profile_name">Proffil cyfyngedig</string>
     <string name="user_restrictions_controlled_by">Rheolwyd gan <xliff:g id="app">%1$s</xliff:g></string>
@@ -677,14 +629,6 @@
     <string name="restricted_profile_create_title">Creu proffil cyfyngedig</string>
     <string name="restricted_profile_configure_title">Gosodiadau</string>
     <string name="restricted_profile_configure_apps_title">Apiau a chaniateir</string>
-    <plurals name="restricted_profile_configure_apps_description">
-        <item quantity="zero">Caniateir %d apiau</item>
-        <item quantity="one">Caniateir 1 ap</item>
-        <item quantity="two">Caniateir %d ap</item>
-        <item quantity="few">Caniateir %d ap</item>
-        <item quantity="many">Caniateir %d ap</item>
-        <item quantity="other">Caniateir %d ap</item>
-    </plurals>
     <string name="restricted_profile_allowed">Caniateir</string>
     <string name="restricted_profile_not_allowed">Ni chaniateir</string>
     <string name="restricted_profile_customize_restrictions">Ffurfweddu cyfyngiadau</string>
diff --git a/overlay/packages/apps/TvSettings/Settings/res/values-eo/strings.xml b/overlay/packages/apps/TvSettings/Settings/res/values-eo/strings.xml
index 9606676..32ab4ce 100644
--- a/overlay/packages/apps/TvSettings/Settings/res/values-eo/strings.xml
+++ b/overlay/packages/apps/TvSettings/Settings/res/values-eo/strings.xml
@@ -22,6 +22,7 @@
     <string name="add_account">Aldoni konton</string>
     <string name="surround_sound_enable_unsupported_dialog_cancel">Nuligi</string>
     <string name="match_content_frame_rate_never">Neniam</string>
+    <string name="resolution_selection_dialog_cancel">Nuligi</string>
     <string name="accessory_state_canceled">Nuligita</string>
     <string name="bluetooth_cancel">Nuligi</string>
     <string name="system_language">Lingvo</string>
diff --git a/overlay/packages/apps/TvSettings/Settings/res/values-gd/strings.xml b/overlay/packages/apps/TvSettings/Settings/res/values-gd/strings.xml
index d201193..3c105ba 100644
--- a/overlay/packages/apps/TvSettings/Settings/res/values-gd/strings.xml
+++ b/overlay/packages/apps/TvSettings/Settings/res/values-gd/strings.xml
@@ -41,25 +41,12 @@
     <string name="add_an_account">Cuir cunntas ris</string>
     <string name="accounts_category_title">Cunntasan ⁊ clàradh a-steach</string>
     <string name="accounts_category_summary_no_account">Chan eil cunntas ann fhathast</string>
-    <plurals name="accounts_category_summary">
-        <item quantity="one"><xliff:g id="accounts_number">%1$d</xliff:g> chunntas</item>
-        <item quantity="two"><xliff:g id="accounts_number">%1$d</xliff:g> chunntas</item>
-        <item quantity="few"><xliff:g id="accounts_number">%1$d</xliff:g> cunntasan</item>
-        <item quantity="other"><xliff:g id="accounts_number">%1$d</xliff:g> cunntas</item>
-    </plurals>
     <string name="accounts_slice_summary">Seirbheisean meadhain, cuidiche, pàigheadh</string>
     <string name="connectivity_network_category_title">An lìonra ⁊ an t-eadar-lìon</string>
     <string name="sound_category_title">Fuaim</string>
     <string name="applications_category_title">Aplacaidean</string>
     <string name="device_pref_category_title">Roghainnean an uidheim</string>
     <string name="remotes_and_accessories_category_title">Innealan cèine ⁊ co-innealan</string>
-    <string name="remotes_and_accessories_category_summary_no_bluetooth_device">Chan eil uidheam Bluetooth ceangailte</string>
-    <plurals name="remotes_and_accessories_category_summary">
-        <item quantity="one"><xliff:g id="accessories_number">%1$d</xliff:g> cho-uidheam</item>
-        <item quantity="two"><xliff:g id="accessories_number">%1$d</xliff:g> cho-uidheam</item>
-        <item quantity="few"><xliff:g id="accessories_number">%1$d</xliff:g> co-uidheaman</item>
-        <item quantity="other"><xliff:g id="accessories_number">%1$d</xliff:g> co-uidheam</item>
-    </plurals>
     <string name="display_and_sound_category_title">Taisbeanadh ⁊ fuaim</string>
     <string name="help_and_feedback_category_title">Cobhair ⁊ beachd thugainn</string>
     <string name="privacy_category_title">Prìobhaideachd</string>
@@ -121,6 +108,8 @@
     <string name="game_mode_title">Ceadaich modh nan geama</string>
     <string name="match_content_frame_rate_never">Chan ann idir</string>
     <string name="hdr_format_selection_manual_title">Leabhar-mìneachaidh</string>
+    <string name="resolution_selection_dialog_cancel">Sguir dheth</string>
+    <string name="resolution_selection_dialog_ok">Ceart ma-thà</string>
     <string name="device_storage_clear_cache_title">Am falamhaich dhut an dàta san tasgadan?</string>
     <string name="device_storage_clear_cache_message">Falamhaich seo dàta sam bith a chaidh a chur san tasgadan le aplacaid.</string>
     <string name="accessories_add">Cuir co-inneal ris</string>
@@ -157,7 +146,6 @@
     <string name="send_feedback">Cuir do bheachd thugainn</string>
     <string name="launch_help">Ionad na cobharach</string>
     <string name="system_cast">Google Cast</string>
-    <string name="system_buttons">Putanan</string>
     <string name="system_language">Cànan</string>
     <string name="system_keyboard">Meur-chlàr</string>
     <string name="system_keyboard_autofill">Am meur-chlàr ⁊ fèin-lìonadh</string>
@@ -186,12 +174,6 @@
     <string name="about_license_activity_unavailable">Chan eil dàta a’ cheadachais ri fhaighinn</string>
     <string name="about_model">Modail</string>
     <string name="about_serial">Àireamh shreathach</string>
-    <plurals name="show_dev_countdown">
-        <item quantity="one">Chan eil ach <xliff:g id="step_count">%1$d</xliff:g> cheum a dhìth ort mus dèid thu ’nad neach-leasachaidh</item>
-        <item quantity="two">Chan eil ach <xliff:g id="step_count">%1$d</xliff:g> cheum a dhìth ort mus dèid thu ’nad neach-leasachaidh</item>
-        <item quantity="few">Chan eil ach <xliff:g id="step_count">%1$d</xliff:g> ceuman a dhìth ort mus dèid thu ’nad neach-leasachaidh</item>
-        <item quantity="other">Chan eil ach <xliff:g id="step_count">%1$d</xliff:g> ceum a dhìth ort mus dèid thu ’nad neach-leasachaidh</item>
-    </plurals>
     <string name="about_ads">Sanasachd</string>
     <string name="show_dev_on">Tha thu ’nad neach-leasachaidh a-nis!</string>
     <string name="show_dev_already">Chan eil feum air seo, tha thu nad neach-leasachaidh mu thràth</string>
@@ -346,6 +328,8 @@
     <string name="storage_device_storage_section">Stòras an uidheim</string>
     <string name="storage_removable_storage_section">Stòras so-ghiùlain</string>
     <string name="storage_reset_section">Ath-shuidhich</string>
+    <string name="storage_free_up_clear_cached_data_confirm_title">Am falamhaich dhut an dàta san tasgadan?</string>
+    <string name="storage_free_up_clear_cached_data_confirm_description">Falamhaich seo dàta sam bith a chaidh a chur san tasgadan le aplacaid.</string>
     <string name="storage_mount_success">Chaidh <xliff:g id="name" example="SD card">%1$s</xliff:g> a mhunntachadh</string>
     <string name="storage_mount_failure">Cha b’ urrainn dhuinn <xliff:g id="name" example="SD card">%1$s</xliff:g> a mhunntachadh</string>
     <string name="storage_mount_adopted">Chaidh stòras USB ath-cheangal</string>
@@ -633,26 +617,6 @@
     <string name="inputs_device_auto_off_desc">Cuir cumhachd nan uidheaman HDMI dheth leis an TBh</string>
     <string name="inputs_tv_auto_on">Cur air fèin-obrachail an TBh</string>
     <string name="inputs_tv_auto_on_desc">Cuir cumhachd an TBh air le uidheam HDMI</string>
-    <string name="inputs_volume_control_enabled">Smachd air àirde na fuaime CEC</string>
-    <string name="inputs_volume_control_enabled_desc">Stiùirich àirde fuaime TV/AVR seach àirde na fuaime taobh a-staigh</string>
-    <plurals name="inputs_header_connected_input">
-        <item quantity="one">Ion-chur co-cheangailte</item>
-        <item quantity="two">Ion-chuir cho-cheangailte</item>
-        <item quantity="few">Ion-chuir cho-cheangailte</item>
-        <item quantity="other">Ion-chuir cheangailte</item>
-    </plurals>
-    <plurals name="inputs_header_standby_input">
-        <item quantity="one">Ion-chur ’na fhuireachas</item>
-        <item quantity="two">Ion-chuir ’na fhuireachas</item>
-        <item quantity="few">Ion-chuir ’na fhuireachas</item>
-        <item quantity="other">Ion-chuir ’na fhuireachas</item>
-    </plurals>
-    <plurals name="inputs_header_disconnected_input">
-        <item quantity="one">Ion-chur nach deach a cheangal</item>
-        <item quantity="two">Ion-chuir nach deach a cheangal</item>
-        <item quantity="few">Ion-chuir nach deach a cheangal</item>
-        <item quantity="other">Ion-chuir gun cheangal</item>
-    </plurals>
     <string name="user_add_profile_item_summary">Cuingich an t-inntrigeadh gu aplacaidean is susbaint eile sa chunntas agad</string>
     <string name="user_new_profile_name">Pròifil chuingichte</string>
     <string name="user_restrictions_controlled_by">Fo stiùireadh <xliff:g id="app">%1$s</xliff:g></string>
@@ -666,12 +630,6 @@
     <string name="restricted_profile_create_title">Cruthaich pròifil chuingichte</string>
     <string name="restricted_profile_configure_title">Roghainnean</string>
     <string name="restricted_profile_configure_apps_title">Aplacaidean ceadaichte</string>
-    <plurals name="restricted_profile_configure_apps_description">
-        <item quantity="one">Fhuair %d aplacaid cead</item>
-        <item quantity="two">Fhuair %d aplacaid cead</item>
-        <item quantity="few">Fhuair %d aplacaidean cead</item>
-        <item quantity="other">Fhuair %d aplacaid cead</item>
-    </plurals>
     <string name="restricted_profile_allowed">Ceadaichte</string>
     <string name="restricted_profile_not_allowed">Gun chead</string>
     <string name="restricted_profile_customize_restrictions">Gnàthaich na cuingeachaidhean</string>
diff --git a/overlay/packages/apps/TvSettings/Settings/res/values-kab-rDZ/strings.xml b/overlay/packages/apps/TvSettings/Settings/res/values-kab-rDZ/strings.xml
index 4bff633..3265f72 100644
--- a/overlay/packages/apps/TvSettings/Settings/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/apps/TvSettings/Settings/res/values-kab-rDZ/strings.xml
@@ -47,6 +47,8 @@
     <string name="display_category_title">Sken</string>
     <string name="match_content_frame_rate_never">Weṛǧin</string>
     <string name="hdr_format_selection_manual_title">S ufus</string>
+    <string name="resolution_selection_dialog_cancel">Semmet</string>
+    <string name="resolution_selection_dialog_ok">IH</string>
     <string name="device_storage_clear_cache_title">Sfeḍ isefka yeffren?</string>
     <string name="accessory_connected">Iqqen</string>
     <string name="bluetooth_cancel">Semmet</string>
@@ -120,6 +122,7 @@
     <string name="storage_music_usage">Imesli</string>
     <string name="storage_eject">Ḍeqqer-d</string>
     <string name="storage_reset_section">Wennez</string>
+    <string name="storage_free_up_clear_cached_data_confirm_title">Sfeḍ isefka yeffren?</string>
     <string name="storage_wizard_forget_action">Ttu</string>
     <string name="storage_new_action_browse">Parcourir </string>
     <string name="storage_new_action_eject">Ḍeqqer-d</string>
diff --git a/overlay/packages/apps/TvSettings/Settings/res/values-lb/strings.xml b/overlay/packages/apps/TvSettings/Settings/res/values-lb/strings.xml
index 6083c4a..5f3e4ab 100644
--- a/overlay/packages/apps/TvSettings/Settings/res/values-lb/strings.xml
+++ b/overlay/packages/apps/TvSettings/Settings/res/values-lb/strings.xml
@@ -50,6 +50,8 @@
     <string name="display_category_title">Usiicht</string>
     <string name="match_content_frame_rate_never">Ni</string>
     <string name="hdr_format_selection_manual_title">Manuell</string>
+    <string name="resolution_selection_dialog_cancel">Ofbriechen</string>
+    <string name="resolution_selection_dialog_ok">OK</string>
     <string name="device_storage_clear_cache_title">Tëschegespäichert Date läschen?</string>
     <string name="device_storage_clear_cache_message">Heiduerch ginn déi tëschegespäichert Date fir all d\'Appe geläscht.</string>
     <string name="accessories_add">Accessoiren dobäisetzen</string>
@@ -93,10 +95,6 @@
     <string name="about_license_activity_unavailable">Lizenzdaten sinn net disponibel</string>
     <string name="about_model">Modell</string>
     <string name="about_serial">Seriennummer</string>
-    <plurals name="show_dev_countdown">
-        <item quantity="one">Du bass nach <xliff:g id="step_count">%1$d</xliff:g> Schrëtt dovun ewech en Entwéckler ze sinn</item>
-        <item quantity="other">Du bass nach <xliff:g id="step_count">%1$d</xliff:g> Schrëtter dovun ewech en Entwéckler ze sinn</item>
-    </plurals>
     <string name="about_ads">Reklammen</string>
     <string name="show_dev_on">Du bass elo en Entwéckler!</string>
     <string name="show_dev_already">Net néideg, du bass schonn en Entwéckler</string>
@@ -187,6 +185,8 @@
     <string name="storage_media_misc_usage">Ënnerschiddleches</string>
     <string name="storage_media_cache_usage">Tëschegespäichert Daten</string>
     <string name="storage_not_connected">Net connectéiert</string>
+    <string name="storage_free_up_clear_cached_data_confirm_title">Tëschegespäichert Date läschen?</string>
+    <string name="storage_free_up_clear_cached_data_confirm_description">Heiduerch ginn déi tëschegespäichert Date fir all d\'Appe geläscht.</string>
     <string name="system_date">Datum</string>
     <string name="system_time">Zäit</string>
     <string name="system_set_date">Datum setzen</string>
@@ -400,10 +400,6 @@
     <string name="restricted_profile_delete_title">Begrenzte Profil läschen</string>
     <string name="restricted_profile_configure_title">Astellungen</string>
     <string name="restricted_profile_configure_apps_title">Erlaabt Appen</string>
-    <plurals name="restricted_profile_configure_apps_description">
-        <item quantity="one">1 App erlaabt</item>
-        <item quantity="other">%d Appen erlaabt</item>
-    </plurals>
     <string name="restricted_profile_allowed">Erlaabt</string>
     <string name="restricted_profile_not_allowed">Refuséiert</string>
     <string name="restricted_profile_customize_restrictions">Personaliséiert Beschränkungen</string>
diff --git a/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml b/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml
index b8887af..5ad5353 100644
--- a/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml
+++ b/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml
@@ -32,7 +32,6 @@
     <string name="set_wallpaper_dialog_message">Gosod papur wal ymlaen</string>
     <string name="set_wallpaper_home_screen_destination">Sgrin gartref</string>
     <string name="set_wallpaper_lock_screen_destination">Sgrin cloi</string>
-    <string name="set_wallpaper_both_destination">Sgrin gartref a chloi</string>
     <string name="no_backup_image_wallpaper_label">Cylchdroi Delwedd Papur Wal</string>
     <string name="permission_needed_explanation">I ddangos y papur wal cyfredol yma, mae ar <xliff:g example="Wallpapers" id="app_name">%1$s</xliff:g> angen mynediad at storfa dy ddyfais.</string>
     <string name="permission_needed_explanation_go_to_settings">I ddangos y papur wal cyfredol yma, mae ar Papurau Wal angen mynediad at storfa dy ddyfais.\n\nI newid hyn, gweler adran Caniatâd gwybodaeth yr ap Papurau Wal.</string>
diff --git a/overlay/packages/modules/Permission/PermissionController/res/values-ast-rES/strings.xml b/overlay/packages/modules/Permission/PermissionController/res/values-ast-rES/strings.xml
index dcb8554..bd5265d 100644
--- a/overlay/packages/modules/Permission/PermissionController/res/values-ast-rES/strings.xml
+++ b/overlay/packages/modules/Permission/PermissionController/res/values-ast-rES/strings.xml
@@ -36,31 +36,7 @@
     <string name="review_button_continue">Siguir</string>
     <string name="new_permissions_category">Permisos nuevos</string>
     <string name="current_permissions_category">Permisos actuales</string>
-    <plurals name="duration_used_days">
-        <item quantity="one">1 d</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> d</item>
-    </plurals>
-    <plurals name="duration_used_hours">
-        <item quantity="one">1 h</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> h</item>
-    </plurals>
-    <plurals name="duration_used_minutes">
-        <item quantity="one">1 m</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> m</item>
-    </plurals>
-    <plurals name="duration_used_seconds">
-        <item quantity="one">1 s</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> s</item>
-    </plurals>
-    <plurals name="permission_usage_bar_label">
-        <item quantity="one">1 aplicación</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> aplicaciones</item>
-    </plurals>
     <string name="item_separator">,\u0020</string>
-    <plurals name="permission_usage_permission_filter_subtitle">
-        <item quantity="one">1 aplicación</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> aplicaciones</item>
-    </plurals>
     <string name="permission_history_category_today">Güei</string>
     <string name="permission_history_category_yesterday">Ayeri</string>
     <string name="app_permission_button_allow">Permitir</string>
@@ -76,22 +52,6 @@
     <string name="permission_description_summary_contacts">Les aplicaciones con esti permisu puen acceder a los contautos</string>
     <string name="permission_description_summary_location">Les aplicaciones con esti permisu pue acceder a la llocalización del preséu</string>
     <string name="permission_description_summary_storage">Les aplicaciones con esti permisu puen acceder al conteníu multimedia y a otros ficheros del preséu</string>
-    <plurals name="days">
-        <item quantity="one">1 día</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> díes</item>
-    </plurals>
-    <plurals name="hours">
-        <item quantity="one">1 hora</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> hores</item>
-    </plurals>
-    <plurals name="minutes">
-        <item quantity="one">1 minutu</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> minutos</item>
-    </plurals>
-    <plurals name="seconds">
-        <item quantity="one">1 segundu</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> segundos</item>
-    </plurals>
     <string name="permission_subtitle_all_files">Tolos ficheros</string>
     <string name="settings">Axustes</string>
     <string name="role_emergency_search_keywords">en casu d\'emerxencia</string>
@@ -124,4 +84,6 @@
     <string name="privdash_label_camera">Cámara</string>
     <string name="privdash_label_microphone">Micrófonu</string>
     <string name="privdash_label_location">Llocalización</string>
+    <string name="safety_center_issue_card_dismiss_button">Escartar</string>
+    <string name="media_confirm_dialog_negative_button">Atrás</string>
 </resources>
diff --git a/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml b/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml
index 0129983..ad99fd4 100644
--- a/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml
+++ b/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml
@@ -59,14 +59,6 @@
     <string name="no_permissions">Dim caniatâd</string>
     <string name="additional_permissions">Caniatâd ychwanegol</string>
     <string name="app_permissions_info_button_label">Agor gwybodaeth am yr ap</string>
-    <plurals name="additional_permissions_more">
-        <item quantity="zero"><xliff:g id="count" example="2">%1$d</xliff:g> yn rhagor</item>
-        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> arall</item>
-        <item quantity="two"><xliff:g id="count" example="2">%1$d</xliff:g> arall</item>
-        <item quantity="few"><xliff:g id="count" example="2">%1$d</xliff:g> arall</item>
-        <item quantity="many"><xliff:g id="count" example="2">%1$d</xliff:g> arall</item>
-        <item quantity="other"><xliff:g id="count" example="2">%1$d</xliff:g> arall</item>
-    </plurals>
     <string name="old_sdk_deny_warning">Cafodd yr ap hwn ei ddylunio ar gyfer fersiwn gynharach o Android. Gall gwrthod caniatâd achosi iddo beidio â gweithio fel y disgwyl.</string>
     <string name="default_permission_description">perfformio gweithred anhysbys</string>
     <string name="app_permissions_group_summary">Caniateir <xliff:g id="count" example="10">%1$d</xliff:g> o <xliff:g id="count" example="10">%2$d</xliff:g> ap</string>
@@ -119,75 +111,10 @@
     <string name="perm_usage_adv_info_title">Gweld caniatâd eraill</string>
     <string name="perm_usage_adv_info_summary_2_items"><xliff:g id="permgroup" example="Location">%1$s</xliff:g>,\u0020<xliff:g id="permgroup" example="Location">%2$s</xliff:g></string>
     <string name="perm_usage_adv_info_summary_more_items"><xliff:g id="permgroup" example="Location">%1$s</xliff:g>,\u0020<xliff:g id="permgroup" example="Location">%2$s</xliff:g>, a\u0020<xliff:g id="num" example="7">%3$s</xliff:g> arall</string>
-    <string name="permission_group_usage_subtitle">Amserlen o ddefnydd apiau o dy <xliff:g id="permgroup" example="Location">%1$s</xliff:g> dros y 24 awr ddiwethaf</string>
+    <string name="permission_group_usage_subtitle_24h">Amserlen o ddefnydd apiau o dy <xliff:g id="permgroup" example="Location">%1$s</xliff:g> dros y 24 awr ddiwethaf</string>
     <string name="permission_usage_access_dialog_subtitle">Pan ddefnyddiodd yr ap hwn dy ganiatâd <xliff:g id="permgroup" example="Location">%1$s</xliff:g></string>
     <string name="permission_usage_access_dialog_learn_more">Dysgu mwy</string>
-    <string name="permission_usage_duration_and_proxy"><xliff:g id="app_name" example="Gmail">%1$s</xliff:g> \u2022 <xliff:g id="truncated_time" example="1 hr 20min">%2$s</xliff:g></string>
-    <plurals name="duration_used_days">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> diwrnodau</item>
-        <item quantity="one">1 diwrnod</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> ddiwrnod</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
-    </plurals>
-    <plurals name="duration_used_hours">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> oriau</item>
-        <item quantity="one">1 awr</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-    </plurals>
-    <plurals name="duration_used_minutes">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
-        <item quantity="one">1 mun</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> fun</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> mun</item>
-    </plurals>
-    <plurals name="duration_used_seconds">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> eil</item>
-        <item quantity="one">1 eil</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> eil</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> eil</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> eil</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> eil</item>
-    </plurals>
-    <plurals name="permission_usage_summary">
-        <item quantity="zero">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad</item>
-        <item quantity="one">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad</item>
-        <item quantity="two">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> fynediad</item>
-        <item quantity="few">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad</item>
-        <item quantity="many">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad</item>
-        <item quantity="other">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad</item>
-    </plurals>
-    <plurals name="permission_usage_summary_background">
-        <item quantity="zero">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)</item>
-        <item quantity="one">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)</item>
-        <item quantity="two">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> fynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)</item>
-        <item quantity="few">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)</item>
-        <item quantity="many">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)</item>
-        <item quantity="other">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)</item>
-    </plurals>
-    <plurals name="permission_usage_summary_duration">
-        <item quantity="zero">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad\Hyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="one">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad\Hyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="two">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> fynediad\Hyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="few">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad\Hyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="many">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad\Hyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="other">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad\Hyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-    </plurals>
-    <plurals name="permission_usage_summary_background_duration">
-        <item quantity="zero">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)\nHyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="one">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)\nHyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="two">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> fynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)\nHyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="few">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)\nHyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="many">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)\nHyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-        <item quantity="other">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\n<xliff:g id="num" example="42">%2$s</xliff:g> mynediad (<xliff:g id="num" example="7">%3$s</xliff:g> yn y cefndir)\nHyd: <xliff:g id="time" example="2 hours">%3$s</xliff:g></item>
-    </plurals>
-    <string name="permission_usage_summary_background">Mynediad diwethaf: <xliff:g id="time" example="12:10 PM">%1$s</xliff:g>\nMynediad diwethaf tra bod yr ap yn rhedeg yn y cefndir</string>
+    <string name="history_preference_subtext_2"><xliff:g id="app_name" example="Gmail">%1$s</xliff:g> \u2022 <xliff:g id="truncated_time" example="1 hr 20min">%2$s</xliff:g></string>
     <string name="permission_usage_any_permission">Unrhyw ganiatâd</string>
     <string name="permission_usage_any_time">Unrhyw bryd</string>
     <string name="permission_usage_last_7_days">7 niwrnod diwethaf</string>
@@ -208,23 +135,7 @@
     <string name="permission_usage_bar_chart_title_last_hour">Defnydd caniatâd yn yr awr ddiwethaf</string>
     <string name="permission_usage_bar_chart_title_last_15_minutes">Defnydd caniatâd yn y 15 munud diwethaf</string>
     <string name="permission_usage_bar_chart_title_last_minute">Defnydd caniatâd yn yr awr ddiwethaf</string>
-    <plurals name="permission_usage_bar_label">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> apiau</item>
-        <item quantity="one">1 ap</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-    </plurals>
-    <string name="permission_usage_preference_summary_not_used">Heb eu defnyddio yn y 24 awr ddiwethaf</string>
-    <plurals name="permission_usage_preference_label">
-        <item quantity="zero">Defnyddwyd gan <xliff:g id="number" example="7">%1$d</xliff:g> apiau</item>
-        <item quantity="one">Defnyddwyd gan 1 ap</item>
-        <item quantity="two">Defnyddwyd gan <xliff:g id="number" example="7">%1$d</xliff:g> ap</item>
-        <item quantity="few">Defnyddwyd gan <xliff:g id="number" example="7">%1$d</xliff:g> ap</item>
-        <item quantity="many">Defnyddwyd gan <xliff:g id="number" example="7">%1$d</xliff:g> ap</item>
-        <item quantity="other">Defnyddwyd gan <xliff:g id="number" example="7">%1$d</xliff:g> ap</item>
-    </plurals>
+    <string name="permission_usage_preference_summary_not_used_24h">Heb eu defnyddio yn y 24 awr ddiwethaf</string>
     <string name="permission_usage_view_details">Gweld y cwbl yn y Dangosfwrdd</string>
     <string name="app_permission_usage_filter_label">Trefnwyd yn ôl: <xliff:g id="perm" example="Location">%1$s</xliff:g> </string>
     <string name="app_permission_usage_remove_filter">Tynnu\'r hidlydd</string>
@@ -238,14 +149,6 @@
     <string name="sort_by_time">Trefnu yn ôl amser</string>
     <string name="item_separator">,\u0020</string>
     <string name="permission_usage_refresh">Ail-lwytho</string>
-    <plurals name="permission_usage_permission_filter_subtitle">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> apiau</item>
-        <item quantity="one">1 ap</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> ap</item>
-    </plurals>
     <string name="permission_history_title">Hanes caniatâd</string>
     <string name="permission_history_category_today">Heddiw</string>
     <string name="permission_history_category_yesterday">Ddoe</string>
@@ -315,70 +218,14 @@
     <string name="allowed_storage_full">Gyda chaniatâd i reoli pob ffeil</string>
     <string name="ask_header">Gofyn bob tro</string>
     <string name="denied_header">Ni chaniateir</string>
-    <plurals name="days">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> diwrnodau</item>
-        <item quantity="one">1 diwrnod</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> ddiwrnod</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> diwrnod</item>
-    </plurals>
-    <plurals name="hours">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> oriau</item>
-        <item quantity="one">1 awr</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> awr</item>
-    </plurals>
-    <plurals name="minutes">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> munudau</item>
-        <item quantity="one">1 funud</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> funud</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> munud</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> munud</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> munud</item>
-    </plurals>
-    <plurals name="seconds">
-        <item quantity="zero"><xliff:g id="number" example="7">%s</xliff:g> eiliadau</item>
-        <item quantity="one">1 eiliad</item>
-        <item quantity="two"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
-        <item quantity="few"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
-        <item quantity="many"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
-        <item quantity="other"><xliff:g id="number" example="7">%s</xliff:g> eiliad</item>
-    </plurals>
     <string name="permission_reminders">Atgoffa am ganiatâd</string>
     <string name="auto_revoke_permission_reminder_notification_title_one">1 ap heb ei ddefnyddio</string>
     <string name="auto_revoke_permission_reminder_notification_title_many"><xliff:g id="number_of_apps" example="4">%s</xliff:g> ap heb eu defnyddio</string>
     <string name="auto_revoke_permission_reminder_notification_content">Tynnwyd caniatâd yn ôl i warchod dy breifatrwydd. Tapia i adolygu</string>
     <string name="auto_revoke_permission_notification_title">Tynnwyd caniatâd yn ôl o apiau heb eu defnyddio</string>
     <string name="auto_revoke_permission_notification_content">Dyw rhai apiau heb eu defnyddio ers rhai misoedd. Tapia i adolygu.</string>
-    <plurals name="auto_revoke_permission_notification_content_count">
-        <item quantity="zero">Does <xliff:g id="count" example="1">%1$d</xliff:g> apiau heb eu defnyddio ers rhai misoedd. Tapia i adolygu</item>
-        <item quantity="one">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb ei ddefnyddio ers rhai misoedd. Tapia i adolygu</item>
-        <item quantity="two">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd. Tapia i adolygu</item>
-        <item quantity="few">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd. Tapia i adolygu</item>
-        <item quantity="many">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd. Tapia i adolygu</item>
-        <item quantity="other">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd. Tapia i adolygu</item>
-    </plurals>
-    <plurals name="unused_apps_notification_title">
-        <item quantity="zero"><xliff:g id="count" example="2">%1$d</xliff:g> apiau heb eu defnyddio</item>
-        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> ap heb ei ddefnyddio</item>
-        <item quantity="two"><xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio</item>
-        <item quantity="few"><xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio</item>
-        <item quantity="many"><xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio</item>
-        <item quantity="other"><xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio</item>
-    </plurals>
     <string name="unused_apps_notification_content">Tynnwyd caniatâd a ffeiliau dros dro a chafodd hysbysiadau eu stopio. Tapia i adolygu.</string>
     <string name="auto_revoke_setting_subtitle">Dyw rhai apiau heb eu defnyddio ers rhai misoedd</string>
-    <plurals name="auto_revoke_setting_subtitle_count">
-        <item quantity="zero">Does <xliff:g id="count" example="1">%1$d</xliff:g> apiau heb eu defnyddio ers rhai misoedd.</item>
-        <item quantity="one">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb ei defnyddio ers rhai misoedd</item>
-        <item quantity="two">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd.</item>
-        <item quantity="few">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd.</item>
-        <item quantity="many">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd.</item>
-        <item quantity="other">Mae <xliff:g id="count" example="1">%1$d</xliff:g> ap heb eu defnyddio ers rhai misoedd.</item>
-    </plurals>
     <string name="permissions_removed_category_title">Caniatâd wedi\'u tynnu yn ôl</string>
     <string name="permission_removed_page_title">Caniatâd wedi\'u tynnu yn ôl</string>
     <string name="all_unused_apps_category_title">Pob ap heb ei ddefnyddio</string>
@@ -408,16 +255,16 @@
     <string name="permission_subtitle_background">Caniateir o hyd</string>
     <string name="app_perms_24h_access">Mynediad diwethaf am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g></string>
     <string name="app_perms_24h_access_yest">Mynediad diwethaf ddoe am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g></string>
-    <string name="app_perms_content_provider">Wedi cael mynediad yn y 24 awr ddiwethaf</string>
+    <string name="app_perms_content_provider_24h">Wedi cael mynediad yn y 24 awr ddiwethaf</string>
     <string name="app_perms_24h_access_background">Mynediad diwethaf am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g> \u2022 Caniateir o hyd</string>
     <string name="app_perms_24h_access_yest_background">Mynediad diwethaf ddoe am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g> \u2022 Caniateir o hyd</string>
-    <string name="app_perms_content_provider_background">Wedi cael mynediad yn y 24 awr diwethaf \u2022 Caniateir o hyd</string>
+    <string name="app_perms_content_provider_24h_background">Wedi cael mynediad yn y 24 awr diwethaf \u2022 Caniateir o hyd</string>
     <string name="app_perms_24h_access_media_only">Mynediad diwethaf am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g> \u2022 Cyfryngau</string>
     <string name="app_perms_24h_access_yest_media_only">Mynediad diwethaf ddoe am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g> \u2022 Cyfryngau</string>
-    <string name="app_perms_content_provider_media_only">Wedi cael mynediad yn y 24 awr diwethaf \u2022 Cyfryngau</string>
+    <string name="app_perms_content_provider_24h_media_only">Wedi cael mynediad yn y 24 awr diwethaf \u2022 Cyfryngau</string>
     <string name="app_perms_24h_access_all_files">Mynediad diwethaf am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g> \u2022 Pob Ffeil</string>
     <string name="app_perms_24h_access_yest_all_files">Mynediad diwethaf ddoe am <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g> \u2022 Pob Ffeil</string>
-    <string name="app_perms_content_provider_all_files">Wedi cael mynediad yn y 24 awr diwethaf \u2022 Pob Ffeil</string>
+    <string name="app_perms_content_provider_24h_all_files">Wedi cael mynediad yn y 24 awr diwethaf \u2022 Pob Ffeil</string>
     <string name="no_permissions_allowed">Ni roddir unrhyw ganiatâd</string>
     <string name="no_permissions_denied">Ni rwystrwyd unrhyw ganiatâd</string>
     <string name="no_apps_allowed">Ni chaniateir unrhyw ap</string>
@@ -433,8 +280,6 @@
     <string name="role_assistant_label">Ap cynorthwyydd digidol rhagosodedig</string>
     <string name="role_assistant_short_label">Ap cynorthwyydd digidol</string>
     <string name="role_assistant_description">Gall apiau cymorth dy helpu yn seiliedig ar wybodaeth o\u2019r sgrin wyt yn gwylio. Mae rhai apiau yn cefnogi\u2019r gwasanaethau mewnbwn llais a lansiwr i gynnig cymorth integredig.</string>
-    <string name="role_assistant_request_title">Gosod <xliff:g id="app_name" example="Super Assistant">%1$s</xliff:g> fel dy ap gymorth rhagosodedig?</string>
-    <string name="role_assistant_request_description">Mae\'n cael mynediada at SMS, log galwadau</string>
     <string name="role_browser_label">Ap porwr rhagosodedig</string>
     <string name="role_browser_short_label">Ap Porwr</string>
     <string name="role_browser_description">Apiau sy\'n rhoi mynediad at wefannau ac yn dangos y dolenni rwyt yn tapio arnynt</string>
@@ -444,13 +289,11 @@
     <string name="role_dialer_short_label">Ap ffôn</string>
     <string name="role_dialer_description">Apiau sy\'n dy ganiatáu i wneud a derbyn galwadau ffôn ar dy ddyfais</string>
     <string name="role_dialer_request_title">Gosod <xliff:g id="app_name" example="Super Phone">%1$s</xliff:g> fel dy ap ffôn rhagosodedig?</string>
-    <string name="role_dialer_request_description">Mae\'n cael mynediad at log galwadau, anfon SMS</string>
     <string name="role_dialer_search_keywords">deialydd</string>
     <string name="role_sms_label">Ap SMS rhagosodedig</string>
     <string name="role_sms_short_label">Ap SMS</string>
     <string name="role_sms_description">Apiau sy\'n dy ganiatáu i ddefnyddio dy rif ffôn i anfon a derbyn negeseuon testun byr, lluniau, fideos a mwy</string>
     <string name="role_sms_request_title">Gosod <xliff:g id="app_name" example="Super SMS">%1$s</xliff:g> fel dy ap SMS rhagosodedig?</string>
-    <string name="role_sms_request_description">Mae\'n cael mynediad at gysylltiadau, SMS, ffôn</string>
     <string name="role_sms_search_keywords">neges destun, testun, neges, negeseuon, negeseua, negesu</string>
     <string name="role_emergency_label">Ap argyfwng rhagosodedig</string>
     <string name="role_emergency_short_label">Ap mewn argyfwng</string>
@@ -474,6 +317,7 @@
     <string name="role_call_screening_description">Apiau sy\'n dy alluogi i adnabod galwadau a rhwystro sbam, robotiaid, neu rifau dieithr</string>
     <string name="role_call_screening_request_title">Gosod <xliff:g id="app_name" example="Super Call Screening">%1$s</xliff:g> fel dy ap adnabod galwyr a sbam rhagosodedig?</string>
     <string name="role_call_screening_request_description">Dim angen unrhyw ganiatâd</string>
+    <string name="role_automotive_navigation_request_description">Dim angen unrhyw ganiatâd</string>
     <string name="role_watch_description">Bydd <xliff:g id="app_name" example="Wear">%1$s</xliff:g> yn cael rhyngysylltu â dy hysbysiadau a chael mynediad at ganiatâd dy Ffôn, SMS, Cysylltiadau a Chalendr.</string>
     <string name="request_role_current_default">Rhagosodiad cyfredol</string>
     <string name="request_role_dont_ask_again">Peidio â gofyn eto</string>
@@ -577,4 +421,6 @@
     <string name="privdash_label_other">Arall</string>
     <string name="privdash_label_none">Dim</string>
     <string name="privdash_label_24h">24 awr\nddiwethaf</string>
+    <string name="safety_center_issue_card_dismiss_button">Diystyru</string>
+    <string name="media_confirm_dialog_negative_button">Nôl</string>
 </resources>
diff --git a/overlay/packages/modules/Wifi/service/ServiceWifiResources/res/values-cy/strings.xml b/overlay/packages/modules/Wifi/service/ServiceWifiResources/res/values-cy/strings.xml
index 93311d1..61af795 100644
--- a/overlay/packages/modules/Wifi/service/ServiceWifiResources/res/values-cy/strings.xml
+++ b/overlay/packages/modules/Wifi/service/ServiceWifiResources/res/values-cy/strings.xml
@@ -80,4 +80,6 @@
     <string name="wifi_softap_auto_shutdown_timeout_expired_summary">Dim dyfeisiau wedi\'u cysylltu. Tapia i addasu.</string>
     <string name="wifi_sim_required_title">Wi\u2011Fi heb gysylltu</string>
     <string name="wifi_sim_required_message">I gysylltu â <xliff:g id="ssid">%1$s</xliff:g>, gosoda SIM <xliff:g id="carrier_name">%2$s</xliff:g></string>
+    <string name="wifi_interface_priority_approve">Caniatáu</string>
+    <string name="wifi_enable_request_dialog_positive_button">Caniatáu</string>
 </resources>
diff --git a/overlay/packages/providers/MediaProvider/res/values-ast-rES/strings.xml b/overlay/packages/providers/MediaProvider/res/values-ast-rES/strings.xml
index c69f4bc..2d9b12e 100644
--- a/overlay/packages/providers/MediaProvider/res/values-ast-rES/strings.xml
+++ b/overlay/packages/providers/MediaProvider/res/values-ast-rES/strings.xml
@@ -22,146 +22,10 @@
     <string name="root_videos">Vídeos</string>
     <string name="root_audio">Audiu</string>
     <string name="root_documents">Documentos</string>
-    <plurals name="permission_more_thumb">
-        <item quantity="one"><xliff:g id="count" example="1">^1</xliff:g>+</item>
-        <item quantity="other"><xliff:g id="count" example="42">^1</xliff:g>+</item>
-    </plurals>
-    <plurals name="permission_more_text">
-        <item quantity="one">Y <xliff:g id="count" example="42">^1</xliff:g> elementu adicional</item>
-        <item quantity="other">Y <xliff:g id="count" example="42">^1</xliff:g> elementos adicionales</item>
-    </plurals>
     <string name="cache_clearing_dialog_title">Borráu de los ficheros temporales de les aplicaciones</string>
     <string name="cache_clearing_dialog_text">«<xliff:g id="app_seeking_permission" example="File manager">%s</xliff:g>» quier borrar dalgunos ficheros temporales. Esta aición pue aumentar el consumu de la batería o de los datos móviles.</string>
     <string name="cache_clearing_in_progress_title">Borrando los ficheros temporales de les aplicaciones\u2026</string>
     <string name="clear">Borrar</string>
-    <plurals name="permission_write_audio">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique esti ficheru d\'audiu?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique <xliff:g id="count" example="42">^2</xliff:g> ficheros d\'audiu?</item>
-    </plurals>
-    <plurals name="permission_progress_write_audio">
-        <item quantity="one">Modificando\'l ficheru d\'audiu…</item>
-        <item quantity="other">Modificando <xliff:g id="count" example="42">^1</xliff:g> ficheros d\'audiu…</item>
-    </plurals>
-    <plurals name="permission_write_video">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique esti videu?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique <xliff:g id="count" example="42">^2</xliff:g> vídeos?</item>
-    </plurals>
-    <plurals name="permission_progress_write_video">
-        <item quantity="one">Modificando\'l videu…</item>
-        <item quantity="other">Modificando <xliff:g id="count" example="42">^1</xliff:g> vídeos…</item>
-    </plurals>
-    <plurals name="permission_write_image">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique esta semeya?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique <xliff:g id="count" example="42">^2</xliff:g> semeyes?</item>
-    </plurals>
-    <plurals name="permission_progress_write_image">
-        <item quantity="one">Modificando la semeya…</item>
-        <item quantity="other">Modificando <xliff:g id="count" example="42">^1</xliff:g> semeyes…</item>
-    </plurals>
-    <plurals name="permission_write_generic">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique esti elementu?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» modifique <xliff:g id="count" example="42">^2</xliff:g> elementos?</item>
-    </plurals>
-    <plurals name="permission_progress_write_generic">
-        <item quantity="one">Modificando l\'elementu…</item>
-        <item quantity="other">Modificando <xliff:g id="count" example="42">^1</xliff:g> elementos…</item>
-    </plurals>
-    <plurals name="permission_trash_audio">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta esti ficheru d\'audiu na papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta <xliff:g id="count" example="42">^2</xliff:g> ficheros d\'audiu na papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_audio">
-        <item quantity="one">Metiendo\'l ficheru d\'audiu na papelera…</item>
-        <item quantity="other">Metiendo <xliff:g id="count" example="42">^1</xliff:g> ficheros d\'audiu na papelera…</item>
-    </plurals>
-    <plurals name="permission_trash_video">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta esti videu na papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta <xliff:g id="count" example="42">^2</xliff:g> vídeos na papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_video">
-        <item quantity="one">Metiendo\'l videu na papelera…</item>
-        <item quantity="other">Metiendo <xliff:g id="count" example="42">^1</xliff:g> vídeos na papelera…</item>
-    </plurals>
-    <plurals name="permission_trash_image">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta esta semeya na papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta <xliff:g id="count" example="42">^2</xliff:g> semeyes na papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_image">
-        <item quantity="one">Metiendo la semeya na papelera…</item>
-        <item quantity="other">Metiendo <xliff:g id="count" example="42">^1</xliff:g> semeyes na papelera…</item>
-    </plurals>
-    <plurals name="permission_trash_generic">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta esti elementu na papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» meta <xliff:g id="count" example="42">^2</xliff:g> elementos na papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_generic">
-        <item quantity="one">Metiendo l\'elementu na papelera…</item>
-        <item quantity="other">Metiendo <xliff:g id="count" example="42">^1</xliff:g> elementos na papelera…</item>
-    </plurals>
-    <plurals name="permission_untrash_audio">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque esti ficheru d\'audiu de la papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque <xliff:g id="count" example="42">^2</xliff:g> ficheros d\'audiu de la papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_audio">
-        <item quantity="one">Sacando\'l ficheru d\'audiu de la papelera…</item>
-        <item quantity="other">Sacando <xliff:g id="count" example="42">^1</xliff:g> ficheros d\'audiu de la papelera…</item>
-    </plurals>
-    <plurals name="permission_untrash_video">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque esti videu de la papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque <xliff:g id="count" example="42">^2</xliff:g> vídeos de la papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_video">
-        <item quantity="one">Sacando\'l videu de la papelera…</item>
-        <item quantity="other">Sacando <xliff:g id="count" example="42">^1</xliff:g> vídeos de la papelera…</item>
-    </plurals>
-    <plurals name="permission_untrash_image">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque esta semeya de la papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque <xliff:g id="count" example="42">^2</xliff:g> semeyes de la papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_image">
-        <item quantity="one">Sacando la semeya de la papelera…</item>
-        <item quantity="other">Sacando <xliff:g id="count" example="42">^1</xliff:g> semeyes de la papelera…</item>
-    </plurals>
-    <plurals name="permission_untrash_generic">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque esti elementu de la papelera?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» saque <xliff:g id="count" example="42">^2</xliff:g> elementos de la papelera?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_generic">
-        <item quantity="one">Sacando l\'elementu de la papelera…</item>
-        <item quantity="other">Sacando <xliff:g id="count" example="42">^1</xliff:g> elementos de la papelera…</item>
-    </plurals>
-    <plurals name="permission_delete_audio">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie esti ficheru d\'audiu?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie <xliff:g id="count" example="42">^2</xliff:g> ficheros d\'audiu?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_audio">
-        <item quantity="one">Desaniciando\'l ficheru d\'audiu…</item>
-        <item quantity="other">Desaniciando <xliff:g id="count" example="42">^1</xliff:g> ficheros d\'audiu…</item>
-    </plurals>
-    <plurals name="permission_delete_video">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie esti videu?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie <xliff:g id="count" example="42">^2</xliff:g> vídeos?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_video">
-        <item quantity="one">Desaniciando\'l videu…</item>
-        <item quantity="other">Desaniciando <xliff:g id="count" example="42">^1</xliff:g> vídeos…</item>
-    </plurals>
-    <plurals name="permission_delete_image">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie esta semeya?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie <xliff:g id="count" example="42">^2</xliff:g> semeyes?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_image">
-        <item quantity="one">Desaniciando la semeya…</item>
-        <item quantity="other">Desaniciando <xliff:g id="count" example="42">^1</xliff:g> semeyes…</item>
-    </plurals>
-    <plurals name="permission_delete_generic">
-        <item quantity="one">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie esti elementu?</item>
-        <item quantity="other">¿Quies permitir que «<xliff:g id="app_name" example="Gmail">^1</xliff:g>» desanicie <xliff:g id="count" example="42">^2</xliff:g> elementos?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_generic">
-        <item quantity="one">Desaniciando l\'elementu…</item>
-        <item quantity="other">Desaniciando <xliff:g id="count" example="42">^1</xliff:g> elementos…</item>
-    </plurals>
     <string name="transcode_denied">«<xliff:g id="app_name" example="File manager">%s</xliff:g>» nun pue procesar los ficheros multimedia</string>
     <string name="transcode_processing">Procesando\'l conteníu multimedia…</string>
     <string name="transcode_cancel">Encaboxar</string>
diff --git a/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml b/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
index 6d72fef..797e0bf 100644
--- a/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
+++ b/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
@@ -27,284 +27,12 @@
     <string name="permission_required_action">Parhau</string>
     <string name="grant_dialog_button_allow">Caniatáu</string>
     <string name="grant_dialog_button_deny">Gwrthod</string>
-    <plurals name="permission_more_thumb">
-        <item quantity="zero">+<xliff:g id="count" example="42">^1</xliff:g></item>
-        <item quantity="one">+<xliff:g id="count" example="1">^1</xliff:g></item>
-        <item quantity="two">+<xliff:g id="count" example="42">^1</xliff:g></item>
-        <item quantity="few">+<xliff:g id="count" example="42">^1</xliff:g></item>
-        <item quantity="many">+<xliff:g id="count" example="42">^1</xliff:g></item>
-        <item quantity="other">+<xliff:g id="count" example="42">^1</xliff:g></item>
-    </plurals>
-    <plurals name="permission_more_text">
-        <item quantity="zero">A <xliff:g id="count" example="42">^1</xliff:g> eitemau eraill</item>
-        <item quantity="one">Ac <xliff:g id="count" example="42">^1</xliff:g> eitem arall</item>
-        <item quantity="two">A <xliff:g id="count" example="42">^1</xliff:g> eitem arall</item>
-        <item quantity="few">A <xliff:g id="count" example="42">^1</xliff:g> eitem arall</item>
-        <item quantity="many">A <xliff:g id="count" example="42">^1</xliff:g> eitem arall</item>
-        <item quantity="other">A <xliff:g id="count" example="42">^1</xliff:g> eitem arall</item>
-    </plurals>
     <string name="cache_clearing_dialog_title">Clirio ffeiliau apiau dros dro</string>
     <string name="cache_clearing_dialog_text">Hoffa <xliff:g id="app_seeking_permission" example="File manager">%s</xliff:g> glirio rhai ffeiliau dros dro. Gall hyn olygu mwy o ddefnydd batri neu ddata symudol.</string>
     <string name="cache_clearing_in_progress_title">Yn clirio ffeiliau apiau dros dro\u2026</string>
     <string name="clear">Clirio</string>
     <string name="allow">Caniatáu</string>
     <string name="deny">Gwrthod</string>
-    <plurals name="permission_write_audio">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> ffeiliau sain?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-    </plurals>
-    <plurals name="permission_progress_write_audio">
-        <item quantity="zero">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> ffeiliau sain…</item>
-        <item quantity="one">Yn addasu ffeil sain…</item>
-        <item quantity="two">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-        <item quantity="few">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-        <item quantity="many">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-        <item quantity="other">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-    </plurals>
-    <plurals name="permission_write_video">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> fideos?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-    </plurals>
-    <plurals name="permission_progress_write_video">
-        <item quantity="zero">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> fideos…</item>
-        <item quantity="one">Yn addasu fideo…</item>
-        <item quantity="two">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-        <item quantity="few">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-        <item quantity="many">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-        <item quantity="other">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-    </plurals>
-    <plurals name="permission_write_image">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> lluniau?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> lun?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-    </plurals>
-    <plurals name="permission_progress_write_image">
-        <item quantity="zero">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> lluniau…</item>
-        <item quantity="one">Yn addasu llun…</item>
-        <item quantity="two">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> lun…</item>
-        <item quantity="few">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> llun…</item>
-        <item quantity="many">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> llun…</item>
-        <item quantity="other">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> llun…</item>
-    </plurals>
-    <plurals name="permission_write_generic">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> eitemau?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-    </plurals>
-    <plurals name="permission_progress_write_generic">
-        <item quantity="zero">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> eitemau…</item>
-        <item quantity="one">Yn addasu eitem…</item>
-        <item quantity="two">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-        <item quantity="few">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-        <item quantity="many">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-        <item quantity="other">Yn addasu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-    </plurals>
-    <plurals name="permission_trash_audio">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeiliau sain i\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain i\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain i\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain i\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain i\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain i\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_audio">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeiliau sain i\'r sbwriel…</item>
-        <item quantity="one">Yn symud ffeil sain i\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain i\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain i\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain i\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain i\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_trash_video">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideos i\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo i\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo i\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo i\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo i\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo i\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_video">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideos i\'r sbwriel…</item>
-        <item quantity="one">Yn symud fideo i\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo i\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo i\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo i\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo i\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_trash_image">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> lluniau i\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun i\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> lun i\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun i\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun i\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun i\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_image">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> lluniau i\'r sbwriel…</item>
-        <item quantity="one">Yn symud llun i\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> lun i\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> llun i\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> llun i\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> llun i\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_trash_generic">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitemau i\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem i\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem i\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem i\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem i\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem i\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_trash_generic">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitemau i\'r sbwriel…</item>
-        <item quantity="one">Yn symud eitem i\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem i\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem i\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem i\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem i\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_untrash_audio">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeiliau sain allan o\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain allan o\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain allan o\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain allan o\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain allan o\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> ffeil sain allan o\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_audio">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeiliau sain allan o\'r sbwriel…</item>
-        <item quantity="one">Yn symud ffeil sain allan o\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain allan o\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain allan o\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain allan o\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> ffeil sain allan o\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_untrash_video">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideos allan o\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo allan o\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo allan o\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo allan o\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo allan o\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> fideo allan o\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_video">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideos allan o\'r sbwriel…</item>
-        <item quantity="one">Yn symud fideo allan o\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo allan o\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo allan o\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo allan o\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> fideo allan o\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_untrash_image">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> lluniau allan o\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun allan o\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> lun allan o\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun allan o\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun allan o\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> llun allan o\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_image">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> lluniau allan o\'r sbwriel…</item>
-        <item quantity="one">Yn symud llun allan o\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> lun allan o\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> llun allan o\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> llun allan o\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> llun allan o\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_untrash_generic">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitemau allan o\'r bin sbwriel?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem allan o\'r bin sbwriel?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem allan o\'r bin sbwriel?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem allan o\'r bin sbwriel?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem allan o\'r bin sbwriel?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud <xliff:g id="count" example="42">^2</xliff:g> eitem allan o\'r bin sbwriel?</item>
-    </plurals>
-    <plurals name="permission_progress_untrash_generic">
-        <item quantity="zero">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitemau allan o\'r sbwriel…</item>
-        <item quantity="one">Yn symud eitem allan o\'r sbwriel…</item>
-        <item quantity="two">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem allan o\'r sbwriel…</item>
-        <item quantity="few">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem allan o\'r sbwriel…</item>
-        <item quantity="many">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem allan o\'r sbwriel…</item>
-        <item quantity="other">Yn symud <xliff:g id="count" example="42">^1</xliff:g> eitem allan o\'r sbwriel…</item>
-    </plurals>
-    <plurals name="permission_delete_audio">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> ffeiliau sain?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> ffeil sain?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_audio">
-        <item quantity="zero">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> ffeiliau sain…</item>
-        <item quantity="one">Yn dileu ffeil sain…</item>
-        <item quantity="two">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-        <item quantity="few">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-        <item quantity="many">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-        <item quantity="other">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> ffeil sain…</item>
-    </plurals>
-    <plurals name="permission_delete_video">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> fideos?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> fideo?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_video">
-        <item quantity="zero">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> fideos…</item>
-        <item quantity="one">Yn dileu fideo…</item>
-        <item quantity="two">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-        <item quantity="few">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-        <item quantity="many">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-        <item quantity="other">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> fideo…</item>
-    </plurals>
-    <plurals name="permission_delete_image">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> lluniau?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> lun?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> llun?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_image">
-        <item quantity="zero">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> lluniau…</item>
-        <item quantity="one">Yn dileu llun…</item>
-        <item quantity="two">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> lun…</item>
-        <item quantity="few">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> llun…</item>
-        <item quantity="many">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> llun…</item>
-        <item quantity="other">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> llun…</item>
-    </plurals>
-    <plurals name="permission_delete_generic">
-        <item quantity="zero">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> eitemau?</item>
-        <item quantity="one">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="two">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="few">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="many">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-        <item quantity="other">Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu <xliff:g id="count" example="42">^2</xliff:g> eitem?</item>
-    </plurals>
-    <plurals name="permission_progress_delete_generic">
-        <item quantity="zero">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> eitemau…</item>
-        <item quantity="one">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-        <item quantity="two">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-        <item quantity="few">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-        <item quantity="many">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-        <item quantity="other">Yn dileu <xliff:g id="count" example="42">^1</xliff:g> eitem…</item>
-    </plurals>
     <string name="transcode_denied">Ni all <xliff:g id="app_name" example="File manager">%s</xliff:g> brosesu ffeiliau cyfryngau</string>
     <string name="transcode_processing_cancelled">Diddymwyd prosesu cyfryngau</string>
     <string name="transcode_processing_error">Gwall prosesu cyfryngau</string>
diff --git a/overlay/packages/providers/MediaProvider/res/values-gd/strings.xml b/overlay/packages/providers/MediaProvider/res/values-gd/strings.xml
index dce1281..b02c94f 100644
--- a/overlay/packages/providers/MediaProvider/res/values-gd/strings.xml
+++ b/overlay/packages/providers/MediaProvider/res/values-gd/strings.xml
@@ -27,118 +27,10 @@
     <string name="permission_required_action">Lean air adhart</string>
     <string name="grant_dialog_button_allow">Ceadaich</string>
     <string name="grant_dialog_button_deny">Diùlt</string>
-    <plurals name="permission_more_thumb">
-        <item quantity="one">+<xliff:g id="count" example="1">^1</xliff:g></item>
-        <item quantity="two">+<xliff:g id="count" example="42">^1</xliff:g></item>
-        <item quantity="few">+<xliff:g id="count" example="42">^1</xliff:g></item>
-        <item quantity="other">+<xliff:g id="count" example="42">^1</xliff:g></item>
-    </plurals>
-    <plurals name="permission_more_text">
-        <item quantity="one">Agus <xliff:g id="count" example="42">^1</xliff:g> nì a bharrachd</item>
-        <item quantity="two">Agus <xliff:g id="count" example="42">^1</xliff:g> nì a bharrachd</item>
-        <item quantity="few">Agus <xliff:g id="count" example="42">^1</xliff:g> nithean a bharrachd</item>
-        <item quantity="other">Agus <xliff:g id="count" example="42">^1</xliff:g> nì a bharrachd</item>
-    </plurals>
     <string name="cache_clearing_dialog_title">Falamhaich faidhlichean sealach nan aplacaidean</string>
     <string name="cache_clearing_dialog_text">Tha <xliff:g id="app_seeking_permission" example="File manager">%s</xliff:g> airson faidhlichean sealach fhalamhachadh. Dh’fhaoidte gun caith sin barrachd dhen bhataraidh no dàta mobile.</string>
     <string name="cache_clearing_in_progress_title">A’ falamhachadh faidhlichean sealach nan aplacaidean\u2026</string>
     <string name="clear">Falamhaich</string>
     <string name="allow">Ceadaich</string>
     <string name="deny">Diùlt</string>
-    <plurals name="permission_write_audio">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime atharrachadh?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime atharrachadh?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhlichean fuaime atharrachadh?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhle fuaime atharrachadh?</item>
-    </plurals>
-    <plurals name="permission_write_video">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video atharrachadh?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video atharrachadh?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> videothan atharrachadh?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video atharrachadh?</item>
-    </plurals>
-    <plurals name="permission_write_image">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh atharrachadh?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dhealbh atharrachadh?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbhan atharrachadh?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh atharrachadh?</item>
-    </plurals>
-    <plurals name="permission_write_generic">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì atharrachadh?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì atharrachadh?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nithean atharrachadh?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì atharrachadh?</item>
-    </plurals>
-    <plurals name="permission_trash_audio">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime a ghluasad dhan sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime a ghluasad dhan sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhlichean fuaime a ghluasad dhan sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhle fuaime a ghluasad dhan sgudal?</item>
-    </plurals>
-    <plurals name="permission_trash_video">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a ghluasad dhan sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a ghluasad dhan sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> videothan a ghluasad dhan sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a ghluasad dhan sgudal?</item>
-    </plurals>
-    <plurals name="permission_trash_image">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh a ghluasad dhan sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dhealbh a ghluasad dhan sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbhan a ghluasad dhan sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh a ghluasad dhan sgudal?</item>
-    </plurals>
-    <plurals name="permission_trash_generic">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a ghluasad dhan sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a ghluasad dhan sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nithean a ghluasad dhan sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a ghluasad dhan sgudal?</item>
-    </plurals>
-    <plurals name="permission_untrash_audio">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime a thoirt às an sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime a thoirt às an sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhlichean fuaime a thoirt às an sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhle fuaime a thoirt às an sgudal?</item>
-    </plurals>
-    <plurals name="permission_untrash_video">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a thoirt às an sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a thoirt às an sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> videothan a thoirt às an sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a thoirt às an sgudal?</item>
-    </plurals>
-    <plurals name="permission_untrash_image">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh a thoirt às an sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dhealbh a thoirt às an sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbhan a thoirt às an sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh a thoirt às an sgudal?</item>
-    </plurals>
-    <plurals name="permission_untrash_generic">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a thoirt às an sgudal?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a thoirt às an sgudal?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nithean a thoirt às an sgudal?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a thoirt às an sgudal?</item>
-    </plurals>
-    <plurals name="permission_delete_audio">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime a sguabadh às?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> fhaidhle fuaime a sguabadh às?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhlichean fuaime a sguabadh às?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> faidhle fuaime a sguabadh às?</item>
-    </plurals>
-    <plurals name="permission_delete_video">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a sguabadh às?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a sguabadh às?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> videothan a sguabadh às?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> video a sguabadh às?</item>
-    </plurals>
-    <plurals name="permission_delete_image">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh a sguabadh às?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dhealbh a sguabadh às?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbhan a sguabadh às?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> dealbh a sguabadh às?</item>
-    </plurals>
-    <plurals name="permission_delete_generic">
-        <item quantity="one">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a sguabadh às?</item>
-        <item quantity="two">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a sguabadh às?</item>
-        <item quantity="few">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nithean a sguabadh às?</item>
-        <item quantity="other">Am faod <xliff:g id="app_name" example="Gmail">^1</xliff:g> <xliff:g id="count" example="42">^2</xliff:g> nì a sguabadh às?</item>
-    </plurals>
 </resources>
diff --git a/overlay/packages/services/BuiltInPrintService/res/values-ast-rES/strings.xml b/overlay/packages/services/BuiltInPrintService/res/values-ast-rES/strings.xml
index a6e9e87..5fd9f8b 100644
--- a/overlay/packages/services/BuiltInPrintService/res/values-ast-rES/strings.xml
+++ b/overlay/packages/services/BuiltInPrintService/res/values-ast-rES/strings.xml
@@ -17,6 +17,4 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wifi_direct_problem">El serviciu d\'imprentación predeterminada nun pue atopar nenguna imprentadora con Wi-Fi Direct</string>
     <string name="disable_wifi_direct">Desact. Wi-Fi Direct</string>
-    <string name="wifi_direct_location_rationale">El serviciu d\'imprentación predetermináu precisa que los servicios de llocalización tean activaos p\'atopar preseos cercanos.</string>
-    <string name="enable_location">Activar</string>
 </resources>
diff --git a/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml b/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml
index b31f724..4bbf74d 100644
--- a/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml
+++ b/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml
@@ -79,9 +79,6 @@
     <string name="connections">Cysylltiadau</string>
     <string name="wifi_direct_problem">Ni all y Gwasanaeth Argraffwyr Rhagosodedig ganfod argrafydd Wi-Fi Direct</string>
     <string name="disable_wifi_direct">Analluogi Wi-Fi Direct</string>
-    <string name="wifi_direct_permission_rationale">Mae ar y Gwasanaeth Argraffu Rhagosodedig angen caniatâd lleoliad i ganfod dyfeisiau gerllaw.</string>
     <string name="fix">Adolygu caniatâd</string>
-    <string name="wifi_direct_location_rationale">Mae ar y Gwasanaeth Argraffu Rhagosodedig angen gwasanaethau lleoliad ar waith i ganfod dyfeisiau gerllaw.</string>
-    <string name="enable_location">Galluogi lleoliad</string>
     <string name="print">Argraffu</string>
 </resources>
diff --git a/overlay/packages/services/BuiltInPrintService/res/values-gd/strings.xml b/overlay/packages/services/BuiltInPrintService/res/values-gd/strings.xml
index 05c32cf..13d82d4 100644
--- a/overlay/packages/services/BuiltInPrintService/res/values-gd/strings.xml
+++ b/overlay/packages/services/BuiltInPrintService/res/values-gd/strings.xml
@@ -80,7 +80,6 @@
     <string name="accept">Gabh ris</string>
     <string name="reject">Diùlt</string>
     <string name="connections">Ceanglaichean</string>
-    <string name="wifi_direct_permission_rationale">Feumaidh seirbheis bhunaiteach a’ chlò-bhualaidh cead ionaid airson uidheaman am fagas a lorg.</string>
     <string name="fix">Toir sùil air a’ chead</string>
     <string name="print">Clò-bhuail</string>
 </resources>
diff --git a/overlay/packages/services/Car/service/res/values-ast-rES/strings.xml b/overlay/packages/services/Car/service/res/values-ast-rES/strings.xml
deleted file mode 100644
index 6c98063..0000000
--- a/overlay/packages/services/Car/service/res/values-ast-rES/strings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="exit_button">Atrás</string>
-    <string name="exit_button_close_application">Zarrar l\'aplicación</string>
-    <string name="exit_button_go_back">Atrás</string>
-    <string name="importance_default">Importancia predeterminada</string>
-    <string name="importance_high">Importancia alta</string>
-    <string name="factory_reset_notification_button">Más</string>
-    <string name="resource_overuse_notification_title">«<xliff:g name="app_name" example="Maps">^1</xliff:g>» afeuta al rindimientu del sistema</string>
-    <string name="resource_overuse_notification_text_disable_app">Desactiva l\'aplicación p\'ameyorar el rindimientu del sistema. Pues volver activala n\'Axustes.</string>
-    <string name="resource_overuse_notification_text_prioritize_app">Prioriza l\'aplicación pa siguir usándola.</string>
-    <string name="resource_overuse_notification_text_uninstall_app">Desinstala l\'aplicación p\'ameyorar el rindimientu del sistema.</string>
-    <string name="resource_overuse_notification_button_disable_app">Desactivar l\'aplicación</string>
-    <string name="resource_overuse_notification_button_prioritize_app">Priorizar l\'aplicación</string>
-    <string name="resource_overuse_notification_button_uninstall_app">Desinstalar l\'aplicación</string>
-    <string name="resource_overuse_toast_disable_app_now">Desactivóse «<xliff:g name="app_name" example="Maps">^1</xliff:g>». Pues volver activar l\'aplicación n\'Axustes.</string>
-</resources>
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 298ba93..4d20e36 100644
--- a/overlay/packages/services/Car/service/res/values-cy/strings.xml
+++ b/overlay/packages/services/Car/service/res/values-cy/strings.xml
@@ -68,13 +68,6 @@
     <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_can_bus_failure">Methodd y bws CAN</string>
-    <string name="car_can_bus_failure_desc">Dyw\'r bws CAN ddim yn ymateb. Rho gynnig ar ddatgysylltu ac ailgysylltu blwch uned rheoli ac ailgychwyn y car</string>
-    <string name="activity_blocked_text">Ni ellir ddefnyddio\u2019r nodwedd hon tra\'n gyrru.</string>
-    <string name="exit_button_message">I ail ddechrau gyda nodweddion ap diogel, dewisa <xliff:g id="exit_button" example="Back">%s</xliff:g>.</string>
-    <string name="exit_button">Nôl</string>
-    <string name="exit_button_close_application">Cau\'r ap</string>
-    <string name="exit_button_go_back">Nôl</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>
@@ -139,6 +132,8 @@
     <string name="car_permission_desc_control_car_features">Galluogi neu analluogi nodweddion y car.</string>
     <string name="car_permission_label_use_car_watchdog">defnyddio gwarchotgi\u2019r car</string>
     <string name="car_permission_desc_use_car_watchdog">Defnyddio gwarchotgi\u2019r car.</string>
+    <string name="car_can_bus_failure">Methodd y bws CAN</string>
+    <string name="car_can_bus_failure_desc">Dyw\'r bws CAN ddim yn ymateb. Rho gynnig ar ddatgysylltu ac ailgysylltu blwch uned rheoli ac ailgychwyn y car</string>
     <string name="trust_device_default_name">Fy Nyfais</string>
     <string name="default_guest_name">Gwestai</string>
 </resources>
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 824641f..329ec39 100644
--- a/overlay/packages/services/Car/service/res/values-gd/strings.xml
+++ b/overlay/packages/services/Car/service/res/values-gd/strings.xml
@@ -70,14 +70,6 @@
     <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_can_bus_failure">Dh’fhàillig le bus CAN</string>
-    <string name="car_can_bus_failure_desc">Chan eil bus CAN a’ freagairt. Thoir a-mach is cuir a-steach bogsa a’ cheann-aonaid
-        agus ath-thòisich an càr</string>
-    <string name="activity_blocked_text">Chan urrainn dhut an gleus seo cleachdadh fhad ’s a bhios tu a’ draibheadh</string>
-    <string name="exit_button_message">Airson tòiseachadh às ùr le gleusan sàbhailte na h-aplacaid, tagh <xliff:g id="exit_button" example="Back">%s</xliff:g>.</string>
-    <string name="exit_button">Air ais</string>
-    <string name="exit_button_close_application">Dùin an aplacaid</string>
-    <string name="exit_button_go_back">Air ais</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>
@@ -134,6 +126,9 @@
     <string name="car_permission_desc_car_test_service">Smachd air modh deuchainn a’ chàir</string>
     <string name="car_permission_label_control_car_features">Cur an comas no à comas gleusan a’ chàir</string>
     <string name="car_permission_desc_control_car_features">Cur an comas no à comas gleusan a’ chàir.</string>
+    <string name="car_can_bus_failure">Dh’fhàillig le bus CAN</string>
+    <string name="car_can_bus_failure_desc">Chan eil bus CAN a’ freagairt. Thoir a-mach is cuir a-steach bogsa a’ cheann-aonaid
+        agus ath-thòisich an càr</string>
     <string name="trust_device_default_name">An t-uidheam agam</string>
     <string name="default_guest_name">Aoigh</string>
 </resources>
diff --git a/overlay/packages/services/Telecomm/res/values-ast-rES/strings.xml b/overlay/packages/services/Telecomm/res/values-ast-rES/strings.xml
index acc813b..39d6136 100644
--- a/overlay/packages/services/Telecomm/res/values-ast-rES/strings.xml
+++ b/overlay/packages/services/Telecomm/res/values-ast-rES/strings.xml
@@ -51,4 +51,5 @@
     <string name="notification_channel_missed_call">Llamaes perdíes</string>
     <string name="notification_channel_background_calls">Llamaes en segundu planu</string>
     <string name="notification_channel_disconnected_calls">Llamaes desconectaes</string>
+    <string name="cancel">Encaboxar</string>
 </resources>
diff --git a/overlay/packages/services/Telecomm/res/values-cy/strings.xml b/overlay/packages/services/Telecomm/res/values-cy/strings.xml
index e74e604..1cd062e 100644
--- a/overlay/packages/services/Telecomm/res/values-cy/strings.xml
+++ b/overlay/packages/services/Telecomm/res/values-cy/strings.xml
@@ -131,4 +131,5 @@
     <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt">Mae Rhwystro Galwadau wedi ei analluogi i ganiatáu’r gwasanaethau brys i gysylltu â thi.</string>
     <string name="developer_title">Dewislen Datblygwr Telathrebu</string>
     <string name="toast_emergency_can_not_pull_call">Ni ellir gwneud galwadau tra bo galwad brys ar y gweill.</string>
+    <string name="cancel">Diddymu</string>
 </resources>
diff --git a/overlay/packages/services/Telecomm/res/values-gd/strings.xml b/overlay/packages/services/Telecomm/res/values-gd/strings.xml
index 8d378eb..54934dc 100644
--- a/overlay/packages/services/Telecomm/res/values-gd/strings.xml
+++ b/overlay/packages/services/Telecomm/res/values-gd/strings.xml
@@ -130,4 +130,5 @@
     <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt">Chaidh bacadh ghairmean a chur à comas ach am faigh an luchd-cobharach grèim ort.</string>
     <string name="developer_title">Clàr-taice luchd-leasachaidh telecom</string>
     <string name="toast_emergency_can_not_pull_call">Chan urrainn dhut gairm a thogail fhad ’s a bhios tu ann an gairm-èiginn.</string>
+    <string name="cancel">Sguir dheth</string>
 </resources>
diff --git a/overlay/packages/services/Telecomm/res/values-kab-rDZ/strings.xml b/overlay/packages/services/Telecomm/res/values-kab-rDZ/strings.xml
index 4c953ee..e29af5d 100644
--- a/overlay/packages/services/Telecomm/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/services/Telecomm/res/values-kab-rDZ/strings.xml
@@ -29,4 +29,5 @@
     <string name="decline_incoming_call">Agwi</string>
     <string name="phone_settings_private_num_txt">Uslig</string>
     <string name="phone_settings_unknown_txt">Arussin</string>
+    <string name="cancel">Semmet</string>
 </resources>
diff --git a/overlay/packages/services/Telephony/res/values-cy/strings.xml b/overlay/packages/services/Telephony/res/values-cy/strings.xml
index 67ed6d7..9a5c8f1 100644
--- a/overlay/packages/services/Telephony/res/values-cy/strings.xml
+++ b/overlay/packages/services/Telephony/res/values-cy/strings.xml
@@ -643,22 +643,6 @@
     <string name="phone_in_ecm_notification_title">Modd Galwad Nôl mewn Argyfwng</string>
     <string name="phone_in_ecm_call_notification_text">Analluogwyd cysylltiad data</string>
     <string name="phone_in_ecm_notification_complete_time">Dim cysylltiad data tan <xliff:g id="completeTime">%s</xliff:g></string>
-    <plurals name="alert_dialog_exit_ecm">
-        <item quantity="zero">Bydd y ffôn mewn modd Galwad Nôl mewn Argyfwng am <xliff:g id="count">%s</xliff:g> munudau. Tra yn y modd hwn, ni ellir defnyddio unrhyw ap sy\'n defnyddio cysylltiad data. Wyt ti am adael nawr?</item>
-        <item quantity="one">Bydd y ffôn mewn modd Galwad Nôl mewn Argyfwng am <xliff:g id="count">%s</xliff:g> munud. Tra yn y modd hwn, ni ellir defnyddio unrhyw ap sy\'n defnyddio cysylltiad data. Wyt ti am adael nawr?</item>
-        <item quantity="two">Bydd y ffôn mewn modd Galwad Nôl mewn Argyfwng am <xliff:g id="count">%s</xliff:g> funud. Tra yn y modd hwn, ni ellir defnyddio unrhyw ap sy\'n defnyddio cysylltiad data. Wyt ti am adael nawr?</item>
-        <item quantity="few">Bydd y ffôn mewn modd Galwad Nôl mewn Argyfwng am <xliff:g id="count">%s</xliff:g> munud. Tra yn y modd hwn, ni ellir defnyddio unrhyw ap sy\'n defnyddio cysylltiad data. Wyt ti am adael nawr?</item>
-        <item quantity="many">Bydd y ffôn mewn modd Galwad Nôl mewn Argyfwng am <xliff:g id="count">%s</xliff:g> munud. Tra yn y modd hwn, ni ellir defnyddio unrhyw ap sy\'n defnyddio cysylltiad data. Wyt ti am adael nawr?</item>
-        <item quantity="other">Bydd y ffôn mewn modd Galwad Nôl mewn Argyfwng am <xliff:g id="count">%s</xliff:g> munud. Tra yn y modd hwn, ni ellir defnyddio unrhyw ap sy\'n defnyddio cysylltiad data. Wyt ti am adael nawr?</item>
-    </plurals>
-    <plurals name="alert_dialog_not_avaialble_in_ecm">
-        <item quantity="zero">Dyw\'r weithred honno ddim ar gael tra ym modd Galwad Nôl mewn Argyfwng. Bydd y ffôn yn y modd hwn am <xliff:g id="count">%s</xliff:g> munudau. Wyt ti am adael nawr?</item>
-        <item quantity="one">Dyw\'r weithred honno ddim ar gael tra ym modd Galwad Nôl mewn Argyfwng. Bydd y ffôn yn y modd hwn am <xliff:g id="count">%s</xliff:g> munud. Wyt ti am adael nawr?</item>
-        <item quantity="two">Dyw\'r weithred honno ddim ar gael tra ym modd Galwad Nôl mewn Argyfwng. Bydd y ffôn yn y modd hwn am <xliff:g id="count">%s</xliff:g> funud. Wyt ti am adael nawr?</item>
-        <item quantity="few">Dyw\'r weithred honno ddim ar gael tra ym modd Galwad Nôl mewn Argyfwng. Bydd y ffôn yn y modd hwn am <xliff:g id="count">%s</xliff:g> munud. Wyt ti am adael nawr?</item>
-        <item quantity="many">Dyw\'r weithred honno ddim ar gael tra ym modd Galwad Nôl mewn Argyfwng. Bydd y ffôn yn y modd hwn am <xliff:g id="count">%s</xliff:g> munud. Wyt ti am adael nawr?</item>
-        <item quantity="other">Dyw\'r weithred honno ddim ar gael tra ym modd Galwad Nôl mewn Argyfwng. Bydd y ffôn yn y modd hwn am <xliff:g id="count">%s</xliff:g> munud. Wyt ti am adael nawr?</item>
-    </plurals>
     <string name="alert_dialog_in_ecm_call">Dyw\'r weithred honno ddim ar gael ar ganol galwad brys.</string>
     <string name="progress_dialog_exiting_ecm">Yn gadael Modd Galwad Nôl mewn Argyfwng</string>
     <string name="alert_dialog_yes">Gadael</string>
@@ -666,14 +650,6 @@
     <string name="alert_dialog_dismiss">Gwrthod</string>
     <string name="phone_in_ecm_call_notification_text_without_data_restriction_hint">Mae\'r ffôn ym modd galwad nôl mewn argyfwng.</string>
     <string name="phone_in_ecm_notification_complete_time_without_data_restriction_hint">Hyd at <xliff:g id="date">%s</xliff:g></string>
-    <plurals name="alert_dialog_exit_ecm_without_data_restriction_hint">
-        <item quantity="zero">Bydd y ffôn ym modd galwad nôl mewn argyfwng am <xliff:g id="count">%s</xliff:g> munudau.\nWyt ti am adael nawr?</item>
-        <item quantity="one">Bydd y ffôn ym modd galwad nôl mewn argyfwng am <xliff:g id="count">%s</xliff:g> funud.\nWyt ti am adael nawr?</item>
-        <item quantity="two">Bydd y ffôn ym modd galwad nôl mewn argyfwng am <xliff:g id="count">%s</xliff:g> funud.\nWyt ti am adael nawr?</item>
-        <item quantity="few">Bydd y ffôn ym modd galwad nôl mewn argyfwng am <xliff:g id="count">%s</xliff:g> munud.\nWyt ti am adael nawr?</item>
-        <item quantity="many">Bydd y ffôn ym modd galwad nôl mewn argyfwng am <xliff:g id="count">%s</xliff:g> munud.\nWyt ti am adael nawr?</item>
-        <item quantity="other">Bydd y ffôn ym modd galwad nôl mewn argyfwng am <xliff:g id="count">%s</xliff:g> munud.\nWyt ti am adael nawr?</item>
-    </plurals>
     <string name="voicemail_provider">Gwasanaeth</string>
     <string name="voicemail_settings">Gosod</string>
     <string name="voicemail_number_not_set">&lt;Heb ei osod&gt;</string>
@@ -706,7 +682,6 @@
     <string name="voicemail_change_pin_key">voicemail_change_pin_key</string>
     <string name="tty_mode_key">button_tty_mode_key</string>
     <string name="wifi_calling_settings_key">button_wifi_calling_settings_key</string>
-    <string name="emergency_action_launch_hint">Tapia eto i agor</string>
     <string name="message_decode_error">Roedd gwall wrth ddadgodio\'r neges.</string>
     <string name="callFailed_cdma_activation">Mae cerdyn SIM wedi actifadu dy wasanaeth a diweddaru gallu dy ffôn i grwydro tramor.    </string>
     <string name="callFailed_cdma_call_limit">Mae gormod o alwadau ar eu canol. Diwedda neu gyfuno rhai o\'r galwadau cyfredol cyn gwneud galwad newydd.
@@ -852,7 +827,6 @@
     <string name="callFailed_already_dialing">Methu â gwneud galwad am fod galwad allan arall eisoes yn cael ei deialu.</string>
     <string name="callFailed_already_ringing">Methu â gwneud galwad am fod galwad i mewn yn aros i gael ei hateb. Ateba neu wrthod yr alwad i mewn cyn gwneud galwad newydd.</string>
     <string name="callFailed_calling_disabled">Methu â gwneud galwad am fod gwneud galwadau wedi\'i analluogi gyda\'r briodwedd system ro.telephony.disable-call.</string>
-    <string name="callFailed_too_many_calls">Methu â gwneud galwad tra bod dwy alwad eisoes ar y gweill. Rhaid datgysylltu un galwad neu gyfuno\'r ddwy i alwad grŵp cyn gwneud galwad newydd.</string>
     <string name="supp_service_over_ut_precautions">I ddefnyddio <xliff:g id="supp service">%s</xliff:g>, rhaid troi data symudol ymlaen. Gellir newid hyn yng ngosodiadau rhwydwaith symudol.</string>
     <string name="supp_service_over_ut_precautions_roaming">I ddefnyddio <xliff:g id="supp service">%s</xliff:g>, rhaid troi data symudol a data crwydro ymlaen. Gellir newid hyn yng ngosodiadau rhwydwaith symudol.</string>
     <string name="supp_service_over_ut_precautions_dual_sim">I ddefnyddio <xliff:g id="supp service">%1$s</xliff:g>, rhaid troi data symudol ymlaen ar gyfer SIM <xliff:g id="sim number">%2$d</xliff:g>. Gellir newid hyn yng ngosodiadau rhwydwaith symudol.</string>
@@ -936,10 +910,6 @@
     <string name="radio_info_smsc_refresh_label">Ail-lwytho</string>
     <string name="radio_info_toggle_dns_check_label">Toglo Gwiriad DNS</string>
     <string name="oem_radio_info_label">Gwybodaeth/Gosodiadau penodol i OEM</string>
-    <string name="radio_info_endc_available">EN-DC Ar gael:</string>
-    <string name="radio_info_dcnr_restricted">DCNR Wedi\'i Rwystro:</string>
-    <string name="radio_info_nr_available">NR Ar Gael:</string>
-    <string name="radio_info_nr_state">Statws NR:</string>
     <string name="radio_info_nr_frequency">Amlder NR:</string>
     <string name="band_mode_title">Gosod Modd Band Radio</string>
     <string name="band_mode_loading">Yn Llwytho Rhestr Bandiau\u2026</string>
diff --git a/overlay/packages/services/Telephony/res/values-gd/strings.xml b/overlay/packages/services/Telephony/res/values-gd/strings.xml
index baa1115..88b6f2f 100644
--- a/overlay/packages/services/Telephony/res/values-gd/strings.xml
+++ b/overlay/packages/services/Telephony/res/values-gd/strings.xml
@@ -632,18 +632,6 @@
     <string name="phone_in_ecm_notification_title">Modh gairm-èiginn air ais</string>
     <string name="phone_in_ecm_call_notification_text">Chaidh an ceangal dàta a chur à comas</string>
     <string name="phone_in_ecm_notification_complete_time">Cha bhi ceangal dàta ann gu ruige <xliff:g id="completeTime">%s</xliff:g></string>
-    <plurals name="alert_dialog_exit_ecm">
-        <item quantity="one">Bidh am fòn agad sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mhionaid. Fhad ’s a bhios tu sa mhodh seo, chan urrainn dhut aplacaid le ceangal dàta a chleachdadh. A bheil thu airson fàgail an-dràsta?</item>
-        <item quantity="two">Bidh am fòn agad sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mhionaid. Fhad ’s a bhios tu sa mhodh seo, chan urrainn dhut aplacaid le ceangal dàta a chleachdadh. A bheil thu airson fàgail an-dràsta?</item>
-        <item quantity="few">Bidh am fòn agad sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mionaidean. Fhad ’s a bhios tu sa mhodh seo, chan urrainn dhut aplacaid le ceangal dàta a chleachdadh. A bheil thu airson fàgail an-dràsta?</item>
-        <item quantity="other">Bidh am fòn agad sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mionaid. Fhad ’s a bhios tu sa mhodh seo, chan urrainn dhut aplacaid le ceangal dàta a chleachdadh. A bheil thu airson fàgail an-dràsta?</item>
-    </plurals>
-    <plurals name="alert_dialog_not_avaialble_in_ecm">
-        <item quantity="one">Chan eil an gnìomh a thagh thu ri fhaighinn sa mhodh gairm-èiginn air ais. Bidh am fòn agad sa mhodh seo fad <xliff:g id="count">%s</xliff:g> mhionaid. A bheil thu airson fàgail an-dràsta?</item>
-        <item quantity="two">Chan eil an gnìomh a thagh thu ri fhaighinn sa mhodh gairm-èiginn air ais. Bidh am fòn agad sa mhodh seo fad <xliff:g id="count">%s</xliff:g> mhionaid. A bheil thu airson fàgail an-dràsta?</item>
-        <item quantity="few">Chan eil an gnìomh a thagh thu ri fhaighinn sa mhodh gairm-èiginn air ais. Bidh am fòn agad sa mhodh seo fad <xliff:g id="count">%s</xliff:g> mionaidean. A bheil thu airson fàgail an-dràsta?</item>
-        <item quantity="other">Chan eil an gnìomh a thagh thu ri fhaighinn sa mhodh gairm-èiginn air ais. Bidh am fòn agad sa mhodh seo fad <xliff:g id="count">%s</xliff:g> mionaid. A bheil thu airson fàgail an-dràsta?</item>
-    </plurals>
     <string name="alert_dialog_in_ecm_call">Chan eil an gnìomh a thagh thu ri fhaighinn rè gairm-èiginn.</string>
     <string name="progress_dialog_exiting_ecm">A’ fàgail a’ mhodh gairm-èiginn air ais</string>
     <string name="alert_dialog_yes">Tha</string>
@@ -651,12 +639,6 @@
     <string name="alert_dialog_dismiss">Leig seachad</string>
     <string name="phone_in_ecm_call_notification_text_without_data_restriction_hint">Tha am fòn sa mhodh gairm-èiginn air ais</string>
     <string name="phone_in_ecm_notification_complete_time_without_data_restriction_hint">Gu ruige <xliff:g id="completeTime">%s</xliff:g></string>
-    <plurals name="alert_dialog_exit_ecm_without_data_restriction_hint">
-        <item quantity="one">Bidh am fòn sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mhionaid.\nA bheil thu airson fhàgail an-dràsta?</item>
-        <item quantity="two">Bidh am fòn sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mhionaid.\nA bheil thu airson fhàgail an-dràsta?</item>
-        <item quantity="few">Bidh am fòn sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mionaidean.\nA bheil thu airson fhàgail an-dràsta?</item>
-        <item quantity="other">Bidh am fòn sa mhodh gairm-èiginn air ais fad <xliff:g id="count">%s</xliff:g> mionaid.\nA bheil thu airson fhàgail an-dràsta?</item>
-    </plurals>
     <string name="voicemail_provider">Seirbheis</string>
     <string name="voicemail_settings">Suidheachadh</string>
     <string name="voicemail_number_not_set">&lt;Cha deach a suidheachadh&gt;</string>
@@ -690,7 +672,6 @@
     <string name="voicemail_change_pin_key">voicemail_change_pin_key</string>
     <string name="tty_mode_key">button_tty_mode_key</string>
     <string name="wifi_calling_settings_key">button_wifi_calling_settings_key</string>
-    <string name="emergency_action_launch_hint">Thoir gnogag air a-rithist gus fhosgladh</string>
     <string name="message_decode_error">Thachair mearachd le dì-chòdachadh na teachdaireachd.</string>
     <string name="callFailed_cdma_activation">        Ghnìomhaich cairt SIM an t-seirbheis agad agus dh’ùraich i comasan air fàrsan an fhòn agad.
     </string>
@@ -839,7 +820,6 @@
     <string name="callFailed_already_dialing">Cha ghabh gairm a dhèanamh on a tha gairm a-mach eile a’ daithealadh mu thràth.</string>
     <string name="callFailed_already_ringing">Cha ghabh gairm a dhèanamh on a tha gairm a-steach gun fhreagairt ann. Freagair no diùlt a’ ghairm a tha a’ tighinn a-steach mus cuir thu gairm ùr.</string>
     <string name="callFailed_calling_disabled">Cha ghabh gairm a dhèanamh on a chaidh cur ghairmean a chur à comas le roghainn ro.telephony.disable-call an t-siostaim.</string>
-    <string name="callFailed_too_many_calls">Tha ghabh gairm a dhèanamh on a tha dà ghairm ann mu thràth. Cuir crìoch air tè dhe na gairmean no co-aonaich iad ’nan gairm coinneimh mus tòisich thu air gairm ùr.</string>
     <string name="supp_service_over_ut_precautions">Airson <xliff:g id="supp service">%s</xliff:g> a chleachdadh, dèan cinnteach gu bheil an dàta mobile air. ’S urrainn dhut seo atharrachadh ann an roghainnean an lìonraidh mobile.</string>
     <string name="supp_service_over_ut_precautions_roaming">Airson <xliff:g id="supp service">%s</xliff:g> a chleachdadh, dèan cinnteach gu bheil an dàta mobile agus dàta air fàrsan air. ’S urrainn dhut seo atharrachadh ann an roghainnean an lìonraidh mobile.</string>
     <string name="supp_service_over_ut_precautions_dual_sim">Airson <xliff:g id="supp service">%1$s</xliff:g> a chleachdadh, dèan cinnteach gu bheil an dàta mobile air airson SIM <xliff:g id="sim number">%2$d</xliff:g>. ’S urrainn dhut seo atharrachadh ann an roghainnean an lìonraidh mobile.</string>
@@ -923,10 +903,6 @@
     <string name="radio_info_smsc_refresh_label">Ath-nuadhaich</string>
     <string name="radio_info_toggle_dns_check_label">Toglaich dearbhadh an DNS</string>
     <string name="oem_radio_info_label">Fiosrachadh/Roghainnean sònraichte an OEM</string>
-    <string name="radio_info_endc_available">EN-DC ri fhaighinn:</string>
-    <string name="radio_info_dcnr_restricted">DCNR cuingichte:</string>
-    <string name="radio_info_nr_available">NR ri fhaighinn:</string>
-    <string name="radio_info_nr_state">Staid NR:</string>
     <string name="radio_info_nr_frequency">Tricead NR:</string>
     <string name="band_mode_title">Suidhich modh bann rèidio</string>
     <string name="band_mode_loading">A’ luchdadh liosta nam bannan\u2026</string>
diff --git a/overlay/packages/services/Telephony/res/values-ku/strings.xml b/overlay/packages/services/Telephony/res/values-ku/strings.xml
index 3498aca..484caf7 100644
--- a/overlay/packages/services/Telephony/res/values-ku/strings.xml
+++ b/overlay/packages/services/Telephony/res/values-ku/strings.xml
@@ -444,14 +444,6 @@
     <string name="phone_entered_ecm_text">چووەناوەوە بۆ دۆخی پەیوەندی چالاککردنی فریاکەوتن</string>
     <string name="phone_in_ecm_notification_title">دۆخی پەیوەندی چالاککردنی فریاکەوتن</string>
     <string name="phone_in_ecm_call_notification_text">بەستنەوەی دراوە ناچالاککرا</string>
-    <plurals name="alert_dialog_exit_ecm">
-        <item quantity="one">تەلەفۆنەکە لە دۆخی پەیوەندی کردنەوەی فریاکەوتن ئەبێت بۆ ماوەی <xliff:g id="count">%s</xliff:g> خۆلەک. لەم دۆخەدا هیچ نەرمەواڵایەک ناتوانێت بەستنەوەکانی دراوە بەکار بهێنێت. دەتەوێ ئێستا دەربچی؟</item>
-        <item quantity="other">تەلەفۆنەکە لە دۆخی پەیوەندی کردنەوەی فریاکەوتن ئەبێت بۆ ماوەی <xliff:g id="count">%s</xliff:g> خۆلەک. لەم دۆخەدا هیچ نەرمەواڵایەک ناتوانێت بەستنەوەکانی دراوە بەکار بهێنێت. دەتەوێ ئێستا دەربچی؟</item>
-    </plurals>
-    <plurals name="alert_dialog_not_avaialble_in_ecm">
-        <item quantity="one">ئەم فرمانە هەڵبژێردراوە بەر دەست نییە لە کاتی بوون لە دۆخی پەیوەندی کردنەوەی فریاکەوتن. تەلەفۆن لەم دۆخەدا ئەبێت بۆ ماوەی <xliff:g id="count">%s</xliff:g> خولەک. دەتەوێ ئێستا دەربچی؟</item>
-        <item quantity="other">ئەم فرمانە هەڵبژێردراوە بەر دەست نییە لە کاتی بوون لە دۆخی پەیوەندی کردنەوەی فریاکەوتن. تەلەفۆن لەم دۆخەدا ئەبێت بۆ ماوەی <xliff:g id="count">%s</xliff:g> خولەک. دەتەوێ ئێستا دەربچی؟</item>
-    </plurals>
     <string name="alert_dialog_in_ecm_call">ئەم فرمانە هەڵبژێردراوە بەر دەست نییە لا کاتی پەیوەندی فریاکەوتن.</string>
     <string name="progress_dialog_exiting_ecm">دەرچوون لە دۆخی پەیوەندی کردنەوەی فریاکەوتن</string>
     <string name="alert_dialog_yes">بەڵێ</string>
diff --git a/overlay/packages/services/Telephony/res/values-lb/strings.xml b/overlay/packages/services/Telephony/res/values-lb/strings.xml
index d0d9344..41e9a3d 100644
--- a/overlay/packages/services/Telephony/res/values-lb/strings.xml
+++ b/overlay/packages/services/Telephony/res/values-lb/strings.xml
@@ -448,14 +448,6 @@
     <string name="phone_entered_ecm_text">Noutfallréckruffmodus aktivéiert</string>
     <string name="phone_in_ecm_notification_title">Noutfallréckruffmodus</string>
     <string name="phone_in_ecm_call_notification_text">Dateconnectioun desaktivéiert</string>
-    <plurals name="alert_dialog_exit_ecm">
-        <item quantity="one">Däin Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutt am Noutfallréckruffmodus. An dësem Modus kënne keng Appen eng Dateconnectioun benotzen. Wëlls du en elo verloossen?</item>
-        <item quantity="other">Däin Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutten am Noutfallréckruffmodus. An dësem Modus kënne keng Appen eng Dateconnectioun benotzen. Wëlls du en elo verloossen?</item>
-    </plurals>
-    <plurals name="alert_dialog_not_avaialble_in_ecm">
-        <item quantity="one">Déi ausgewielten Aktioun ass am Noutfallréckruffmodus net disponibel. Den Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutt an dësem Modus. Wëlls du en elo verloossen?</item>
-        <item quantity="other">Déi ausgewielten Aktioun ass am Noutfallréckruffmodus net disponibel. Den Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutten an dësem Modus. Wëlls du en elo verloossen?</item>
-    </plurals>
     <string name="alert_dialog_in_ecm_call">Déi ausgewielten Aktioun ass am Noutfallréckruffmodus net disponibel.</string>
     <string name="progress_dialog_exiting_ecm">Noutfallréckruffmodus gëtt verlooss</string>
     <string name="alert_dialog_yes">Jo</string>