Automatic translation import

Change-Id: I62aa0f64717d0a14ce6b70a604fbfb923e9119f1
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 f4c1e87..3e3a1cb 100644
--- a/overlay/frameworks/base/core/res/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-cy/strings.xml
@@ -181,6 +181,11 @@
     <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>
+    <string name="ssl_ca_cert_warning">{count, plural,
+        =1 {Awdurdod tystysgrifau wedi\u2019i osod}
+        other {Awdurdodau tystysgrifau wedi\u2019u gosod}
+    }
+    </string>
     <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>
@@ -259,6 +264,11 @@
 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>
+    <string name="bugreport_countdown">{count, plural,
+        =1 {Tynnu sgrinlun ymhen # eiliad}
+        other {Tynnu sgrinlun ymhen # eiliad}
+    }
+    </string>
     <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>
@@ -1125,6 +1135,12 @@
 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>
+    <string name="last_num_days">{count, plural,
+        =1 {# diwrnod diwethaf}
+        two {# ddiwrnod diwethaf}
+        other {# diwrnod diwethaf}
+    }
+    </string>
     <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>
@@ -1159,6 +1175,73 @@
     </string>
     <string name="duration_years_shortest_future">        mewn <xliff:g id="count">%d</xliff:g>b
     </string>
+    <string name="duration_minutes_relative">{count, plural,
+        =1 {# funud yn ôl}
+        zero {# munudau yn ôl}
+        two {# funud yn ôl}
+        few {# munud yn ôl}
+        many {# munud yn ôl}
+        other {# munud yn ôl}
+    }
+    </string>
+    <string name="duration_hours_relative">{count, plural,
+        =1 {# awr yn ôl}
+        zero {# oriau yn ôl}
+        two {# awr yn ôl}
+        few {# awr yn ôl}
+        many {# awr yn ôl}
+        other {# awr yn ôl}
+    }</string>
+    <string name="duration_days_relative">{count, plural,
+        zero {# diwrnodau yn ôl}
+        =1 {# diwrnod yn ôl}
+        two {# ddiwrnod yn ôl}
+        few {# diwrnod yn ôl}
+        many {# diwrnod yn ôl}
+        other {# diwrnod yn ôl}
+    }
+    </string>
+    <string name="duration_years_relative">{count, plural,
+        =1 {blwyddyn yn ôl}
+        two {# flynedd yn ôl}
+        few {# blynedd yn ôl}
+        many {# mlynedd yn ôl}
+        other {# blwyddyn yn ôl}
+    }
+    </string>
+    <string name="duration_minutes_relative_future">{count, plural,
+        =1 {# munud}
+        zero {# munudau}
+        two {# funud}
+        few {# munud}
+        many {# munud}
+        other {# munud}
+    }</string>
+    <string name="duration_hours_relative_future">{count, plural,
+        =1 {# awr}
+        zero {# oriau}
+        two {# awr}
+        few {# awr}
+        many {# awr}
+        other {# awr}
+    }</string>
+    <string name="duration_days_relative_future">{count, plural,
+        =1 {# diwrnod}
+        zero {# diwrnodau}
+        two {# ddiwrnod}
+        few {# diwrnod}
+        many {# diwrnod}
+        other {# diwrnod}
+    }
+    </string>
+    <string name="duration_years_relative_future">{count, plural,
+        =1 {blwyddyn}
+        two {# flynedd}
+        few {# blynedd}
+        many {# mlynedd}
+        other {# blwyddyn}
+    }
+    </string>
     <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>
@@ -1544,6 +1627,15 @@
     <string name="skip_button_label">Neidio</string>
     <string name="no_matches">Dim canlyniadau</string>
     <string name="find_on_page">Canfod yn y dudalen</string>
+    <string name="matches_found">{ count, plural,
+        zero {}
+        =1 {# canlyniad}
+        two {# o {total}}
+        few {# o {total}}
+        many {# o {total}}
+        other {# o {total}}
+    }
+    </string>
     <string name="action_mode_done">Iawn</string>
     <string name="progress_erasing">Yn dileu\'r storfa a rhennir\u2026</string>
     <string name="share">Rhannu</string>
@@ -1918,6 +2010,70 @@
     <string name="data_saver_description">I helpu lleihau defnydd data, mae Arbedwr Data yn rhwystro rhai apiau rhag anfon neu derbyn 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>
+    <string name="zen_mode_duration_minutes_summary">{count, plural,
+        =1 {Am un munud (nes {formattedTime})}
+        zero {Am # munudau (nes {formattedTime})}
+        two {Am # funud (nes {formattedTime})}
+        few {Am # munud (nes {formattedTime})}
+        many {Am # munud (nes {formattedTime})}
+        other {Am # munud (nes {formattedTime})}
+    }</string>
+    <string name="zen_mode_duration_minutes_summary_short">{count, plural,
+        =1 {Am un mun (nes {formattedTime})}
+        zero {Am # mun (nes {formattedTime})}
+        two {Am # fun (nes {formattedTime})}
+        few {Am # mun (nes {formattedTime})}
+        many {Am # mun (nes {formattedTime})}
+        other {Am # mun (nes {formattedTime})}
+    }</string>
+    <string name="zen_mode_duration_hours_summary">{count, plural,
+        =1 {Am 1 awr (nes {formattedTime})}
+        zero {Am # oriau (nes {formattedTime})}
+        two {Am # awr (nes {formattedTime})}
+        few {Am # awr (nes {formattedTime})}
+        many {Am # awr (nes {formattedTime})}
+        other {Am # awr (nes {formattedTime})}
+    }</string>
+    <string name="zen_mode_duration_hours_summary_short">{count, plural,
+        =1 {Am 1 awr (nes {formattedTime})}
+        zero {Am # oriau (nes {formattedTime})}
+        two {Am # awr (nes {formattedTime})}
+        few {Am # awr (nes {formattedTime})}
+        many {Am # awr (nes {formattedTime})}
+        other {Am # awr (nes {formattedTime})}
+    }</string>
+    <string name="zen_mode_duration_minutes">{count, plural,
+        =1 {Am un munud}
+        zero {Am # munudau}
+        two {Am # funud}
+        few {Am # munud}
+        many {Am # munud}
+        other {Am # munud}
+    }</string>
+    <string name="zen_mode_duration_minutes_short">{count, plural,
+        =1 {Am 1 mun}
+        zero {Am # mun}
+        two {Am # fun}
+        few {Am # mun}
+        many {Am # mun}
+        other {Am # mun}
+    }</string>
+    <string name="zen_mode_duration_hours">{count, plural,
+        =1 {Am 1 awr}
+        zero {Am # oriau}
+        two {Am # awr}
+        few {Am # awr}
+        many {Am # awr}
+        other {Am # awr}
+    }</string>
+    <string name="zen_mode_duration_hours_short">{count, plural,
+        =1 {Am 1 awr}
+        zero {Am # oriau}
+        two {Am # awr}
+        few {Am # awr}
+        many {Am # awr}
+        other {Am # awr}
+    }</string>
     <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>
@@ -2050,6 +2206,11 @@
     <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>
+    <string name="autofill_picker_some_suggestions">{count, plural,
+        =1 {Un awgrymiad awtolenwi}
+        other {# awgrymiad awtolenwi}
+    }
+    </string>
     <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>
@@ -2161,6 +2322,11 @@
     <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>
+    <string name="file_count">{count, plural,
+        =1 {{file_name} + # ffeil}
+        other {{file_name} + # ffeil}
+    }
+    </string>
     <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>
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 fe082f9..7ae2a0e 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
@@ -1238,6 +1238,7 @@
     <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="input_method_ime_switch_button_desc">Càmbia mètodu de intrada</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>
@@ -1254,6 +1255,7 @@
     <string name="capital_off">DISATIVADU</string>
     <string name="checked">ativadu</string>
     <string name="not_checked">disativadu</string>
+    <string name="in_progress">in cursu</string>
     <string name="whichApplication">Cumpleta s\'atzione impreende</string>
     <string name="whichApplicationNamed">Cumpleta s\'atzione impreende %1$s</string>
     <string name="whichApplicationLabel">Cumpleta s\'atzione</string>
@@ -1873,6 +1875,41 @@
     <string name="data_saver_description">Pro agiudare a menguare s\'impreu de datos, Aorru de datos impedit a unas cantas aplicatzione de imbiare o retzire datos in segundu pranu. Un\'aplicatzione chi ses impreende in custu momentu podet atzèdere a is datos, ma ddu podet fàghere prus pagu a s\'ispissu. Custu bolet nàrrere, pro esempru, ca is imàgines non benint ammustradas fintzas a cando no ddas tocas.</string>
     <string name="data_saver_enable_title">Boles ativare s\'Aorru de datos?</string>
     <string name="data_saver_enable_button">Ativa</string>
+    <string name="zen_mode_duration_minutes_summary_short">{count, plural,
+        one {}=1    {Pro 1 minutu (finas a: {formattedTime})}
+        other {Pro # minutos (finas a: {formattedTime})}
+    }
+    </string>
+    <string name="zen_mode_duration_hours_summary">{count, plural,
+        one {}=1    {Pro 1 ora (finas a: {formattedTime})}
+        other {Pro # oras (finas a: {formattedTime})}
+    }
+    </string>
+    <string name="zen_mode_duration_hours_summary_short">{count, plural,
+        one {}=1    {Pro 1 h (finas a: {formattedTime})}
+        other {Pro # h (finas a: {formattedTime})}
+    }
+    </string>
+    <string name="zen_mode_duration_minutes">{count, plural,
+        one {}=1    {Pro unu minutu}
+        other {Pro # minutos}
+    }
+    </string>
+    <string name="zen_mode_duration_minutes_short">{count, plural,
+        one {}=1    {Pro 1 min}
+        other {Pro # min}
+    }
+    </string>
+    <string name="zen_mode_duration_hours">{count, plural,
+        one {}=1    {Pro 1 ora}
+        other {Pro # oras}
+    }
+    </string>
+    <string name="zen_mode_duration_hours_short">{count, plural,
+        one {}=1    {Pro 1 h}
+        other {Pro # h}
+    }
+    </string>
     <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">Finas a cando no dd\'as a disativare</string>
@@ -1901,10 +1938,20 @@
     <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>
+    <string name="supervised_user_creation_label">Agiunghe utente suta supervisione</string>
     <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>.
     </string>
+    <string name="app_streaming_blocked_title"><xliff:g id="activity" example="Permission dialog">%1$s</xliff:g> no a disponimentu</string>
+    <string name="app_streaming_blocked_title_for_permission_dialog">Permissu netzessàriu</string>
+    <string name="app_streaming_blocked_title_for_camera_dialog">Sa càmera no est a disponimentu</string>
+    <string name="app_streaming_blocked_title_for_fingerprint_dialog">Sighi a su telèfonu</string>
+    <string name="app_streaming_blocked_title_for_microphone_dialog">Su micròfonu no est a disponimentu</string>
+    <string name="app_streaming_blocked_title_for_playstore_dialog">Sa Play Store no est a disponimentu</string>
+    <string name="app_streaming_blocked_title_for_settings_dialog" product="tv">Sa cunfiguratzione de Android TV no est a disponimentu</string>
+    <string name="app_streaming_blocked_title_for_settings_dialog" product="tablet">Sa cunfiguratzione de sa tauledda no est a disponimentu</string>
+    <string name="app_streaming_blocked_title_for_settings_dialog" product="default">Sa cunfiguratzione de su telèfonu no est a disponimentu</string>
     <string name="app_category_productivity">Produtividade</string>
     <string name="app_category_accessibility">Atzessibilidade</string>
     <string name="device_storage_monitor_notification_channel">Memòria de su dispositivu</string>
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 177c432..68dd71b 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
@@ -518,6 +518,13 @@
     <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>
+    <string name="wifi_tether_connected_summary">        {count, plural,
+=0    {0 dyfeisiau wedi\'u cysylltu}
+            =1    {1 dyfais wedi\'i chysylltu}
+            two {# ddyfais wedi\'u cysylltu}
+other {# dyfais wedi\'u cysylltu}
+        }
+    </string>
     <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>
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 438506e..1fb2237 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
@@ -51,6 +51,11 @@
     <string name="kg_wrong_pattern">Patrwm anghywir</string>
     <string name="kg_wrong_password">Cyfrinair anghywir</string>
     <string name="kg_wrong_pin">PIN Anghywir</string>
+    <string name="kg_too_many_failed_attempts_countdown">{count, plural,
+=1 {Rho gynnig arall ymhen # eiliad.}
+        other {Rho gynnig arall ymhen # eiliad.}
+    }
+    </string>
     <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>
@@ -71,7 +76,21 @@
         \n\nRho gynnig arall arni ymhen <xliff:g id="number">%2$d</xliff:g> eiliad.
     </string>
     <string name="kg_password_wrong_pin_code_pukked">Rhoddwyd PIN SIM anghywir a rhaid nawr cysylltu â dy ddarparwr gwasanaeth er mwyn datgloi dy ddyfais.</string>
+    <string name="kg_password_wrong_pin_code">{count, plural,
+       =1 {Cod PIN anghywir. Mae gennyt # cynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        two {Cod PIN anghywir. Mae gennyt # gynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        few {Cod PIN anghywir. Mae gennyt # chynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        many {Cod PIN anghywir. Mae gennyt # chynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        other {Cod PIN anghywir. Mae gennyt # cynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+    }</string>
     <string name="kg_password_wrong_puk_code_dead">Nid yw\'n bosib defnyddio\'r SIM. Cysyllta â dy ddarparwr gwasanaeth.</string>
+    <string name="kg_password_wrong_puk_code">{count, plural,
+       =1 {Cod PUK SIM anghywir. Mae gennyt # cynnig arall cyn y bydd dim bosib defnyddio\u2019r SIM byth eto.}
+        two {Cod PUK SIM anghywir. Mae gennyt # gynnig arall cyn y bydd dim bosib defnyddio\u2019r SIM byth eto.}
+        few {Cod PUK SIM anghywir. Mae gennyt # chynnig arall cyn y bydd dim bosib defnyddio\u2019r SIM byth eto.}
+        many {Cod PUK SIM anghywir. Mae gennyt # chynnig arall cyn y bydd dim bosib defnyddio\u2019r SIM byth eto.}
+        other {Cod PUK SIM anghywir. Mae gennyt # cynnig arall cyn y bydd dim bosib defnyddio\u2019r SIM byth eto.}
+    }</string>
     <string name="kg_password_pin_failed">Methodd gweithred PIN y SIM!</string>
     <string name="kg_password_puk_failed">Methodd gweithred PUK y SIM!</string>
     <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Newid dull mewnbwn</string>
@@ -86,6 +105,20 @@
     <string name="kg_prompt_reason_user_request">Cafodd y ddyfais ei chloi gan rywun.</string>
     <string name="kg_face_not_recognized">Dim yn ei adnabod</string>
     <string name="kg_face_sensor_privacy_enabled">I ddefnyddio Datgloi ag Wyneb, tro fynediad at y camera ymlaen yn Gosodiadau</string>
+    <string name="kg_password_default_pin_message">{count, plural,
+       =1 {Rho PIN y SIM. Mae gennyt # cynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        two {Rho PIN y SIM. Mae gennyt # gynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        few {Rho PIN y SIM. Mae gennyt # chynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        many {Rho PIN y SIM. Mae gennyt # chynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+        other {Rho PIN y SIM. Mae gennyt # cynnig arall cyn y bydd rhaid cysylltu â dy ddarparwr i ddatgloi dy ddyfais.}
+    }</string>
+    <string name="kg_password_default_puk_message">{count, plural,
+       =1 {Mae\u2019r SIM nawr wedi\u2019i analluogi. Rho god PUK i barhau. Mae gennyt # cynnig arall cyn y bydd dim posib defnyddio\u2019r SIM byth eto. Cysyllta â dy ddarparwr am fanylion.}
+        two {Mae\u2019r SIM nawr wedi\u2019i analluogi. Rho god PUK i barhau. Mae gennyt # gynnig arall cyn y bydd dim posib defnyddio\u2019r SIM byth eto. Cysyllta â dy ddarparwr am fanylion.}
+        few {Mae\u2019r SIM nawr wedi\u2019i analluogi. Rho god PUK i barhau. Mae gennyt # chynnig arall cyn y bydd dim posib defnyddio\u2019r SIM byth eto. Cysyllta â dy ddarparwr am fanylion.}
+        many {Mae\u2019r SIM nawr wedi\u2019i analluogi. Rho god PUK i barhau. Mae gennyt # chynnig arall cyn y bydd dim posib defnyddio\u2019r SIM byth eto. Cysyllta â dy ddarparwr am fanylion.}
+        other {Mae\u2019r SIM nawr wedi\u2019i analluogi. Rho god PUK i barhau. Mae gennyt # cynnig arall cyn y bydd dim posib defnyddio\u2019r SIM byth eto. Cysyllta â dy ddarparwr am fanylion.}
+    }</string>
     <string name="clock_title_default">Rhagosodiad</string>
     <string name="clock_title_bubble">Swigod</string>
     <string name="clock_title_analog">Analog</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
index f3743c0..059bbec 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
@@ -266,6 +266,12 @@
     <string name="quick_settings_hotspot_label">Llecyn Wi-Fi</string>
     <string name="quick_settings_hotspot_secondary_label_transient">Yn troi ymlaen…</string>
     <string name="quick_settings_hotspot_secondary_label_data_saver_enabled">Arbedwr Data ar waith</string>
+    <string name="quick_settings_hotspot_secondary_label_num_devices">{count, plural,
+        zero {# dyfeisiau}
+        =1 {#dyfais}
+        two {# ddyfais}
+        other {# dyfais}
+    }</string>
     <string name="quick_settings_flashlight_label">Fflacholau</string>
     <string name="quick_settings_flashlight_camera_in_use">Camera yn cael ei ddefnyddio</string>
     <string name="quick_settings_cellular_detail_title">Data symudol</string>
@@ -375,6 +381,11 @@
     <string name="guest_notification_session_active">Rwyt yn y modd gwestai</string>
     <string name="user_add_user_message_guest_remove">\n\nBydd ychwanegu defnyddiwr newydd yn gadael modd gwestai a dileu holl apiau a data\u2019r sesiwn gwestai cyfredol.</string>
     <string name="user_limit_reached_title">Terfyn defnyddwyr wedi\'i gyrraedd</string>
+    <string name="user_limit_reached_message">{count, plural,
+       =1 {Gellir ond creu un defnyddiwr.}
+        two {Gellir ond creu # ddefnyddiwr.}
+        other {Gellir ond creu # defnyddiwr.}
+    }</string>
     <string name="user_remove_user_title">Tynnu defnyddiwr?</string>
     <string name="user_remove_user_message">Caiff holl apiau a data\'r defnyddiwr hwn eu dileu.</string>
     <string name="user_remove_user_remove">Tynnu</string>
@@ -606,8 +617,11 @@
         other {# awr}
     }</string>
     <string name="snoozeMinuteOptions">{count, plural,
-        =1 {# funud}
+        =1 {# munud}
+        zero {# munudau}
         two {# funud}
+        few {# munud}
+        many {# munud}
         other {# munud}
     }</string>
     <string name="battery_detail_switch_title">Arbedwr Batri</string>
@@ -841,6 +855,11 @@
     <string name="accessibility_floating_button_action_double_tap_to_toggle">toglo</string>
     <string name="quick_controls_title">Rheolyddion dyfeisiau</string>
     <string name="controls_providers_title">Dewis ap i ychwanegu rheolyddion</string>
+    <string name="controls_number_of_favorites">{count, plural,
+        =1 {Ychwanegwyd # rheolydd.}
+two {Ychwanegwyd # reolydd.}
+        other {Ychwanegwyd # rheolydd.}
+    }</string>
     <string name="controls_removed">Tynnwyd</string>
     <string name="controls_panel_authorization_title">Ychwanegu <xliff:g id="appName" example="My app">%s</xliff:g>?</string>
     <string name="controls_panel_authorization">Gall <xliff:g id="appName" example="My app">%s</xliff:g> ddewis pa reolyddion a chynnwys sydd i\u2019w gweld yma.</string>
@@ -937,6 +956,7 @@
     <string name="media_output_first_broadcast_title">Sut mae darlledu\u2019n gweithio</string>
     <string name="media_output_broadcast">Darlledu</string>
     <string name="media_output_first_notify_broadcast_message">Gall pobl gerllaw gyda dyfeisiau Bluetooth wrando ar y cyfrwng rwyt yn ei ddarlledu</string>
+    <string name="media_output_broadcasting_message">I wrando ar dy ddarllediad, gall pobl gerllaw gyda dyfeisiau Bluetooth cydnaws sganio dy god QR neu ddefnyddio dy enw a chyfrinair darlledu</string>
     <string name="media_output_broadcast_name">Enw Darllediad</string>
     <string name="media_output_broadcast_code">Cyfrinair</string>
     <string name="media_output_broadcast_dialog_save">Cadw</string>
@@ -1050,6 +1070,10 @@
     <string name="dream_overlay_status_bar_camera_off">Mae\u2019r camera i ffwrdd</string>
     <string name="dream_overlay_status_bar_mic_off">Mae\u2019r meic i ffwrdd</string>
     <string name="dream_overlay_status_bar_camera_mic_off">Mae\u2019r camera a\u2019r meic i ffwrdd</string>
+    <string name="dream_overlay_status_bar_notification_indicator">{count, plural,
+=1 {# hysbysiad}
+    other {# hysbysiad}
+    }</string>
     <string name="dream_overlay_weather_complication_desc">        <xliff:g id="weather_condition" example="Partly cloudy">%1$s</xliff:g>, <xliff:g id="temperature" example="7°C">%2$s</xliff:g>
     </string>
     <string name="note_task_button_label">Nodiadau</string>
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 472a8e5..47393e1 100644
--- a/overlay/packages/apps/Car/Launcher/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/Launcher/res/values-cy/strings.xml
@@ -21,6 +21,12 @@
     <string name="driving_toast_text">        Ni ellir ddefnyddio <xliff:g id="app_name" example="Settings">%1$s</xliff:g> tra\'n gyrru.</string>
     <string name="ongoing_call_text">Galwad ar y gweill</string>
     <string name="dialing_call_text">Yn deialu…</string>
+    <string name="projection_devices">{count, plural,
+        zero {# dyfeisiau}
+       =1 {# ddyfais}
+        two {# ddyfais}
+        other {# dyfais}
+    }</string>
     <string name="weather_app_name">Tywydd</string>
     <string name="hide_debug_apps">Cuddio apiau dadfygio</string>
     <string name="show_debug_apps">Dangos apiau dadfygio</string>
diff --git a/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml b/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
index 4891c39..58c1bf3 100644
--- a/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
@@ -393,6 +393,15 @@
     <string name="apps_view_all_apps_title">Gweld pob ap %1$d</string>
     <string name="apps_permission_manager_title">Rheolydd caniatâd</string>
     <string name="apps_permission_manager_summary">Rheoli mynediad yr ap at dy ddata</string>
+    <string name="performance_impacting_apps_summary">        {count, plural,
+            zero {}
+            one {# ap yn amharu perfformiad}
+            two {# ap yn amharu perfformiad}
+            few {# ap yn amharu perfformiad}
+            many {# ap yn amharu perfformiad}=1    {# ap yn amharu perfformiad}
+            other {# ap yn amharu perfformiad}
+        }
+    </string>
     <string name="special_access">Mynediad arbennig yr ap</string>
     <string name="show_system">Dangos apiau system</string>
     <string name="hide_system">Cuddio apiau system</string>
diff --git a/overlay/packages/apps/Car/SystemUI/res/values-cy/strings.xml b/overlay/packages/apps/Car/SystemUI/res/values-cy/strings.xml
index 1f8254d..265a2ea 100644
--- a/overlay/packages/apps/Car/SystemUI/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/SystemUI/res/values-cy/strings.xml
@@ -19,6 +19,13 @@
     <string name="hvac_max_text">Mwy.</string>
     <string name="fan_speed_off">I FFWRDD</string>
     <string name="hvac_temperature_off">I FFWRDD</string>
+    <string name="profile_limit_reached_message">{count, plural,
+       =1 {Gellir ond creu un proffil.}
+        two {Gellir ond creu # broffil.}
+        few {Gellir ond creu # phroffil.}
+        many {Gellir ond creu # phroffil.}
+        other {Gellir ond creu # proffil.}
+    }</string>
     <string name="mic_privacy_chip_dialog_ok">Iawn</string>
     <string name="camera_privacy_chip_camera_settings">Gosodiadau camera</string>
     <string name="camera_privacy_chip_dialog_ok">Iawn</string>
diff --git a/overlay/packages/apps/Contacts/res/values-cy/strings.xml b/overlay/packages/apps/Contacts/res/values-cy/strings.xml
index bb61846..4d99e80 100644
--- a/overlay/packages/apps/Contacts/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Contacts/res/values-cy/strings.xml
@@ -63,6 +63,26 @@
     <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>
+    <string name="contacts_deleted_toast">{count, plural,
+       =1 {Cyswllt wedi\u2019i ddileu}
+        other {Cysylltiadau wedi eu dileu}
+    }</string>
+    <string name="contacts_count">{count, plural,
+      zero {# cysylltiadau}
+       =1 {# cyswllt}
+        two {# gyswllt}
+        few {# chyswllt}
+        many {# chyswllt}
+        other {# cyswllt}
+    }</string>
+    <string name="contacts_count_with_account">{count, plural,
+        zero {# cysylltiadau · {account}}
+       =1 {# cyswllt · {account}}
+        two {# gyswllt · {account}}
+        few {# chyswllt · {account}}
+        many {# chyswllt · {account}}
+        other {# cyswllt · {account}}
+    }</string>
     <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>
@@ -122,6 +142,10 @@
     <string name="menu_share">Rhannu</string>
     <string name="menu_add_contact">Ychwanegu at gysylltiadau</string>
     <string name="menu_add_contacts">Ychwanegu</string>
+    <string name="title_share_via">{count, plural,
+       =1 {Rhannu cyswllt trwy}
+        other {Rhannu cysylltiadau trwy}
+    }</string>
     <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>
@@ -379,6 +403,22 @@
     <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>
+    <string name="import_from_sim_secondary_contact_count_fmt"> {count, plural,
+        zero {}
+        one {# cyswllt}
+        two {# gyswllt}
+        few {# chyswllt}
+        many {# chyswllt}=1    {# contact}
+        other {# cyswllt}
+    }</string>
+    <string name="import_from_sim_secondary_template">{count, plural,
+        zero {# cysylltiadau · <xliff:g id="phone_number">^1</xliff:g>}
+       =1 {# cyswllt · <xliff:g id="phone_number">^1</xliff:g>}
+        two {# gyswllt · <xliff:g id="phone_number">^1</xliff:g>}
+        few {# chyswllt · <xliff:g id="phone_number">^1</xliff:g>}
+        many {# chyswllt · <xliff:g id="phone_number">^1</xliff:g>}
+        other {# cyswllt · <xliff:g id="phone_number">^1</xliff:g>}
+    }</string>
     <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>
@@ -483,6 +523,15 @@
     <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>
+    <string name="sim_import_success_toast_fmt"> {count, plural,
+        zero {# cysylltiadau wedi\2019u mewnforio}
+        =1    {# cyswllt wedi\2019i fewnforio}
+        two {# gyswllt wedi\2019u mewnforio}
+        few {# chyswllt wedi\2019u mewnforio}
+        many {# chyswllt wedi\2019u mewnforio}
+        other {# cyswllt wedi\2019u mewnforio}
+        }
+    </string>
     <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/Settings/res/values-cy/strings.xml b/overlay/packages/apps/Settings/res/values-cy/strings.xml
index 18cd47e..1e34532 100644
--- a/overlay/packages/apps/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-cy/strings.xml
@@ -101,6 +101,8 @@
     <string name="bluetooth_pair_right_ear_button">Paru\'r glust dde</string>
     <string name="bluetooth_pair_left_ear_button">Paru\'r glust chwith</string>
     <string name="bluetooth_pair_other_ear_dialog_title">Paru\'r glust arall</string>
+    <string name="bluetooth_pair_other_ear_dialog_left_ear_message">Mae dy gymorth clyw chwith wedi\u2019i gysylltu.\n\nI baru\u2019r un dde, sicrha ei fod wedi\u2019i droi ymlaen ac yn barod i\u2019w baru.</string>
+    <string name="bluetooth_pair_other_ear_dialog_right_ear_message">Mae dy gymorth clyw dde wedi\u2019i gysylltu.\n\nI baru\u2019r un chwith, sicrha ei fod wedi\u2019i droi ymlaen ac yn barod i\u2019w baru.</string>
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button">Paru\'r glust dde</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button">Paru\'r glust chwith</string>
     <string name="bluetooth_screen_related">Yn gysylltiedig</string>
@@ -168,6 +170,7 @@
     <string name="bluetooth_disable_hw_offload_dialog_confirm">Ailgychwyn</string>
     <string name="bluetooth_disable_hw_offload_dialog_cancel">Diddymu</string>
     <string name="bluetooth_enable_leaudio">Galluogi sain LE Bluetooth</string>
+    <string name="bluetooth_enable_leaudio_summary">Mae\u2019n galluogi nodwedd sain Bluetooth LE os yw\u2019r ddyfais yn cefnogi caledwedd sain LE.</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>
@@ -237,6 +240,9 @@
     <string name="all_supported_app_locales_title">Pob iaith</string>
     <string name="preference_of_system_locale_title">Iaith y system</string>
     <string name="preference_of_system_locale_summary">Rhagosodiad y system</string>
+    <string name="desc_no_available_supported_locale">Dyw dewis iaith yr ap hwn ddim ar gael yn Gosodiadau.</string>
+    <string name="desc_app_locale_disclaimer">Gall fod yr iaith yn wahanol i\u2019r ieithoedd ar gael yn yr ap. Dyw rhai apiau ddim yn cefnogi\u2019r gosodiad hwn.</string>
+    <string name="desc_app_locale_selection_supported">Dim ond apiau sy\u2019n cefnogi dewis iaith sydd i\u2019w gweld yma.</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>
@@ -386,6 +392,8 @@
     <string name="security_settings_face_enroll_consent_introduction_title">Caniatáu Datgloi ag Wyneb</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled">Defnyddio dy wyneb i ddilysu</string>
     <string name="security_settings_face_enroll_introduction_message" product="default">Defnyddia dy wyneb i ddatgloi dy ffôn, caniatáu taliadau, neu mewngofnodi i apiau.</string>
+    <string name="security_settings_face_enroll_introduction_message" product="tablet">Defnyddia dy wyneb i ddatgloi dy lechen, caniatáu taliadau, neu mewngofnodi i apiau.</string>
+    <string name="security_settings_face_enroll_introduction_message" product="device">Defnyddia dy wyneb i ddatgloi dy ddyfais, caniatáu taliadau, neu mewngofnodi i apiau.</string>
     <string name="security_settings_face_enroll_introduction_consent_message_0" product="default">Caniatáu i dy blentyn defnyddio ei wyneb i ddatgloi ei ffôn</string>
     <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet">Caniatáu i dy blentyn defnyddio ei wyneb i ddatgloi ei lechen</string>
     <string name="security_settings_face_enroll_introduction_consent_message_0" product="device">Caniatáu i dy blentyn defnyddio ei wyneb i ddatgloi ei ddyfais</string>
@@ -720,6 +728,12 @@
         <item quantity="many">Rhaid bod o leiaf <xliff:g id="count" example="3">%d</xliff:g> nod</item>
         <item quantity="other">Rhaid bod o leiaf <xliff:g id="count" example="3">%d</xliff:g> nod</item>
     </plurals>
+    <string name="lockpassword_password_too_short_all_numeric"> {count, plural,
+        =1 {Os yn defnyddio rhifau yn unig, rhaid bod o leiaf 1 digid.}
+        two {Os yn defnyddio rhifau yn unig, rhaid bod o leiaf # ddigid.}
+        other {Os yn defnyddio rhifau yn unig, rhaid bod o leiaf # digid.}
+        }
+    </string>
     <plurals name="lockpassword_pin_too_short">
         <item quantity="zero">Rhiad bod gan y PIN o leiaf <xliff:g id="count" example="3">%d</xliff:g> digidau</item>
         <item quantity="one">Rhiad bod gan y PIN o leiaf <xliff:g id="count" example="1">%d</xliff:g> digid</item>
diff --git a/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml b/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
index cf7e928..a3fd70f 100644
--- a/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
@@ -87,6 +87,11 @@
     <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>
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 1ed4e0a..78218f7 100644
--- a/overlay/packages/apps/TvSettings/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/TvSettings/Settings/res/values-cy/strings.xml
@@ -43,6 +43,15 @@
     <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>
+    <string name="accounts_category_summary"> {count, plural,
+        zero {# cyfrifon}
+        =1 {# cyfrif}
+        two {# gyfrif}
+        few {# chyfrif}
+        many {# chyfrif}
+        other {# cyfrif}
+        }
+    </string>
     <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>
@@ -229,10 +238,21 @@
     <string name="enterprise_privacy_none">Dim</string>
     <string name="enterprise_privacy_enterprise_installed_packages">Apiau wedi\'u gosod</string>
     <string name="enterprise_privacy_apps_count_estimation_info">Amcangyfrif yw\'r nifer o apiau. Mae\'n bosib nad yw\'n cynnwys apiau wedi\'u gosod tu allan i Play Store.</string>
+    <string name="enterprise_privacy_number_packages_lower_bound"> {count, plural,
+        =1 {O leiaf # ap}
+        other {O leiaf # ap}
+        }
+    </string>
     <string name="enterprise_privacy_location_access">Caniatâd lleoliad</string>
     <string name="enterprise_privacy_microphone_access">Caniatâd meicroffon</string>
     <string name="enterprise_privacy_camera_access">Caniatâd camera</string>
     <string name="enterprise_privacy_enterprise_set_default_apps">Apiau rhagosodedig</string>
+    <string name="enterprise_privacy_number_packages"> {count, plural,
+        zero {# apiau}
+        =1    {# ap}
+        other {# ap}
+        }
+    </string>
     <string name="enterprise_privacy_input_method">Bysellfwrdd rhagosodedig</string>
     <string name="enterprise_privacy_input_method_name">Gosod i <xliff:g id="app_label" example="Example Keyboard">%s</xliff:g></string>
     <string name="enterprise_privacy_always_on_vpn_device">VPN ymlaen-o-hyd wedi\'i droi ymlaen</string>
@@ -240,11 +260,44 @@
     <string name="enterprise_privacy_always_on_vpn_work">VPN ymlaen-o-hyd wedi\'i droi ymlaen yn dy broffil gwaith</string>
     <string name="enterprise_privacy_global_http_proxy">Gosodwyd procsi HTTP byd-eang</string>
     <string name="enterprise_privacy_ca_certs_work">Tystnodiadau a ymddiriedir ynddynt yn dy broffil gwaith</string>
+    <string name="enterprise_privacy_number_ca_certs"> {count, plural,
+        zero {# tystysgrifau CA}
+        =1    {# tystysgrif CA}
+        two {# dystysgrif CA}
+        few {# thystysgrif CA}
+        many {# thystysgrif CA}
+        other {# tystysgrif CA}
+        }
+    </string>
     <string name="enterprise_privacy_lock_device">Gall gweinyddwr cloi\'r ddyfais ac ail-osod y cyfrinair</string>
     <string name="enterprise_privacy_wipe_device">Gall gweinyddwr dileu holl ddata\'r ddyfais</string>
     <string name="enterprise_privacy_failed_password_wipe_device">Nifer o ymdrechion cyfrinair aflwyddiannus cyn dileu holl ddata\'r ddyfais</string>
     <string name="enterprise_privacy_failed_password_wipe_work">Nifer o ymdrechion cyfrinair aflwyddiannus cyn dileu holl ddata\'r proffil gwaith</string>
+    <string name="enterprise_privacy_number_failed_password_wipe"> {count, plural,
+        zero {# cynigion}
+        =1    {# cynnig}
+        two {# gynnig}
+        few {# chynnig}
+        many {# chynnig}
+        other {# cynnig}
+        }
+    </string>
     <string name="learn_more">Dysgu mwy</string>
+    <string name="default_camera_app_title"> {count, plural,
+        =1 {Ap camera}
+        other {Apiau camera}
+        }
+    </string>
+    <string name="default_email_app_title"> {count, plural,
+        =1{Ap cleient ebost}
+        other {Apiau cleient ebost}
+        }
+    </string>
+    <string name="default_phone_app_title"> {count, plural,
+        =1 {Ap ffôn}
+        other {Apiau ffôn}
+        }
+    </string>
     <string name="tutorials">Tiwtoriolau</string>
     <string name="about_system_update">Diweddariad system</string>
     <string name="about_preference">Ynghylch</string>
@@ -256,6 +309,14 @@
     <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>
+    <string name="show_dev_countdown"> {count, plural,
+        =1 {Rwyt nawr # cam i ffwrdd o fod yn ddatblygwr}
+        two {Rwyt nawr # gam i ffwrdd o fod yn ddatblygwr}
+        few {Rwyt nawr # cham i ffwrdd o fod yn ddatblygwr}
+        many {Rwyt nawr # cham i ffwrdd o fod yn ddatblygwr}
+        other {Rwyt nawr # cam i ffwrdd o fod yn ddatblygwr}
+        }
+    </string>
     <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>
@@ -265,6 +326,11 @@
     <string name="selinux_status_permissive">Caniataol</string>
     <string name="selinux_status_enforcing">Yn gorfodi</string>
     <string name="additional_system_update_settings_list_item_title">Diweddariadau system ychwanegol</string>
+    <string name="sl_ca_cert_dialog_title"> {count, plural,
+        =1 {Ymddiried yn neu dynnu tystysgrif}
+        other {Ymddiried yn neu dynnu tystysgrifau}
+        }
+    </string>
     <string name="device_status">Statws</string>
     <string name="device_status_summary">Rhwydwaith, rhifau cyfresol a gwybodaeth arall</string>
     <string name="manual">Â llaw</string>
@@ -700,6 +766,20 @@
     <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_header_connected_input"> {count, plural,
+        =1 {Mewnbwn wedi\2019i Gysylltu}
+        other {Mewnbynnau wedi\2019u Cysylltu}
+        }
+    </string>
+    <string name="inputs_header_disconnected_input"> {count, plural,
+        zero {Mewnbynnau Heb eu Cysylltu}
+        =1 {Mewnbwn Heb ei Gysylltu}
+        two  {Mewnbynnau Heb eu Cysylltu}
+        few {Mewnbynnau Heb eu Cysylltu}
+        many {Mewnbynnau Heb eu Cysylltu}
+        other {Mewnbynnau Heb eu Cysylltu}
+        }
+    </string>
     <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>
diff --git a/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings.xml b/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings.xml
index 92a9015..b6aa246 100644
--- a/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings.xml
+++ b/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings.xml
@@ -105,6 +105,16 @@
     <string name="transfer_clear_dlg_msg">Caiff pob eitem ei dileu o\'r rhestr.</string>
     <string name="outbound_noti_title">Rhannu Bluetooth: Ffeiliau a anfonwyd</string>
     <string name="inbound_noti_title">Rhannu Bluetooth: Ffeiliau wedi\'u derbyn</string>
+    <string name="noti_caption_unsuccessful"> {count, plural,
+        =1    {# yn aflwyddiannus, %1$s}
+        other {# yn aflwyddiannus, %1$s}
+        }
+    </string>
+    <string name="noti_caption_success"> {count, plural,
+        =1    {# yn llwyddiannus, %1$s}
+        other {# yn llwyddiannus, %1$s}
+        }
+    </string>
     <string name="transfer_menu_clear_all">Clirio\'r rhestr</string>
     <string name="transfer_menu_open">Agor</string>
     <string name="transfer_menu_clear">Clirio o\'r rhestr</string>
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 22be05c..fa50fc6 100644
--- a/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml
+++ b/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml
@@ -60,6 +60,13 @@
     <string name="auto_permission_manager_summary">Rheoli mynediad data at galendr, logiau galwadau, a mwy</string>
     <string name="granted_permission_decision">Rhoddaist i <xliff:g id="app_name" example="Google Maps">%1$s</xliff:g> mynediad at <xliff:g id="permission_name" example="contacts">%2$s</xliff:g></string>
     <string name="denied_permission_decision">Ni roddaist i <xliff:g id="app_name" example="Google Maps">%1$s</xliff:g> mynediad at <xliff:g id="permission_name" example="contacts">%2$s</xliff:g></string>
+    <string name="days_ago">{count, plural,
+        =0    {Heddiw}
+        =1    {Ddoe}
+        two {Echddoe}
+        few {Tridiau yn ôl}
+        other {# diwrnod yn ôl}
+        }</string>
     <string name="app_disable_dlg_positive">Analluogi\'r ap</string>
     <string name="app_disable_dlg_text">Os wyt yn analluogi\'r ap hwn, ni fydd Android ac apiau eraill yn parhau i weithio fel y disgwyl. Bydd yn ymwybodol, ni ellir dileu\u2019r ap hwn am ei fod wedi\u2019i osod ar dy ddyfais yn y ffatri. Wrth ei analluogi, bydd yr ap yn cael ei droi i ffwrdd a\u2019i guddio ar dy ddyfais.</string>
     <string name="app_permission_manager">Rheolydd caniatâd</string>
@@ -67,6 +74,10 @@
     <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>
+    <string name="additional_permissions_more">{count, plural,
+=1      {# arall}
+        other   {# arall}
+    }</string>
     <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="storage_supergroup_warning_allow">Dyluniwyd yr ap hwn ar gyfer hen fersiwn Android. Os wyt yn rhoi\u2019r caniatâd hwn, caiff mynediad ei ganiatáu at yr holl ystorfa (gan gynnwys lluniau, fideos, cerddoriaeth, sain, a ffeiliau eraill).</string>
     <string name="storage_supergroup_warning_deny">Dyluniwyd yr ap hwn ar gyfer hen fersiwn Android. Os nad wyt yn rhoi\u2019r caniatâd hwn, ni chaiff mynediad ei ganiatáu at yr holl ystorfa (gan gynnwys lluniau, fideos, cerddoriaeth, sain, a ffeiliau eraill).</string>
@@ -134,6 +145,34 @@
     <string name="auto_permission_usage_timeline_summary"><xliff:g id="access_time" example="12:23am">%1$s</xliff:g> \u2022 <xliff:g id="summary_text" example="2 mins">%2$s</xliff:g></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="history_preference_subtext_3"><xliff:g id="attribution_name" example="Nearby Share">%1$s</xliff:g> \u2022 <xliff:g id="app_name" example="Gmail">%2$s</xliff:g> \u2022 <xliff:g id="truncated_time" example="1 hr 20min">%3$s</xliff:g></string>
+    <string name="duration_used_days">{count, plural,
+        =1 {# diwrnod}
+        zero {# diwrnodau}
+        two {# ddiwrnod}
+        few {# diwrnod}
+        many {# diwrnod}
+        other {# diwrnod}
+    }
+    </string>
+    <string name="duration_used_hours">{count, plural,
+        =1 {1 awr}
+        zero {# oriau}
+        two {# awr}
+        few {# awr}
+        many {# awr}
+        other {# awr}
+    }</string>
+    <string name="duration_used_minutes">{count, plural,
+        =1 {1 mun}
+        two {# fun}
+        other {# mun}
+    }
+    </string>
+    <string name="duration_used_seconds">{count, plural,
+        =1 {1 eil}
+        other {# eil}
+    }
+    </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>
@@ -156,6 +195,11 @@
     <string name="permission_usage_bar_chart_title_last_minute">Defnydd caniatâd yn yr awr ddiwethaf</string>
     <string name="permission_usage_preference_summary_not_used_24h">Heb eu defnyddio yn y 24 awr ddiwethaf</string>
     <string name="permission_usage_preference_summary_not_used_7d">Heb eu defnyddio yn y 7 diwrnod diwethaf</string>
+    <string name="permission_usage_preference_label">{count, plural,
+        =1 {Defnyddiwyd gan 1 ap}
+        other {Defnyddiwyd gan # ap}
+    }
+    </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>
@@ -194,6 +238,7 @@
     <string name="unused_apps_category_title">Gosodiadau ap heb eu defnyddio</string>
     <string name="auto_revoke_label">Tynnu caniatâd yn ôl os nad yw\u2019r ap yn cael ei ddefnyddio</string>
     <string name="unused_apps_label">Tynnu caniatâd yn ôl a rhyddhau lle</string>
+    <string name="unused_apps_label_v2">Seibio gweithgaredd yr ap os heb ei ddefnyddio</string>
     <string name="unused_apps_summary">Tynnu caniatâd, dileu ffeiliau dros dro, a stopio hysbysiadau</string>
     <string name="auto_revoke_summary">I warchod dy ddata, caiff caniatâd yr ap hwn ei dynnu yn ôl os na chaiff yr ap ei ddefnyddio am rai misoedd.</string>
     <string name="auto_revoke_summary_with_permissions">I warchod dy ddata, os na chaiff yr ap ei ddefnyddio am rai misoedd, caiff y caniatâd hyn eu tynnu yn ôl: <xliff:g id="perms" example="location, contacts, and phone">%1$s</xliff:g></string>
@@ -244,17 +289,59 @@
     <string name="ask_header">Gofyn bob tro</string>
     <string name="denied_header">Ni chaniateir</string>
     <string name="storage_footer_hyperlink_text">Gweld rhagor o apiau gall cael mynediad at ffeiliau</string>
+    <string name="days">{count, plural,
+        =1 {# diwrnod}
+        zero {# diwrnodau}
+        two {# ddiwrnod}
+        few {# diwrnod}
+        many {# diwrnod}
+        other {# diwrnod}
+    }
+    
+    </string>
+    <string name="hours">{count, plural,
+        =1 {1 awr}
+        zero {# oriau}
+        two {# awr}
+        few {# awr}
+        many {# awr}
+        other {# awr}
+    }</string>
+    <string name="minutes">{count, plural,
+        =1 {1 munud}
+        zero {# munudau}
+        two {# funud}
+        few {# munud}
+        many {# munud}
+        other {# munud}
+    }</string>
+    <string name="seconds">{count, plural,
+        =1 {1 eiliad}
+        other {# eiliad}
+    }
+    </string>
     <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>
+    <string name="unused_apps_notification_title">{count, plural,
+        zero {# apiau heb eu defnyddio}
+=1      {# ap heb ei ddefnyddio}
+        other   {# ap heb eu defnyddio}
+    }</string>
     <string name="unused_apps_notification_content">Tynnwyd caniatâd a ffeiliau dros dro a chafodd hysbysiadau eu stopio. Tapia i adolygu.</string>
     <string name="post_drive_permission_decision_reminder_title">Gwirio caniatâd diweddar</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission">Wrth yrru, rhoddaist i <xliff:g id="app" example="Waze">%1$s</xliff:g> mynediad at <xliff:g id="permission" example="location">%2$s</xliff:g></string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_2_permissions">Wrth yrru, rhoddaist i <xliff:g id="app" example="Waze">%1$s</xliff:g> mynediad at <xliff:g id="permission_1" example="location">%2$s</xliff:g> a <xliff:g id="permission_2" example="microphone">%3$s</xliff:g></string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_multi_permission">Wrth yrru, rhoddaist ganiatâd <xliff:g id="count" example="2">%1$d</xliff:g> i <xliff:g id="app" example="Waze">%2$s</xliff:g></string>
+    <string name="post_drive_permission_decision_reminder_summary_multi_apps"> {count, plural,
+        =1 {Wrth yrru, rhoddaist hawl mynediad i <xliff:g id="app" example="Waze">%1$s</xliff:g> ac # ap arall.}
+        two {Wrth yrru, rhoddaist hawl mynediad i <xliff:g id="app" example="Waze">%1$s</xliff:g> a # ap arall.}
+        other {Wrth yrru, rhoddaist hawl mynediad i <xliff:g id="app" example="Waze">%1$s</xliff:g> a/ac # ap arall.}
+        }
+    </string>
     <string name="go_to_settings">Mynd i Gosodiadau</string>
     <string name="auto_revoke_setting_subtitle">Dyw rhai apiau heb eu defnyddio ers rhai misoedd</string>
     <string name="permissions_removed_category_title">Caniatâd wedi\'u tynnu yn ôl</string>
@@ -264,7 +351,18 @@
     <string name="auto_revoke_preference_summary">Tynnwyd caniatâd yn ôl i warchod dy breifatrwydd</string>
     <string name="background_location_access_reminder_notification_title">Cafodd <xliff:g id="app_name" example="Gmail">%s</xliff:g> dy leoliad wrth redeg yn y cefndir</string>
     <string name="background_location_access_reminder_notification_content">Gall yr ap hwn gael gwybod dy leoliad o hyd. Tapia i newid hyn.</string>
+    <string name="notification_listener_reminder_notification_title_plural"> {count, plural,
+        =1 {Adolygu ap gyda mynediad at wrandawr hysbysiadau}
+        other {Adolygu apiau gyda mynediad at wrandawr hysbysiadau}
+        }
+    </string>
     <string name="notification_listener_reminder_notification_content">Gall <xliff:g id="app_name" example="Gmail">%s</xliff:g> ddarllen dy holl hysbysiadau.</string>
+    <string name="notification_listener_reminder_notification_content_plural"> {count, plural,
+        zero {Gall <xliff:g id="app_name" example="Gmail">%s</xliff:g> apiau ddarllen dy holl hysbysiadau.}
+        =1 {Gall # ap ddarllen dy holl hysbysiadau.}
+        other {Gall # ap ddarllen dy holl hysbysiadau.}
+        }
+    </string>
     <string name="auto_revoke_after_notification_title">Tynnwyd caniatâd yr ap yn ôl i warchod dy breifatrwydd</string>
     <string name="auto_revoke_after_notification_content_one">Dyw <xliff:g id="app_name" example="Gmail">%s</xliff:g> heb ei ddefnyddio ers rhai misoedd. Tapia i adolygu.</string>
     <string name="auto_revoke_after_notification_content_two">Dyw <xliff:g id="app_name" example="Gmail">%s</xliff:g> ac 1 ap arall heb eu defnyddio ers rhai misoedd. Tapia i adolygu.</string>
diff --git a/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml b/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
index 0c5a6a2..6b16c29 100644
--- a/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
+++ b/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
@@ -71,6 +71,85 @@
     <string name="picker_pause_video">Seibio fideo</string>
     <string name="picker_cloud_sync">Mae cyfryngau o\u2019r cwmwl bellach ar gael o <xliff:g id="pkg_name" example="Gmail">%1$s</xliff:g></string>
     <string name="not_selected">heb ei ddewis</string>
+    <string name="permission_progress_write_audio"> {count, plural,
+        =1 {Yn addasu ffeil sain…}
+        other {Yn addasu ffeiliau sain…}
+        }
+    </string>
+    <string name="permission_progress_write_video"> {count, plural,
+        =1 {Yn addasu fideo…}
+        other {Yn addasu fideos…}
+        }
+    </string>
+    <string name="permission_progress_write_image"> {count, plural,
+        =1 {Yn addasu llun…}
+        other {Yn addasu lluniau…}
+        }
+    </string>
+    <string name="permission_progress_write_generic"> {count, plural,
+        zero {}
+        =1 {Yn addasu eitem…}
+        two {Yn addasu 2 eitem…}
+        few {Yn addasu 3 eitem…}
+        many {Yn addasu 6 eitem…}
+        other {Yn addasu <xliff:g id="count" example="42">^1</xliff:g>eitem…}
+        }
+    </string>
+    <string name="permission_progress_trash_audio"> {count, plural,
+        =1 {Yn symud ffeil sain i\u2019r sbwriel…}
+        other {Yn symud ffeiliau sain i\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_progress_trash_video"> {count, plural,
+        =1 {Yn symud fideo i\u2019r sbwriel…}
+        other {Yn symud fideos i\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_progress_trash_image"> {count, plural,
+        =1 {Yn symud lllun i\u2019r sbwriel…}
+        other {Yn symud lluniau i\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_progress_trash_generic"> {count, plural,
+        =1 {Yn symud eitem i\u2019r sbwriel…}
+        other {Yn symud eitemau i\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_progress_untrash_audio"> {count, plural,
+        =1 {Yn symud ffeil sain allan o\u2019r sbwriel…}
+        other {Yn symud ffeiliau sain allan o\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_progress_untrash_video"> {count, plural,
+        =1 {Yn symud fideo allan o\u2019r sbwriel…}
+        other {Yn symud fideos allan o\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_progress_untrash_image"> {count, plural,
+        =1 {Yn symud llun allan o\u2019r sbwriel…}
+        other {Yn symud lluniau allan o\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_progress_delete_audio"> {count, plural,
+        =1 {Yn dileu ffeil sain…}
+        other {Yn dileu ffeiliau sain…}
+        }
+    </string>
+    <string name="permission_progress_delete_video"> {count, plural,
+        =1 {Yn dileu fideo…}
+        other {Yn dileu fideos…}
+        }
+    </string>
+    <string name="permission_progress_delete_image"> {count, plural,
+        =1 {Yn dileu llun…}
+        other {Yn dileu lluniau…}
+        }
+    </string>
+    <string name="permission_progress_delete_generic"> {count, plural,
+        =1 {Yn dileu eitem…}
+        other {Yn dileu eitemau…}
+        }
+    </string>
     <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>