Automatic translation import

Change-Id: Id8111d11e56749b083b1135a07ff853ae6f2bf0e
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 eced81c..c0ceb3f 100644
--- a/overlay/frameworks/base/core/res/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values-cy/strings.xml
@@ -180,6 +180,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\'i osod}
+        other {Awdurdod tystysgrifau wedi\'i osod}
+    }
+    </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>
@@ -257,6 +262,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>
@@ -362,9 +372,9 @@
     <string name="permlab_answerPhoneCalls">ateb galwadau ffôn</string>
     <string name="permdesc_answerPhoneCalls">Mae\'n caniatáu yr ap i ateb galwad ffôn.</string>
     <string name="permlab_receiveSms">derbyn negeseuon testun (SMS)</string>
-    <string name="permdesc_receiveSms">Mae\'n caniatáu yr ap i dderbyn a phrosesu negeseuon SMS. Mae hyn yn golygu ei fod yn bosib i\'r ap medru clustfeinio ar neu ddileu negeseuon a chaiff eu hanfon at dy ddyfais heb i ti eu gweld nhw.</string>
+    <string name="permdesc_receiveSms">Mae\'n caniatáu yr ap i dderbyn a phrosesu negeseuon SMS. Mae hyn yn golygu ei fod yn bosib i\'r ap medru clustfeinio ar neu dileu negeseuon a chaiff eu hanfon at dy ddyfais heb i ti eu gweld nhw.</string>
     <string name="permlab_receiveMms">derbyn negeseuon testun (MMS)</string>
-    <string name="permdesc_receiveMms">Mae\'n caniatáu yr ap i dderbyn a phrosesu negeseuon MMS. Mae hyn yn golygu ei fod yn bosib i\'r ap medru clustfeinio ar neu ddileu negeseuon a chaiff eu hanfon at dy ddyfais heb i ti eu gweld nhw.</string>
+    <string name="permdesc_receiveMms">Mae\'n caniatáu yr ap i dderbyn a phrosesu negeseuon MMS. Mae hyn yn golygu ei fod yn bosib i\'r ap medru clustfeinio ar neu dileu negeseuon a chaiff eu hanfon at dy ddyfais heb i ti eu gweld nhw.</string>
     <string name="permlab_bindCellBroadcastService">Anfon negeseuon darlledu symudol ymlaen</string>
     <string name="permdesc_bindCellBroadcastService">Mae\'n caniatáu yr ap i ymlynu i\'r modiwl darlledu symudol er mwyn anfon negeseuon darlledu symudol ymlaen wrth iddyn nhw gael eu derbyn. Mewn rhai mannau mae rhybuddion am sefyllfaoedd argyfyngus yn cael eu darlledu trwy negeseuon destun. Gall apiau maleisus ymyrryd â pherfformiad neu weithrediad dy ddyfais pan fydd darllediad argyfwng yn cael ei dderbyn.</string>
     <string name="permlab_manageOngoingCalls">Rheoli galwadau allan</string>
@@ -381,7 +391,7 @@
     <string name="permdesc_readSms" product="tv">Gall yr ap hwn ddarllen yr holl negeseuon SMS (testun) wedi eu cadw ar dy ddyfais Android TV.</string>
     <string name="permdesc_readSms" product="default">Gall yr ap hwn ddarllen yr holl negeseuon SMS (testun) wedi eu cadw ar dy ffôn.</string>
     <string name="permlab_receiveWapPush">derbyn negeseuon testun (WAP)</string>
-    <string name="permdesc_receiveWapPush">Mae\'n caniatáu yr ap i dderbyn a phrosesu negeseuon WAP.  Mae\'r caniatâd hwn yn cynnwys y gallu i glustfeinio neu ddileu negeseuon a anfonir atat heb i ti eu gweld nhw.</string>
+    <string name="permdesc_receiveWapPush">Mae\'n caniatáu yr ap i dderbyn a phrosesu negeseuon WAP. Mae hyn yn golygu ei fod yn bosib i\'r ap medru clustfeinio ar neu dileu negeseuon a chaiff eu hanfon at dy ddyfais heb i ti eu gweld nhw.</string>
     <string name="permlab_getTasks">adfer apiau sy\'n rhedeg</string>
     <string name="permdesc_getTasks">Mae\'n caniatáu yr ap i adfer gwybodaeth am dasgau yn rhedeg ar y pryd neu yn ddiweddar. Gall hyn galluogi\'r ap i ddarganfod gwybodaeth am ba apiau sy\'n cael eu defnyddio ar y ddyfais.</string>
     <string name="permlab_manageProfileAndDeviceOwners">rheoli perchennogion dyfais a phroffil</string>
@@ -434,9 +444,9 @@
     <string name="permdesc_bodySensors" product="default">Mae\'n caniatáu i\'r ap gyrchu data synhwyrydd y corff, fel cyfradd curiad y galon, tymheredd, a chanran ocsigen yn y gwaed, wrth ddefnyddio\'r ap.</string>
     <string name="permdesc_bodySensors_background" product="default">Mae\'n caniatáu i\'r ap gyrchu data synhwyrydd y corff, fel cyfradd curiad y galon, tymheredd, a chanran ocsigen yn y gwaed, tra bod yr ap yn y cefndir.</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>
-    <string name="permdesc_readCalendar" product="default">Gall yr ap hwn ddarllen yr holl ddigwyddiadau calendr wedi eu cadw ar dy ffôn a rhannu neu gadw data dy galendr.</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 cadw 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 cadw data dy galendr.</string>
+    <string name="permdesc_readCalendar" product="default">Gall yr ap hwn ddarllen yr holl ddigwyddiadau calendr wedi eu cadw ar dy ffôn a rhannu neu cadw data dy galendr.</string>
     <string name="permlab_writeCalendar">ychwanegu neu addasu digwyddiadau calendr ac anfon negeseuon e-bost at westeion heb roi gwybod i\'r perchennog</string>
     <string name="permdesc_writeCalendar" product="tablet">Gall yr ap hwn ychwanegu, tynnu neu newid digwyddiadau calendr ar dy lechen. Gall yr ap anfon negeseuon gall ymddangos i ddod o berchnogion calendrau neu newid digwyddiadau heb wybod eu perchnogion.</string>
     <string name="permdesc_writeCalendar" product="tv">Gall yr ap hwn ychwanegu, tynnu neu newid digwyddiadau calendr ar y ddyfais Android TV. Gall yr ap anfon negeseuon gall ymddangos i ddod o berchnogion calendrau neu newid digwyddiadau heb wybod eu perchnogion.</string>
@@ -666,7 +676,7 @@
     <string name="permdesc_readMediaAudio">Mae\u2019n caniatáu i\u2019r ap ddarllen ffeiliau sain o\u2019r storfa rwyt yn ei rhannu.</string>
     <string name="permdesc_readMediaVideo">Mae\u2019n caniatáu i\u2019r ap ddarllen ffeiliau fideo o\'r storfa rwyt yn ei rhannu.</string>
     <string name="permdesc_readMediaImages">Mae\u2019n caniatáu i\u2019r ap ddarllen ffeiliau delweddau o\'r storfa rwyt yn ei rhannu.</string>
-    <string name="permlab_sdcardWrite">addasu neu ddileu cynnwys dy storfa a rennir</string>
+    <string name="permlab_sdcardWrite">addasu neu dileu cynnwys dy storfa a rennir</string>
     <string name="permdesc_sdcardWrite">Mae\u2019n caniatáu yr ap i ysgrifennu cynnwys i\'r storfa rwyt yn ei rhannu.</string>
     <string name="permlab_use_sip">gwneud/derbyn galwadau SIP</string>
     <string name="permdesc_use_sip">Mae\'n caniatáu yr ap i gwneud a derbyn galwadau SIP.</string>
@@ -721,14 +731,14 @@
     <string name="policylab_limitPassword">Gosod rheolau cyfrinair</string>
     <string name="policydesc_limitPassword">Rheoli hyd a math o nodau gellir eu defnyddio mewn cyfrineiriau cloi\'r sgrin a chodau PIN.</string>
     <string name="policylab_watchLogin">Monitro cynigion i ddatgloi\'r sgrin</string>
-    <string name="policydesc_watchLogin" product="tablet">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r llechen neu ddileu holl ddata\'r llechen os oes gormod o gynigion aflwyddiannus.</string>
-    <string name="policydesc_watchLogin" product="tv">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi dy ddyfais Android TV neu ddileu holl ddata\'r defnyddiwr hwn os oes gormod o gynigion aflwyddiannus.</string>
-    <string name="policydesc_watchLogin" product="automotive">Monitro\'r nifer o gyfrineiriau anghywir sy\'n cael eu teipio wrth ddatgloi’r sgrin a chloi\'r system gwybodloniant neu ddileu holl ddata\'r system gwybodloniant os rhoddir o gynigion anghywir.</string>
-    <string name="policydesc_watchLogin" product="default">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r ffôn neu ddileu holl ddata\'r ffôn os oes gormod o gynigion aflwyddiannus.</string>
-    <string name="policydesc_watchLogin_secondaryUser" product="tablet">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r llechen neu ddileu holl ddata\'r defnyddiwr hwn ar y llechen os oes gormod o gynigion aflwyddiannus.</string>
-    <string name="policydesc_watchLogin_secondaryUser" product="tv">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r dyfais Android TV neu ddileu holl ddata\'r defnyddiwr hwn os oes gormod o gynigion aflwyddiannus.</string>
-    <string name="policydesc_watchLogin_secondaryUser" product="automotive">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r system gwybodloniant neu ddileu holl ddata\'r proffil hwn os oes gormod o gynigion anghywir.</string>
-    <string name="policydesc_watchLogin_secondaryUser" product="default">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r ffôn neu ddileu holl ddata\'r defnyddiwr hwn ar y ffôn os oes gormod o gynigion aflwyddiannus.</string>
+    <string name="policydesc_watchLogin" product="tablet">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r llechen neu dileu holl ddata\'r llechen os oes gormod o gynigion aflwyddiannus.</string>
+    <string name="policydesc_watchLogin" product="tv">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi dy ddyfais Android TV neu dileu holl ddata\'r defnyddiwr hwn os oes gormod o gynigion aflwyddiannus.</string>
+    <string name="policydesc_watchLogin" product="automotive">Monitro\'r nifer o gyfrineiriau anghywir sy\'n cael eu teipio wrth ddatgloi’r sgrin a chloi\'r system gwybodloniant neu dileu holl ddata\'r system gwybodloniant os rhoddir o gynigion anghywir.</string>
+    <string name="policydesc_watchLogin" product="default">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r ffôn neu dileu holl ddata\'r ffôn os oes gormod o gynigion aflwyddiannus.</string>
+    <string name="policydesc_watchLogin_secondaryUser" product="tablet">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r llechen neu dileu holl ddata\'r defnyddiwr hwn ar y llechen os oes gormod o gynigion aflwyddiannus.</string>
+    <string name="policydesc_watchLogin_secondaryUser" product="tv">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r dyfais Android TV neu dileu holl ddata\'r defnyddiwr hwn os oes gormod o gynigion aflwyddiannus.</string>
+    <string name="policydesc_watchLogin_secondaryUser" product="automotive">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r system gwybodloniant neu dileu holl ddata\'r proffil hwn os oes gormod o gynigion anghywir.</string>
+    <string name="policydesc_watchLogin_secondaryUser" product="default">Monitro’r nifer o droeon rhoddir cyfrinair anghywir wrth ddatgloi\'r sgrin a chloi\'r ffôn neu dileu holl ddata\'r defnyddiwr hwn ar y ffôn os oes gormod o gynigion aflwyddiannus.</string>
     <string name="policylab_resetPassword">Newid clo\'r sgrin</string>
     <string name="policydesc_resetPassword">Newid clo\'r sgrin</string>
     <string name="policylab_forceLock">Cloi\'r sgrin</string>
@@ -909,7 +919,7 @@
     <string name="emergency_calls_only" msgid="2485604591272668370">Galwadau brys yn unig</string>
     <string name="lockscreen_network_locked_message">Rhwydwaith wedi\'i gloi</string>
     <string name="lockscreen_sim_puk_locked_message">Mae\'r cerdyn SIM wedi\'i gloi â PUK.</string>
-    <string name="lockscreen_sim_puk_locked_instructions">Gweler y Canllaw Defnyddiwr neu gysylltu â Gofal Cwsmeriaid.</string>
+    <string name="lockscreen_sim_puk_locked_instructions">Gweler y Canllaw Defnyddiwr neu cysylltu â Gofal Cwsmeriaid.</string>
     <string name="lockscreen_sim_locked_message">Mae\'r cerdyn SIM wedi\'i gloi.</string>
     <string name="lockscreen_sim_unlock_progress_dialog_message">Yn datgloi cerdyn SIM\u2026</string>
     <string name="lockscreen_too_many_failed_attempts_dialog_message">        Rwyt wedi cael y patrwm yn anghywir <xliff:g id="number">%1$d</xliff:g> tro.
@@ -1120,6 +1130,50 @@
     </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}
+        two {# funud yn ôl}
+        other {# munud yn ôl}
+    }
+    </string>
+    <string name="duration_hours_relative">{count, plural,
+=1 {# awr yn ôl}
+        other {# awr yn ôl}
+    }
+    </string>
+    <string name="duration_days_relative">{count, plural,
+        =1 {# diwrnod yn ôl}
+        two {# ddiwrnod 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_hours_relative_future">{count, plural,
+        =1 {# awr}
+        other {# awr}
+    }
+    </string>
+    <string name="duration_days_relative_future">{count, plural,
+        =1 {# diwrnod}
+        two {# ddiwrnod}
+        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>
@@ -1345,8 +1399,8 @@
     <string name="dlg_ok">Iawn</string>
     <string name="usb_charging_notification_title">Yn gwefru\'r ddyfais hon trwy USB</string>
     <string name="usb_supplying_notification_title">Yn gwefru\'r ddyfais a gysylltwyd trwy USB</string>
-    <string name="usb_mtp_notification_title">Mae trosglwyddo ffeiliau trwy USB wedi\'i droi ymlaen</string>
-    <string name="usb_ptp_notification_title">Mae PTP trwy USB wedi\'i droi ymlaen</string>
+    <string name="usb_mtp_notification_title">Mae trosglwyddo ffeiliau trwy USB ymlaen</string>
+    <string name="usb_ptp_notification_title">Mae PTP trwy USB ymlaen</string>
     <string name="usb_tether_notification_title">Mae tenynnu USB wedi\'i droi ymlaen</string>
     <string name="usb_midi_notification_title">Mae MIDI twy USB wedi\'i droi ymlaen</string>
     <string name="usb_accessory_notification_title">Cysylltwyd ategolyn trwy\'r USB</string>
@@ -1861,9 +1915,53 @@
     <string name="confirm_battery_saver">Iawn</string>
     <string name="battery_saver_description_with_learn_more">Mae Arbedwr Batri yn troi\'r thema Tywyll ymlaen ac yn cyfyngu neu\'n diffodd gweithrediadau yn y cefndir, rhai effeithiau gweledol, nodweddion penodol, a rhai cysylltiadau rhwydwaith.</string>
     <string name="battery_saver_description">Mae Arbedwr Batri yn troi\'r thema Tywyll ymlaen ac yn cyfyngu neu\'n diffodd gweithrediadau yn y cefndir, rhai effeithiau gweledol, nodweddion penodol, a rhai cysylltiadau rhwydwaith.</string>
-    <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_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 funud (hyd at {formattedTime})}
+        two {Am # funud (hyd at {formattedTime})}
+        other {Am # munud (hyd at {formattedTime})}
+    }
+    </string>
+    <string name="zen_mode_duration_minutes_summary_short">{count, plural,
+        =1 {Am 1 funud (hyd at {formattedTime})}
+        two {Am # funud (hyd at {formattedTime})}
+        other {Am # munud (hyd at {formattedTime})}
+    }
+    </string>
+    <string name="zen_mode_duration_hours_summary">{count, plural,
+        =1 {Am 1 awr (hyd at {formattedTime})}
+        other {Am # awr (hyd at {formattedTime})}
+    }
+    </string>
+    <string name="zen_mode_duration_hours_summary_short">{count, plural,
+        =1 {Am 1 awr (hyd at {formattedTime})}
+        other {Am # awr (hyd at {formattedTime})}
+    }
+    </string>
+    <string name="zen_mode_duration_minutes">{count, plural,
+        =1 {Am un funud}
+        two {Am # funud}
+        other {Am # munud}
+    }
+    </string>
+    <string name="zen_mode_duration_minutes_short">{count, plural,
+        =1 {Am 1 funud}
+        two {Am # funud}
+        other {Am # munud}
+    }
+    </string>
+    <string name="zen_mode_duration_hours">{count, plural,
+        =1 {Am 1 awr}
+        other {Am # awr}
+    }
+    </string>
+    <string name="zen_mode_duration_hours_short">{count, plural,
+        =1 {Am 1 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>
@@ -1945,7 +2043,7 @@
     <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv">Mae\'r ap yn ymofyn diogelwch ychwanegol. Rho gynnig ar dy ddyfais Android TV yn lle.</string>
     <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet">Mae\'r ap yn ymofyn diogelwch ychwanegol. Rho gynnig ar dy lechen yn lle.</string>
     <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default">Mae\'r ap yn ymofyn diogelwch ychwanegol. Rho gynnig ar dy ffôn yn lle.</string>
-    <string name="deprecated_target_sdk_message">Cafodd yr ap hwn ei adeiladu ar gyfer fersiwn gynharach o Android ac mae\'n bosib na fydd yn gweithio\'n gywir. Gwiria am ddiweddariadau neu gysylltu â\'r datblygwr.</string>
+    <string name="deprecated_target_sdk_message">Cafodd yr ap hwn ei adeiladu ar gyfer fersiwn gynharach o Android ac mae\'n bosib na fydd yn gweithio\'n gywir. Gwiria am ddiweddariadau neu cysylltu â\'r datblygwr.</string>
     <string name="deprecated_target_sdk_app_store">Gwirio am ddiweddariad</string>
     <string name="new_sms_notification_title">Mae gennyt negeseuon newydd</string>
     <string name="new_sms_notification_content">Agor yr ap SMS i\'w gweld</string>
@@ -1987,6 +2085,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>
@@ -2091,6 +2194,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-fur-rIT/strings.xml b/overlay/frameworks/base/core/res/res/values-fur-rIT/strings.xml
new file mode 100644
index 0000000..a8ff22a
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-fur-rIT/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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-array name="fingerprint_acquired_vendor"/>
+    <string-array name="fingerprint_error_vendor"/>
+    <string-array name="face_acquired_vendor"/>
+    <string-array name="face_error_vendor"/>
+</resources>
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 cf05fb3..8a22448 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
@@ -627,34 +627,75 @@
       disativat su blocu de teclas cando si retzit una mutida in intrada, luego
       torrat a ativare su blocu de teclas cando sa mutida est agabbada.</string>
     <string name="permlab_requestPasswordComplexity">rechèdere cumplessidade de su blocu de ischermu</string>
+    <string name="permdesc_requestPasswordComplexity">Permitit a s\'aplicatzione de memorizare: 
+        cumplessidade de su blocu de ischermu (artu, mèdiu, bàsciu o perunu), chi indicat sa gama possìbile de
+        longària e genia de blocu de ischermu. S\'aplicatzione podet puru sugerire a is utentes chi agiornent
+        su blocu de ischermu a unu tzertu livellu ma is utentes podent ignorare e sighire a navigare. Càstia chi
+        su blocu de s\'ischermu no est archiviadu in testu no formatadu tando s\'aplicatzione no connoschet sa crae curreta.
+    </string>
     <string name="permlab_postNotification">ammustrare notìficas</string>
+    <string name="permlab_useBiometric">impreu de s\'hardware biomètricu</string>
+    <string name="permdesc_useBiometric">Permitit a s\'aplicatzione de impreare s\'imprenta de pòddighe pro s\'autenticatzione</string>
     <string name="permlab_manageFingerprint">gestire s\'imprenta de pòddighe</string>
     <string name="permdesc_manageFingerprint">Permitit a s\'aplicatzione de pedire mètodos pro agiùnghere o cantzellare is ischemas de imprentas de pòddighe pro ddos impreare.</string>
     <string name="permlab_useFingerprint">impreare s\'imprenta de pòddighe</string>
     <string name="permdesc_useFingerprint">Permitit a s\'aplicatzione de impreare s\'imprenta de pòddighe pro s\'autenticatzione</string>
     <string name="permlab_audioWrite">modìficare sa regorta de mùsica</string>
     <string name="permdesc_audioWrite">Permite a s\'aplicatzione de modificare sa regorta de mùsica.</string>
+    <string name="permlab_videoWrite">modìfica sa regorta de vìdeu</string>
+    <string name="permdesc_videoWrite">Permite a s\'aplicatzione de modificare sa regorta de vìdeo.</string>
+    <string name="permlab_imagesWrite">modìficare sa regorta de fotografias</string>
+    <string name="permdesc_imagesWrite">Permitit a s\'aplicatzione de modificare sa regorta de fotografias.</string>
+    <string name="permlab_mediaLocation">lèghere is positziones dae sa regorta de mùsica</string>
+    <string name="permdesc_mediaLocation">Permitit a s\'aplicatzione de lèghere is positziones dae sa regorta multimediale.</string>
     <string name="biometric_dialog_default_title">Verìfica chi ses tue</string>
+    <string name="biometric_error_hw_unavailable">S\'hardware biomètricu no est disponìbile</string>
+    <string name="biometric_error_user_canceled">Autenticatzione cantzellada</string>
+    <string name="biometric_not_recognized">Non connotu</string>
+    <string name="biometric_error_canceled">Autenticatzione annullada</string>
+    <string name="biometric_error_device_not_secured">Perunu pin, ischema o crae impostada</string>
     <string name="fingerprint_acquired_too_slow">Su pòddighe s\'est mòvidu tropu a bellu. Torra a proare.</string>
     <string-array name="fingerprint_acquired_vendor"/>
+    <string name="fingerprint_authenticated">Imprenta de pòddighe autenticada</string>
+    <string name="face_authenticated_no_confirmation_required">Cara autenticada</string>
+    <string name="face_authenticated_confirmation_required">Cara autenticada, incarca cunfirma</string>
     <string name="fingerprint_error_hw_not_available">S\'imprenta de pòddighe no est a disponimentu.</string>
     <string name="fingerprint_error_canceled">Operatzione de s\'imprenta de pòddighe annullada.</string>
+    <string name="fingerprint_error_user_canceled">Operatzione de s\'imprenta de pòddighe annullada dae s\'utente</string>
+    <string name="fingerprint_error_no_fingerprints">Peruna imprenta registrada.</string>
+    <string name="fingerprint_error_hw_not_present">Custu dispositivu non tenet unu sensore de imprenta de pòddighe.</string>
     <string name="fingerprint_error_security_update_required">Sensore disabilitadu in manera temporànea.</string>
     <string name="fingerprint_name_template">Pòddighe <xliff:g id="fingerId" example="1">%d</xliff:g></string>
     <string-array name="fingerprint_error_vendor"/>
     <string name="fingerprint_icon_content_description">Icona de imprenta de pòddighe</string>
+    <string name="face_acquired_too_bright">Tropu lughe. Proa cun prus pagu lughe.</string>
+    <string name="face_acquired_poor_gaze">Càstia prus deretu a su dispositivu.</string>
+    <string name="face_acquired_too_much_motion">Tropu movimentu. Podera su telèfonu firmu.</string>
+    <string name="face_acquired_recalibrate">Torra a registrare sa cara tua.</string>
+    <string name="face_acquired_obscured">Boga·nde totu su chi ti cuat sa cara.</string>
+    <string name="face_acquired_sensor_dirty">Lìmpia sa parte de susu de s\'ischermu, puru s\'istanca niedda.</string>
     <string-array name="face_acquired_vendor"/>
+    <string name="face_error_hw_not_available">Impossìbile verificare sa cara. S\'hardware no est disponìbile.</string>
+    <string name="face_error_no_space">Impossìbile archiviare datos noos de cara. Cantzella·nde una betza antis.</string>
+    <string name="face_error_canceled">Operatzione de cara annullada.</string>
     <string name="face_error_lockout">Tropu tentativos. Torra·bi a proare.</string>
+    <string name="face_error_unable_to_process">Impossìbile verificare sa cara. Torra a proare.</string>
     <string name="face_error_security_update_required">Sensore disabilitadu in manera temporànea.</string>
+    <string name="face_name_template">Cara: <xliff:g id="faceId" example="1">%d</xliff:g></string>
     <string-array name="face_error_vendor"/>
+    <string name="face_icon_content_description">Icona de cara</string>
     <string name="permlab_readSyncSettings">lèghere impostatziones de sincronizatzione</string>
     <string name="permdesc_readSyncSettings">Permitit a s\'aplicatzione de lèghere is impostatziones de sincronizatzione pro unu contu. Pro esèmpiu, custu podet determinare si s\'aplicatzione Persones est sincronizada cun un\'àteru contu.</string>
     <string name="permlab_writeSyncSettings">ativare/disativare sa sincronizatzione</string>
     <string name="permdesc_writeSyncSettings">Permitit a un\'aplicatzione de modificare is impostatziones de sincronizatzione pro unu contu. Pro esèmpiu, si podet impreare pro ativare sa sincronizatzione de s\'aplicatzione Persones cun unu contu.</string>
     <string name="permlab_readSyncStats">lèghere istatìsticas de sincronizatzione</string>
     <string name="permdesc_readSyncStats">Permitit a un\'aplicatzione de lèghere is istatìsticas de sincronizatzione pro unu contu, incluida sa cronologia de is eventos de sincronizatzione e cantos datos sunt sincronizados.</string>
+    <string name="permlab_sdcardRead">lèghere is cuntenutos de s\'archiviatzione cumpartzida tua</string>
+    <string name="permdesc_sdcardRead">Permitit a s\'aplicatzione de lèghere is cuntenutos de s\'archiviatzione cumpartzida tua.</string>
     <string name="permdesc_readMediaAudio">Permitit a s\'aplicatzione de lèghere is archìvios de àudio de s\'archiviatzione cumpartzida tua.</string>
     <string name="permdesc_readMediaImages">Permitit a s\'aplicatzione de lèghere is archìvios de immàgine de s\'archiviatzione cumpartzida tua.</string>
+    <string name="permlab_sdcardWrite">modificare o cantzellare is cuntenutos de s\'archiviatzione cumpartzida tua</string>
+    <string name="permdesc_sdcardWrite">Permitit a s\'aplicatzione de iscrìere is cuntenutos de s\'archiviatzione cumpartzida tua.</string>
     <string name="permlab_use_sip">fàghere/retzire mutidas SIP</string>
     <string name="permdesc_use_sip">Permitit a s\'aplicatzione de fàghere e retzire mutidas SIP.</string>
     <string name="permlab_register_sim_subscription">registrare connessiones telecom SIM noas</string>
@@ -701,9 +742,12 @@
     <string name="permdesc_bindCarrierServices">Permitit a su titolare de s\'assotziare a is servìtzios de un\'operadore. Non diat dèpere serbire pro aplicatziones normales.</string>
     <string name="permlab_access_notification_policy">atzèdere a No istorbes</string>
     <string name="permdesc_access_notification_policy">Permitit a s\'aplicatzione de lèghere e iscriere sa cunfiguratzione No istorbes.</string>
+    <string name="permlab_startViewPermissionUsage">cumintzare visualizatzione de s\'impreu de permissos</string>
+    <string name="permdesc_startViewPermissionUsage">Permitit a su titulare de aviare su permissu de impreu pro un\'aplicatzione. Non diat dèpere serbire pro aplicatziones normales.</string>
     <string name="permlab_startReviewPermissionDecisions">aviare detzisiones de visualizatzione de permissos</string>
     <string name="policylab_limitPassword">Imposta is règulas de sa crae</string>
     <string name="policydesc_limitPassword">Controlla sa longària e is caràteres permìtidos in is craes de blocu ischermu e PIN.</string>
+    <string name="policylab_watchLogin">Controlla tentativos de isblocare s\'ischermu</string>
     <string name="policydesc_watchLogin" product="tablet">Controlla su nùmeru de craes isballiadas
     iscritas in s\'isblocu de s\'ischermu, e bloca sa tauledda o cantzella totu is datos de sa
     tauledda si s\'iscrient tropu craes isballiadas.</string>
@@ -858,11 +902,13 @@
     <string name="keyguard_password_enter_puk_code">Iscrie PUK e su còdighe PIN nou</string>
     <string name="keyguard_password_enter_puk_prompt">còdighe PUK</string>
     <string name="keyguard_password_enter_pin_prompt">Còdighe PIN nou</string>
+    <string name="keyguard_password_entry_touch_hint"><font size="17">Toca pro iscrìere sa crae</font></string>
     <string name="keyguard_password_enter_password_code">Iscrie sa crae pro isblocare</string>
     <string name="keyguard_password_enter_pin_password_code">Iscrie su PIN pro isblocare</string>
     <string name="keyguard_password_wrong_pin_code">Còdighe PIN isballiadu.</string>
     <string name="keyguard_label_text">Pro isblocare, incarca Menù e pustis 0.</string>
     <string name="emergency_call_dialog_number_for_display">Nùmeru de emergèntzia</string>
+    <string name="lockscreen_carrier_default">Perunu servìtziu</string>
     <string name="lockscreen_screen_locked">Ischermu blocadu.</string>
     <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>
@@ -872,6 +918,7 @@
     <string name="lockscreen_pattern_correct">Giustu!</string>
     <string name="lockscreen_pattern_wrong">Torra·bi a proare</string>
     <string name="lockscreen_password_wrong">Torra·bi a proare</string>
+    <string name="lockscreen_storage_locked">Isbloca pro totu is funtziones e is datos</string>
     <string name="faceunlock_multiple_failures">Tentativos màssimos de isblocu de fache passados</string>
     <string name="lockscreen_missing_sim_message_short">Peruna ischeda SIM</string>
     <string name="lockscreen_missing_sim_message" product="tablet">Peruna ischeda SIM in sa tauledda.</string>
@@ -895,6 +942,30 @@
     <string name="lockscreen_sim_puk_locked_instructions">Càstia sa Guida utente o cuntata su Servìtziu clientes.</string>
     <string name="lockscreen_sim_locked_message">S\'ischeda SIM est blocada.</string>
     <string name="lockscreen_sim_unlock_progress_dialog_message">Isblochende s\'ischeda SIM\u2026</string>
+    <string name="lockscreen_too_many_failed_attempts_dialog_message">As disinnadu male sa cumbinada de isblocu tua <xliff:g id="number">%1$d</xliff:g> bortas. \n\nTorra a proare de immoe a <xliff:g id="number">%2$d</xliff:g> segundos.</string>
+    <string name="lockscreen_too_many_failed_password_attempts_dialog_message">As iscritu sa crae isballiada <xliff:g id="number">%1$d</xliff:g> bortas. \n\nTorra a proare de immoe a <xliff:g id="number">%2$d</xliff:g> segundos.</string>
+    <string name="lockscreen_too_many_failed_pin_attempts_dialog_message">As iscritu su PIN isballiadu <xliff:g id="number">%1$d</xliff:g> bortas. \n\nTorra a proare de immoe a <xliff:g id="number">%2$d</xliff:g> segundos.</string>
+    <string name="lockscreen_failed_attempts_almost_glogin" product="tablet">        As disinnadu male sa cumbinada de isblocu tua <xliff:g id="number">%1$d</xliff:g> bortas.
+       A pustis de <xliff:g id="number">%2$d</xliff:g> tentativos isballiados in prus,
+       as a dèpere isblocare sa tauledda tua cun Google signin.\n\n
+       Torra a proare de immoe a <xliff:g id="number">%3$d</xliff:g> segundos.
+    </string>
+    <string name="lockscreen_failed_attempts_almost_glogin" product="tv">As isballiadu s\'ischema de isblocu <xliff:g id="number">%1$d</xliff:g> bortas.
+A pustis de <xliff:g id="number">%2$d</xliff:g> tentativos isballiados in prus, as a dèpere isblocare su dispositivu Android TV faghende s\'atzessu cun Google.\n\nTorra a proare a pustis de <xliff:g id="number">%3$d</xliff:g> segundos.</string>
+    <string name="lockscreen_failed_attempts_almost_glogin" product="default">        As disinnadu male sa cumbinada de isblocu tua <xliff:g id="number">%1$d</xliff:g> bortas.
+       A pustis de <xliff:g id="number">%2$d</xliff:g> tentativos isballiados in prus,
+       as a dèpere isblocare su telèfonu tuo cun Google signin.\n\n
+       Torra a proare de immoe a <xliff:g id="number">%3$d</xliff:g> segundos.
+    </string>
+    <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet">       As isballiadu s\'isblocu de sa tauledda <xliff:g id="number">%1$d</xliff:g> bortas.
+       A pustis de <xliff:g id="number">%2$d</xliff:g> tentativos isballiados in prus,
+       sa tauledda s\'at a resetare a is valores predefinidos de fàbrica e totu is datos s\'ant a pèrdere.
+    </string>
+    <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv">As isballiadu s\'isblocu de su dispositivu Android TV <xliff:g id="number">%1$d</xliff:g> bortas. A pustis de <xliff:g id="number">%2$d</xliff:g> tentativos isballiados in prus, su dispositivu Android TV s\'at a resetare a is valores predefinidos de fàbrica e totu is datos s\'ant a pèrdere.</string>
+    <string name="lockscreen_failed_attempts_almost_at_wipe" product="default">       As isballiadu s\'isblocu de su telèfonu <xliff:g id="number">%1$d</xliff:g> bortas.
+       A pustis de <xliff:g id="number">%2$d</xliff:g> tentativos isballiados in prus,
+       su telèfonu s\'at a resetare a is valores predefinidos de fàbrica e totu is datos s\'ant a pèrdere.
+    </string>
     <string name="lockscreen_failed_attempts_now_wiping" product="tablet">       As isballiadu s\'isblocu de sa tauledda <xliff:g id="number">%d</xliff:g> bortas.
        Sa tauledda at a torrare a is impostatziones predefinidas de fàbrica.
     </string>
@@ -939,6 +1010,8 @@
     <string name="keyguard_accessibility_slide_unlock">Isblocu cun iscurrimentu.</string>
     <string name="keyguard_accessibility_pattern_unlock">Isblocu cun cumbinada.</string>
     <string name="keyguard_accessibility_pin_unlock">Isblocu cun pin.</string>
+    <string name="keyguard_accessibility_sim_pin_unlock">Isblocu de sa SIM cun su PIN.</string>
+    <string name="keyguard_accessibility_sim_puk_unlock">Isblocu de sa SIM cun su PUK.</string>
     <string name="keyguard_accessibility_password_unlock">Isblocu cun crae.</string>
     <string name="keyguard_accessibility_pattern_area">Ispàtziu de sa cumbinada.</string>
     <string name="keyguard_accessibility_slide_area">Ispàtziu de iscurrimentu.</string>
@@ -965,6 +1038,7 @@
     <string name="double_tap_toast">Cussìgiu: dòpiu tocu pro ismanniare e istesiare.</string>
     <string name="autofill_this_form">Àuto-cumpletamentu</string>
     <string name="setup_autofill">Imposta s\'àuto-cumpletamentu</string>
+    <string name="autofill_window_title">Cumpiladura automàtica cun <xliff:g id="serviceName" example="MyPass">%1$s</xliff:g></string>
     <string name="autofill_address_name_separator">\u0020</string>
     <string name="autofill_address_summary_name_format">$1$2$3</string>
     <string name="autofill_address_summary_separator">,\u0020</string>
@@ -1032,10 +1106,17 @@
     <string name="text_copied">Testu copiadu in punta de billete.</string>
     <string name="more_item_label">Àteru</string>
     <string name="prepend_shortcut_label">Menù+</string>
+    <string name="menu_meta_shortcut_label">Meta+</string>
+    <string name="menu_ctrl_shortcut_label">Ctrl+</string>
+    <string name="menu_alt_shortcut_label">Alt+</string>
+    <string name="menu_shift_shortcut_label">Shift+</string>
+    <string name="menu_sym_shortcut_label">Sym+</string>
+    <string name="menu_function_shortcut_label">Funtzione+</string>
     <string name="menu_space_shortcut_label">ispàtziu</string>
     <string name="menu_enter_shortcut_label">imbiu</string>
     <string name="menu_delete_shortcut_label">cantzella</string>
     <string name="search_go">Chirca</string>
+    <string name="search_hint">Chirca\u2026</string>
     <string name="searchview_description_search">Chirca</string>
     <string name="searchview_description_query">Istringa de chirca</string>
     <string name="searchview_description_clear">Lìmpia sa rechesta</string>
@@ -1071,6 +1152,7 @@
     <string name="weeks">chidas</string>
     <string name="year">annu</string>
     <string name="years">annos</string>
+    <string name="now_string_shortest">immoe</string>
     <string name="VideoView_error_title">Problema de su vìdeu</string>
     <string name="VideoView_error_text_invalid_progressive_playback">Custu vìdeu no est bàlidu pro sa trasmissione in custu dispositivu.</string>
     <string name="VideoView_error_text_unknown">Non faghet a riproduire custu video.</string>
@@ -1085,11 +1167,15 @@
     <string name="selectAll">Seletziona totu</string>
     <string name="cut">Sega</string>
     <string name="copy">Còpia</string>
+    <string name="failed_to_copy_to_clipboard">Faddina in sa còpia in punta de billete</string>
     <string name="paste">Apìtziga</string>
+    <string name="paste_as_plain_text">Incolla comente testu simpre</string>
     <string name="replace">Remplasa\u2026</string>
     <string name="delete">Cantzella</string>
     <string name="copyUrl">Còpia URL</string>
     <string name="selectTextMode">Seletziona testu</string>
+    <string name="undo">Iscontza</string>
+    <string name="redo">Torra a fàghere</string>
     <string name="autofill">Àuto-cumpletamentu</string>
     <string name="textSelectionCABTitle">Seletzione de su testu</string>
     <string name="addToDictionary">Agiunghe a su ditzionàriu</string>
@@ -1101,6 +1187,8 @@
     <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>
     <string name="app_running_notification_title"><xliff:g id="app_name">%1$s</xliff:g> est in esecutzione</string>
+    <string name="app_running_notification_text">Toca pro àteras informatziones
+        o firma s\'aplicatzione.</string>
     <string name="ok">AB</string>
     <string name="cancel">Annulla</string>
     <string name="yes">AB</string>
@@ -1113,23 +1201,51 @@
     <string name="not_checked">disativadu</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>
     <string name="whichViewApplication">Aberi cun</string>
     <string name="whichViewApplicationNamed">Aberi cun %1$s</string>
+    <string name="whichViewApplicationLabel">Aberi</string>
+    <string name="whichOpenHostLinksWith">Aberi is ligòngios <xliff:g id="host" example="mail.google.com">%1$s</xliff:g> cun</string>
+    <string name="whichOpenLinksWith">Aberi ligòngios cun</string>
+    <string name="whichOpenLinksWithApp">Aberi ligòngios cun <xliff:g id="application" example="Chrome">%1$s</xliff:g></string>
+    <string name="whichOpenHostLinksWithApp">Aberi is ligòngios <xliff:g id="host" example="mail.google.com">%1$s</xliff:g> cun <xliff:g id="application" example="Chrome">%2$s</xliff:g></string>
+    <string name="whichGiveAccessToApplicationLabel">Cuntzede atzessu</string>
     <string name="whichEditApplication">Modìfica cun</string>
     <string name="whichEditApplicationNamed">Modìfica cun %1$s</string>
+    <string name="whichEditApplicationLabel">Modìfica</string>
     <string name="whichSendApplication">Cumpartzidura</string>
     <string name="whichSendApplicationNamed">Cumpartzi cun %1$s</string>
     <string name="whichSendApplicationLabel">Cumpartzidura</string>
+    <string name="whichSendToApplication">Imbia impreende</string>
+    <string name="whichSendToApplicationNamed">Imbia impreende %1$s</string>
     <string name="whichSendToApplicationLabel">Imbia</string>
     <string name="whichHomeApplication">Seletziona un\'aplicatzione de cumintzu</string>
     <string name="whichHomeApplicationNamed">Imprea %1$s comente aplicatzione de cumintzu</string>
+    <string name="whichHomeApplicationLabel">Catura imàgine</string>
+    <string name="whichImageCaptureApplication">Catura imàgine cun</string>
+    <string name="whichImageCaptureApplicationNamed">Catura imàgine cun %1$s</string>
+    <string name="whichImageCaptureApplicationLabel">Catura imàgine</string>
     <string name="alwaysUse">Imprea comente predefinida pro custa atzione.</string>
     <string name="use_a_different_app">Imprea un\'àtera aplicatzione</string>
     <string name="clearDefaultHintMsg">Lìmpia predefinida in is Impostatziones de sistema &gt; Aplicatziones &gt; Iscarrigadas.</string>
     <string name="chooseActivity">Sèbera un\'atzione</string>
     <string name="chooseUsbActivity">Sèbera un\'aplicatzione pro su dispositivu USB</string>
     <string name="noApplications">Peruna aplicatzione pro esecutare custa atzione.</string>
+    <string name="aerr_application"><xliff:g id="application">%1$s</xliff:g> s\'est firmada</string>
+    <string name="aerr_process"><xliff:g id="process">%1$s</xliff:g> s\'est
+        firmada</string>
+    <string name="aerr_application_repeated"><xliff:g id="application">%1$s</xliff:g> sighit a si firmare</string>
+    <string name="aerr_process_repeated"><xliff:g id="process">%1$s</xliff:g> sighit a si firmare</string>
+    <string name="aerr_restart">Torra a abèrrere s\'aplicatzione</string>
+    <string name="aerr_report">Imbia cummentos</string>
+    <string name="aerr_close">Serra</string>
+    <string name="aerr_mute">Pone a sa muda fintzas a cando su dispositivu non torret a èssere aviadu</string>
     <string name="aerr_wait">Iseta</string>
+    <string name="aerr_close_app">Serra s\'aplicatzione</string>
+    <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> no est rispondende</string>
+    <string name="anr_activity_process"><xliff:g id="activity">%1$s</xliff:g> no est rispondende</string>
+    <string name="anr_application_process"><xliff:g id="application">%1$s</xliff:g> no est rispondende</string>
+    <string name="anr_process">Su protzessu <xliff:g id="process">%1$s</xliff:g> no est rispondende</string>
     <string name="force_close">AB</string>
     <string name="report">Signala</string>
     <string name="wait">Iseta</string>
@@ -1140,16 +1256,38 @@
     <string name="screen_compat_mode_scale">Iscala</string>
     <string name="screen_compat_mode_show">Mustra semper</string>
     <string name="screen_compat_mode_hint">Torra·ddu a ativare in Impostatziones de sistema &gt; Aplicatziones &gt; Iscarrigadas.</string>
+    <string name="unsupported_display_size_message"><xliff:g id="app_name">%1$s</xliff:g> non suportat sa cunfiguratzione de sa mannària de s\'ischermu atuale e si diat pòdere cumportare in manera imprevista.</string>
     <string name="unsupported_display_size_show">Mustra semper</string>
+    <string name="unsupported_compile_sdk_message"><xliff:g id="app_name">%1$s</xliff:g> fiat fraigadu pro una versione non cumpatìbile de Android OS e diat pòdere funtzionare in una manera chi non t\'abetas. Diat pòdere èssere a disponimentu una versione atualizada de s\'aplicatzione.</string>
     <string name="unsupported_compile_sdk_show">Mustra semper</string>
+    <string name="unsupported_compile_sdk_check_update">Chirca atualizatziones</string>
     <string name="smv_application">S\'aplicatzione <xliff:g id="application">%1$s</xliff:g> (process <xliff:g id="process">%2$s</xliff:g>) at violadu sa normativa sua de StrictMode.</string>
     <string name="smv_process">S\'elaboratzione <xliff:g id="process">%1$s</xliff:g> at violadu sa polìtica sua de StrictMode.</string>
+    <string name="android_upgrading_title" product="default">Su telèfonu s\'est atualizende\u2026</string>
+    <string name="android_upgrading_title" product="tablet">Su tauledda s\'est atualizende\u2026</string>
+    <string name="android_upgrading_title" product="device">Su dispositivu s\'est atualizende\u2026</string>
+    <string name="android_start_title" product="default">Su telèfonu s\'est aviende\u2026</string>
+    <string name="android_start_title" product="automotive">Android s\'est aviende\u2026</string>
+    <string name="android_start_title" product="tablet">Sa tauledda s\'est aviende\u2026</string>
+    <string name="android_start_title" product="device">Su dispositivu s\'est aviende\u2026</string>
     <string name="android_upgrading_fstrim">Otimizende s\'archiviatzione.</string>
+    <string name="android_upgrading_notification_title" product="default">Agabbende s\'atualizatzione de Android\u2026</string>
+    <string name="app_upgrading_toast"><xliff:g id="application">%1$s</xliff:g> est atualizende·si\u2026</string>
     <string name="android_upgrading_apk">Otimizende s\'aplicatzione <xliff:g id="number" example="123">%1$d</xliff:g> de <xliff:g id="number" example="123">%2$d</xliff:g>.</string>
     <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_power_button_enrollment_button_text">Disativa</string>
+    <string name="fp_power_button_bp_negative_button">Sighi</string>
     <string name="heavy_weight_notification"><xliff:g id="app">%1$s</xliff:g> in esecutzione</string>
+    <string name="heavy_weight_notification_detail">Toca pro torrare a su giogu</string>
+    <string name="heavy_weight_switcher_title">Sèbera giogu</string>
+    <string name="heavy_weight_switcher_text">Pro prestatziones mègius, custos giogos si podent
+        abèrrere petzi unu a sa borta.</string>
+    <string name="old_app_action">Torra a <xliff:g id="old_app">%1$s</xliff:g></string>
+    <string name="new_app_action">Aberi <xliff:g id="new_app">%1$s</xliff:g></string>
+    <string name="new_app_description"><xliff:g id="old_app">%1$s</xliff:g> at a èssere serrada
+        chena sarvare</string>
     <string name="dump_heap_notification"><xliff:g id="proc">%1$s</xliff:g> at passadu su lìmite de sa
         memòria</string>
     <string name="sendText">Sèbera un\'atzione pro su testu</string>
@@ -1168,15 +1306,33 @@
     <string name="volume_icon_description_media">Volùmene de is cuntenutos multimediales</string>
     <string name="volume_icon_description_notification">Volùmene de is notìficas</string>
     <string name="ringtone_default">Tonu de mutida predefinidu</string>
+    <string name="ringtone_default_with_actual">Predefinidu (<xliff:g id="actual_ringtone">%1$s</xliff:g>)</string>
     <string name="ringtone_silent">Perunu</string>
     <string name="ringtone_picker_title">Tonos de mutida</string>
+    <string name="ringtone_picker_title_alarm">Sonos de allarme</string>
+    <string name="ringtone_picker_title_notification">Sonu notìficas</string>
     <string name="ringtone_unknown">Disconnotu</string>
     <string name="wifi_available_sign_in">Iscrie·ti a sa rete Wi-Fi</string>
     <string name="network_available_sign_in">Iscrie·ti a sa rete</string>
     <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string>
+    <string name="wifi_no_internet"><xliff:g id="network_ssid" example="GoogleGuest">%1$s</xliff:g> non tenet atzessu a ìnternet</string>
+    <string name="wifi_no_internet_detailed">Toca pro bìdere is optziones </string>
     <string name="mobile_no_internet">Sa rete mòbile non tenet atzessu a ìnternet</string>
     <string name="other_networks_no_internet">Sa rete non tenet atzessu a ìnternet</string>
     <string name="private_dns_broken_detailed">Impossìbile atzèdere a su serbidore privadu DNS</string>
+    <string name="network_partial_connectivity"><xliff:g id="network_ssid" example="GoogleGuest">%1$s</xliff:g> tenet connetividade limitada</string>
+    <string name="network_partial_connectivity_detailed">Toca pro ti connètere a su pròpiu</string>
+    <string name="network_switch_metered">Connessione passada a <xliff:g id="network_type">%1$s</xliff:g></string>
+    <string name="network_switch_metered_detail">Su dispositivu impreat <xliff:g id="new_network">%1$s</xliff:g> cando <xliff:g id="previous_network">%2$s</xliff:g> non tenet atzessu a ìnternet. Si diant pòdere aplicare costos.</string>
+    <string name="network_switch_metered_toast">Connessione passada dae <xliff:g id="previous_network">%1$s</xliff:g> a <xliff:g id="new_network">%2$s</xliff:g></string>
+    <string-array name="network_switch_type_name">
+        <item>datos mòbiles</item>
+        <item>Wi-Fi</item>
+        <item>Bluetooth</item>
+        <item>Ethernet</item>
+        <item>VPN</item>
+    </string-array>
+    <string name="network_switch_type_name_unknown">una genia de rete disconnota</string>
     <string name="accept">Atzeta</string>
     <string name="decline">Refuda</string>
     <string name="select_character">Inserta caràtere</string>
@@ -1194,9 +1350,17 @@
     <string name="sms_short_code_confirm_always_allow">Permite semper</string>
     <string name="sms_short_code_confirm_never_allow">Non permitas mai</string>
     <string name="sim_removed_title">Ischeda SIM bogada</string>
+    <string name="sim_removed_message">Sa rete tzellulare no at a èssere a disponimentu finas a cando as a torrare a aviare cun un\'ischeda SIM vàlida insertada.</string>
     <string name="sim_done_button">Fatu</string>
     <string name="sim_added_title">Ischeda SIM agiunta</string>
+    <string name="sim_added_message">Torra a aviare su dispositivu pro intrare a sa rete tzellulare.</string>
     <string name="sim_restart_button">Torra a aviare</string>
+    <string name="install_carrier_app_notification_title">Ativatzione de su servìtziu mòbile</string>
+    <string name="install_carrier_app_notification_text">Iscàrriga·nche s\'aplicatzione de s\'operadora pro ativare sa SIM noa</string>
+    <string name="install_carrier_app_notification_text_app_name">Iscàrriga s\'aplicatzione <xliff:g id="app_name">%1$s</xliff:g> pro ativare sa SIM noa</string>
+    <string name="install_carrier_app_notification_button">Iscàrriga s\'aplicatzione</string>
+    <string name="carrier_app_notification_title">SIM noa insertada</string>
+    <string name="carrier_app_notification_text">Toca pro dda cunfigurare</string>
     <string name="time_picker_dialog_title">Imposta s\'ora</string>
     <string name="date_picker_dialog_title">Imposta data</string>
     <string name="date_time_set">Imposta</string>
@@ -1206,22 +1370,50 @@
     <string name="no_permissions">Perunu permissu rechertu</string>
     <string name="perm_costs_money">Ti diat pòdere costare dinare</string>
     <string name="dlg_ok">AB</string>
+    <string name="usb_charging_notification_title">Carrighende su dispositivu tràmite USB</string>
+    <string name="usb_supplying_notification_title">Carrighende su dispositivu tràmite USB</string>
+    <string name="usb_mtp_notification_title">Tràmuda de archìvios cun USB ativada</string>
+    <string name="usb_ptp_notification_title">PTP tràmite USB ativada</string>
     <string name="usb_tether_notification_title">Ancoràgiu web USB ativadu</string>
+    <string name="usb_midi_notification_title">MIDI tràmite USB ativada</string>
+    <string name="usb_accessory_notification_title">Atzessòriu  USB connètidu</string>
+    <string name="usb_notification_message">Toca pro àteras optziones.</string>
+    <string name="usb_power_notification_message">Dispositivu connètidu in càrriga. Toca pro àteras optziones.</string>
+    <string name="usb_unsupported_audio_accessory_title">Atzessòriu aùdio analògicu individuadu</string>
+    <string name="usb_unsupported_audio_accessory_message">Su dispositivu connètidu no est cumpatìbile cun custu telèfonu. Toca pro nd\'ischire de prus.</string>
     <string name="adb_active_notification_title">Curretzione USB collegada</string>
+    <string name="adb_active_notification_message">Toca pro disativare sa depuratzione tràmite USB</string>
+    <string name="adb_active_notification_message" product="tv">Toca pro disativare sa curretzione USB.</string>
     <string name="adbwifi_active_notification_title">Curretzione wireless connètida</string>
+    <string name="adbwifi_active_notification_message">Toca pro disativare sa curretzione tràmite wireless</string>
+    <string name="adbwifi_active_notification_message" product="tv">Seletzione pro disativare sa curretzione wireless.</string>
+    <string name="test_harness_mode_notification_title">Modalidade Test Harness ativada</string>
+    <string name="test_harness_mode_notification_message">Esecuta un\'aviu de fàbrica pro disativare sa modalidade Test Harness.</string>
     <string name="console_running_notification_title">Console seriale abilitada</string>
     <string name="console_running_notification_message">Sa prestatzione est influentziada. Pro disabilitare, controlla su bootloader.</string>
+    <string name="usb_contaminant_detected_title">Lìcuidos o brutore in sa porta USB</string>
+    <string name="usb_contaminant_detected_message">Sa porta USB s\'est disativada in manera automàtica. Toca pro nd\'ischire de prus.</string>
+    <string name="usb_contaminant_not_detected_title">AB s\'impreu de sa porta USB</string>
+    <string name="usb_contaminant_not_detected_message">Su telèfonu no agatat prus lìcuidos o brutore.</string>
     <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
     <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
+    <string name="ext_media_unmountable_notification_message">Toca pro curregire</string>
+    <string name="ext_media_unmountable_notification_message" product="tv"><xliff:g id="name" example="SD card">%s</xliff:g> est dannigiadu. Toca pro assentare.</string>
     <string name="ext_media_badremoval_notification_title"><xliff:g id="name" example="SD card">%s</xliff:g> bogadu in manera ispantosa</string>
+    <string name="ext_media_nomedia_notification_message">Podet dare chi calicuna funtzionalidade non siat funtzionende bene. Inserta·nche un\'àteru mèdiu de archiviatzione. </string>
     <string name="ext_media_unmounting_notification_message">Non boghes</string>
     <string name="ext_media_init_action">Imposta</string>
     <string name="ext_media_unmount_action">Tira</string>
     <string name="ext_media_browse_action">Esplora</string>
+    <string name="ext_media_seamless_action">Cambiare s\'essida</string>
     <string name="ext_media_missing_title"><xliff:g id="name" example="SD card">%s</xliff:g> mancat</string>
+    <string name="ext_media_missing_message">Torra a insertare su dispositivu</string>
     <string name="ext_media_move_specific_title">Tramudende <xliff:g id="name" example="Calculator">%s</xliff:g></string>
     <string name="ext_media_move_title">Tramudende is datos</string>
+    <string name="ext_media_move_success_title">Sa tràmuda de su cuntenutu nch\'est fata</string>
+    <string name="ext_media_move_success_message">Cuntenutu tramudadu a <xliff:g id="name" example="SD card">%s</xliff:g></string>
     <string name="ext_media_move_failure_title">No at fatu a tramudare su cuntenutu</string>
+    <string name="ext_media_move_failure_message">Proa a tramudare torra su cuntenutu</string>
     <string name="ext_media_status_removed">Bogadu</string>
     <string name="ext_media_status_unmounted">Tiradu</string>
     <string name="ext_media_status_checking">Controllende\u2026</string>
@@ -1240,6 +1432,10 @@
     <string name="permdesc_readInstallSessions">Permitit a un\'aplicatzione de làghere is sessiones de installatziones. Custu ddi permitit de bìdere is detàllios subra de is installatziones de pachetes ativos.</string>
     <string name="permlab_requestInstallPackages">rechèdere pachetes de installatzione</string>
     <string name="permdesc_requestInstallPackages">Permitit a un\'aplicatzione de rechèdere s\'installatzione de pachetes.</string>
+    <string name="permlab_requestDeletePackages">rechesta de eliminatzione de pachetes</string>
+    <string name="permdesc_requestDeletePackages">Permitit a un\'aplicatzione de rechèdere s\'eliminatzione de pachetes.</string>
+    <string name="permdesc_requestIgnoreBatteryOptimizations">Permitit a un\'aplicatzione de pedire permissos pro ignorare is otimizatziones de bateria pro cussa aplicatzione.</string>
+    <string name="tutorial_double_tap_to_zoom_message_short">Toca duas bortas pro su controllu de su zoom.</string>
     <string name="gadget_host_error_inflating">No at fatu a agiùnghere su trastu.</string>
     <string name="ime_action_go">Bae</string>
     <string name="ime_action_search">Chirca</string>
@@ -1266,22 +1462,32 @@
     <string name="wallpaper_binding_label">Immàgine de isfundu</string>
     <string name="chooser_wallpaper">Càmbia s\'isfundu</string>
     <string name="notification_listener_binding_label">Rilevadore de notìficas</string>
+    <string name="vr_listener_binding_label">Iscurtadore VR</string>
     <string name="condition_provider_service_binding_label">Frunidore de cunditziones</string>
+    <string name="notification_ranker_binding_label">Servìtziu de classificatzione de notìficas</string>
     <string name="alternate_eri_file">/data/eri.xml</string>
     <string name="vpn_title">VPN ativadu</string>
     <string name="vpn_title_long">VPN est ativadu dae <xliff:g id="app" example="FooVPN client">%s</xliff:g></string>
+    <string name="vpn_text">Toca pro gestire sa rete.</string>
+    <string name="vpn_text_long">Connessione istabilida cun <xliff:g id="session" example="office">%s</xliff:g>. Toca pro gestire sa rete.</string>
     <string name="vpn_lockdown_connecting">Colleghende a VPN semper ativu\u2026</string>
     <string name="vpn_lockdown_connected">Collegadu a VPN semper ativu</string>
+    <string name="vpn_lockdown_disconnected">Iscollegadu dae VPN semper ativa</string>
+    <string name="vpn_lockdown_error">Impossìbile connètere a sa VPN semper ativa</string>
+    <string name="vpn_lockdown_config">Càmbia rete o cunfiguratzione VPN</string>
     <string name="upload_file">Sèbera archìviu</string>
     <string name="no_file_chosen">Perunu archìviu seberadu</string>
     <string name="reset">Torra a impostare</string>
     <string name="submit">Imbia</string>
+    <string name="car_mode_disable_notification_title">Aplicatzione de ghia in funtzione</string>
+    <string name="car_mode_disable_notification_message">Toca pro essire dae s\'aplicatzione de ghia.</string>
     <string name="back_button_label">In segus</string>
     <string name="next_button_label">Imbeniente</string>
     <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>
     <string name="action_mode_done">Fatu</string>
+    <string name="progress_erasing">Cantzellende s\'archiviatzione cumpartzida\u2026</string>
     <string name="share">Cumpartzidura</string>
     <string name="find">Agata</string>
     <string name="websearch">Chirca web</string>
@@ -1302,6 +1508,7 @@
     <string name="add_account_button_label">Agiunghe contu</string>
     <string name="number_picker_increment_button">Cresche</string>
     <string name="number_picker_decrement_button">Mìnima</string>
+    <string name="number_picker_increment_scroll_mode"><xliff:g id="value" example="3">%s</xliff:g> toca e mantene.</string>
     <string name="number_picker_increment_scroll_action">Iscurre a susu pro crèschere e a bassu pro minimare.</string>
     <string name="time_picker_increment_minute_button">Cresche minutos</string>
     <string name="time_picker_decrement_minute_button">Mìnima minutos</string>
@@ -1335,13 +1542,26 @@
     <string name="action_menu_overflow_description">Àteras optziones</string>
     <string name="action_bar_home_description_format">%1$s, %2$s</string>
     <string name="action_bar_home_subtitle_description_format">%1$s, %2$s, %3$s</string>
+    <string name="storage_internal">Archiviatzione cumpartzida interna</string>
     <string name="storage_sd_card">ischeda SD</string>
     <string name="storage_sd_card_label"><xliff:g id="manufacturer" example="SanDisk">%s</xliff:g> ischeda SD</string>
     <string name="storage_usb_drive">Perifèrica USB</string>
     <string name="storage_usb_drive_label">Perifèrica USB <xliff:g id="manufacturer" example="Seagate">%s</xliff:g></string>
     <string name="storage_usb">Archiviatzione USB</string>
+    <string name="extract_edit_menu_button">Modìfica</string>
+    <string name="data_usage_warning_title">Avisu de impreu de datos</string>
+    <string name="data_usage_warning_body">As impreadu <xliff:g id="app" example="3.8GB">%s</xliff:g> de datos</string>
+    <string name="data_usage_mobile_limit_title">Cròmpidu a su lìmite de datos mòbiles</string>
     <string name="data_usage_wifi_limit_title">Cròmpidu a su lìmite de datos de su Wi-Fi</string>
+    <string name="data_usage_limit_body">Is datos si sunt pausados pro su restu de su tziclu</string>
+    <string name="data_usage_mobile_limit_snoozed_title">Barigadu su lìmite de datos mòbiles</string>
+    <string name="data_usage_wifi_limit_snoozed_title">Barigadu su lìmite de datos Wi-Fi</string>
+    <string name="data_usage_limit_snoozed_body">Nch\'as coladu <xliff:g id="size" example="3.8GB">%s</xliff:g> de su lìmite cunfiguradu</string>
     <string name="data_usage_restricted_title">Datos de isfundu limitados</string>
+    <string name="data_usage_restricted_body">Toca pro nde bogare sa restritzione</string>
+    <string name="data_usage_rapid_title">Impreu de datos mòbiles artu</string>
+    <string name="data_usage_rapid_body">Is aplicatziones ant impreadu prus datos de su normale</string>
+    <string name="data_usage_rapid_app_body"><xliff:g id="app" example="Calculator">%s</xliff:g> at impreadu prus datos de sa norma</string>
     <string name="ssl_certificate">Tzertificadu de seguresa</string>
     <string name="ssl_certificate_is_valid">Custu tzertificadu est bàlidu.</string>
     <string name="issued_to">Distribuidu a:</string>
@@ -1371,7 +1591,9 @@
     <string name="default_audio_route_name_dock_speakers">Altoparlantes</string>
     <string name="default_audio_route_name_hdmi">HDMI</string>
     <string name="default_audio_route_name_headphones">Cùfias</string>
+    <string name="default_audio_route_name_usb">USB</string>
     <string name="default_audio_route_category_name">Sistema</string>
+    <string name="bluetooth_a2dp_audio_route_name">Àudio Bluetooth</string>
     <string name="wireless_display_route_description">Ischermu chene filos</string>
     <string name="media_route_button_content_description">Trasmissione</string>
     <string name="media_route_chooser_title">Collega a su dispositivu</string>
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 911bbad..af422ae 100644
--- a/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/CompanionDeviceManager/res/values-cy/strings.xml
@@ -18,12 +18,27 @@
     <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 gyrchu dy &lt;strong&gt;<xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g>&lt;/strong&gt;</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="summary_watch">Mae angen yr ap hwn i reoli dy <xliff:g id="device_name" example="My Watch">%1$s</xliff:g>. Bydd <xliff:g id="app_name" example="Android Wear">%2$s</xliff:g> yn cael rhyngweithio â dy hysbysiadau a chael mynediad at ganiatâd dy Ffôn, Cysylltiadau, Calendr, logiau galwadau a Dyfeisiau cyfagos.</string>
     <string name="permission_apps">Apiau</string>
+    <string name="permission_apps_summary">Ffrydio apiau dy ffôn</string>
+    <string name="title_app_streaming">Caniatáu &lt;strong&gt;<xliff:g id="app_name" example="Exo">%1$s</xliff:g>&lt;/strong&gt; i gael mynediad at y wybodaeth hon o dy ffôn</string>
+    <string name="helper_title_app_streaming">Gwasanaethau traws dyfeisiau</string>
+    <string name="helper_summary_app_streaming">Mae <xliff:g id="app_name" example="GMS">%1$s</xliff:g> yn gofyn am ganiatâd ar ran dy <xliff:g id="device_type" example="Chromebook">%2$s</xliff:g> i ffrydio apiau rhwng dy ddyfeisiau</string>
+    <string name="title_computer">Caniatáu &lt;strong&gt;<xliff:g id="app_name" example="GMS">%1$s</xliff:g>&lt;/strong&gt; i gael mynediad at y wybodaeth hon o dy ddyfais</string>
     <string name="permission_notification">Hysbysiadau</string>
+    <string name="permission_notification_summary">Mae\u2019n gallu darllen pob hysbysiad, gan gynnwys gwybodaeth fel cysylltiadau, negeseuon a lluniau</string>
     <string name="permission_storage">Lluniau a chyfryngau</string>
     <string name="helper_title_computer">Gwasanaethau Google Play</string>
+    <string name="helper_summary_computer">Mae <xliff:g id="app_name" example="GMS">%1$s</xliff:g> yn gofyn am ganiatâd ar ran dy <xliff:g id="device_type" example="Chromebook">%2$s</xliff:g> i gael mynediad at luniau, cyfryngau a hysbysiadau dy ffôn</string>
     <string name="profile_name_generic">dyfais</string>
     <string name="consent_yes">Caniatáu</string>
     <string name="consent_no">Peidio â chaniatáu</string>
     <string name="consent_back">Nôl</string>
+    <string name="permission_sync_confirmation_title">Trosglwyddo caniatâd yr ap
+        i dy oriawr</string>
+    <string name="permission_sync_summary">I\'w wneud yn haws gosod dy oriawr,
+        bydd apiau a gosodir ar dy oriawr wrth ei osod yn defnyddio\u2019r un caniatâd a dy ffôn.\n\n
+        Gall hyn gynnwys caniatâd i gael mynediad at feicroffon a lleoliad dy oriawr.</string>
+    <string name="vendor_icon_description">Eicon yr ap</string>
+    <string name="vendor_header_button_description">Botwm Rhagor o Wybodaeth</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 83a8612..04abc73 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values-cy/strings.xml
@@ -87,18 +87,25 @@
     <string name="bluetooth_battery_level"><xliff:g id="battery_level_as_percentage">%1$s</xliff:g> batri</string>
     <string name="bluetooth_battery_level_untethered">Ch: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> batri, D: <xliff:g id="battery_level_as_percentage" example="25%">%2$s</xliff:g> batri</string>
     <string name="bluetooth_active_no_battery_level">Gweithredol</string>
+    <string name="bluetooth_hearing_aid_left_active">Gweithredol, chwith yn unig</string>
+    <string name="bluetooth_hearing_aid_right_active">Gweithredol, dde yn unig</string>
+    <string name="bluetooth_hearing_aid_left_and_right_active">Gweithredol, dde a chwith</string>
     <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_hid">Dyfeisiau mewnbwn</string>
     <string name="bluetooth_profile_pan">Mynediad at y rhyngrwyd</string>
+    <string name="bluetooth_profile_pbap">Rhannu cysylltiadau a hanes galwadau</string>
+    <string name="bluetooth_profile_pbap_summary">Defyddio ar gyfer rhannu cysylltiadau a hanes galwadau</string>
     <string name="bluetooth_profile_pan_nap">Rhannu cysylltiad i\'r rhyngrwyd</string>
     <string name="bluetooth_profile_map">Negeseuon Testun</string>
     <string name="bluetooth_profile_sap">Mynediad SIM</string>
     <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>
+    <string name="bluetooth_profile_le_audio">Sain LE</string>
     <string name="bluetooth_hearing_aid_profile_summary_connected">Cysylltwyd â theclynnau Cymorth Clyw</string>
+    <string name="bluetooth_le_audio_profile_summary_connected">Wedi cysylltu â sain LE</string>
     <string name="bluetooth_a2dp_profile_summary_connected">Wedi cysylltu â sain cyfryngau</string>
     <string name="bluetooth_headset_profile_summary_connected">Wedi cysylltu â sain ffôn</string>
     <string name="bluetooth_opp_profile_summary_connected">Wedi cysylltu â gweinydd trosglwyddo ffeiliau</string>
@@ -116,6 +123,7 @@
     <string name="bluetooth_opp_profile_summary_use_for">Defnyddio ar gyfer trosglwyddo ffeiliau</string>
     <string name="bluetooth_hid_profile_summary_use_for">Defnyddio ar gyfer mewnbynnu</string>
     <string name="bluetooth_hearing_aid_profile_summary_use_for">Defnyddio ar gyfer teclynnau Cymorth Clyw</string>
+    <string name="bluetooth_le_audio_profile_summary_use_for">Defnydio ar gyfer LE_AUDIO</string>
     <string name="bluetooth_pairing_accept">Paru</string>
     <string name="bluetooth_pairing_accept_all_caps">PARU</string>
     <string name="bluetooth_pairing_decline">Diddymu</string>
@@ -390,6 +398,7 @@
     <string name="force_resizable_activities_summary">Gwneud pob gweithgaredd yn ailfeintiol ar gyfer aml-ffenestr, beth bynnag eu gwerth maniffest.</string>
     <string name="enable_freeform_support">Galluogi ffenestri ffurfrydd</string>
     <string name="enable_freeform_support_summary">Galluogi cefnogaeth ar gyfer ffenestri ffurfrydd arbrofol.</string>
+    <string name="desktop_mode">Modd bwrdd gwaith</string>
     <string name="local_backup_password_title">Cyfrinair cadw wrth gefn i gyfrifiadur</string>
     <string name="local_backup_password_summary_none">Dyw copïau llawn wrth gefn i gyfrifiadur ddim yn cael eu diogelu ar hyn o bryd.</string>
     <string name="local_backup_password_summary_change">Tapia i newid neu dynnu\'r cyfrinair ar gyfer cadw popeth wrth gefn ar gyfrifiadur.</string>
@@ -430,6 +439,12 @@
     <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[        Gall cywiriad lliw fod o help fan fyddi di eisiau:<br/>
+        <ol>
+            <li>&nbsp;Gweld lliwiau yn fwy cywir</li>
+            <li>&nbsp;Tynnu 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>
@@ -456,6 +471,8 @@
     <string name="power_charging"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="state">%2$s</xliff:g></string>
     <string name="power_remaining_charging_duration_only"><xliff:g id="time">%1$s</xliff:g> nes yn llawn</string>
     <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="time">%2$s</xliff:g> nes yn llawn</string>
+    <string name="power_charging_limited"><xliff:g id="level">%1$s</xliff:g> - Gwefru wedi\u2019i optimeiddio</string>
+    <string name="power_charging_future_paused"><xliff:g id="level">%1$s</xliff:g> - Gwefru wedi\u2019i optimeiddio</string>
     <string name="battery_info_status_unknown">Anhysybys</string>
     <string name="battery_info_status_charging">Yn gwefru</string>
     <string name="battery_info_status_charging_fast">Yn gwefru\'n gyflym</string>
@@ -465,7 +482,9 @@
     <string name="battery_info_status_discharging">Dim yn gwefru</string>
     <string name="battery_info_status_not_charging">Wedi cysylltu, dim yn gwefru</string>
     <string name="battery_info_status_full">Wedi gwefru</string>
+    <string name="battery_info_status_full_charged">Wedi Gwefru\u2019n Llawn</string>
     <string name="disabled_by_admin_summary_text">Rheolir gan weinyddwr</string>
+    <string name="disabled_by_app_ops_text">Rheolir gan Osodiad Cyfyngedig</string>
     <string name="disabled">Wedi\'i analluogi</string>
     <string name="external_source_trusted">Caniateir</string>
     <string name="external_source_untrusted">Ni chaniateir</string>
@@ -499,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>
@@ -570,19 +596,45 @@
     <string name="add_user_failed">Methwyd â chreu defnyddiwr newydd</string>
     <string name="add_guest_failed">Methwyd â chreu gwesti newydd</string>
     <string name="user_nickname">Llysenw</string>
+    <string name="user_add_user">Ychwanegu defnyddiwr</string>
     <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_reset_guest_dialog_title">Ailosod gwestai?</string>
+    <string name="guest_remove_guest_dialog_title">Tynnu\'r gwestai?</string>
     <string name="guest_reset_guest_confirm_button">Ailosod</string>
+    <string name="guest_remove_guest_confirm_button">Tynnu</string>
     <string name="guest_resetting">Yn ailosod gwestai\u2026</string>
+    <string name="guest_reset_and_restart_dialog_title">Ailosod sesiwn defnyddiwr?</string>
+    <string name="guest_reset_and_restart_dialog_message">Bydd hyn yn dechrau sesiwn gwestai
+newydd ac yn dileu holl apiau a data\u2019r sesiwn cyfredol</string>
+    <string name="guest_exit_dialog_title">Gadael modd gwestai?</string>
+    <string name="guest_exit_dialog_message">Bydd hyn yn dileu
+        apiau a data o\'r sesiwn gwestai cyfredol</string>
+    <string name="guest_exit_dialog_button">Gadael</string>
+    <string name="guest_exit_dialog_title_non_ephemeral">Cadw gweithgaredd gwestai?</string>
+    <string name="guest_exit_dialog_message_non_ephemeral">Gellir cadw gweithgaredd o\'r
+        sesiwn cyfredol neu dileu\'r holl data ac apiau</string>
+    <string name="guest_exit_clear_data_button">Dileu</string>
+    <string name="guest_exit_save_data_button">Cadw</string>
+    <string name="guest_exit_button">Gadael modd gwestai</string>
+    <string name="guest_reset_button">Ailosod sesiwn defnyddiwr</string>
+    <string name="guest_exit_quick_settings_button">Tynnu gwestai</string>
+    <string name="guest_notification_ephemeral">Caiff yr holl weithgaredd ei ddileu wrth adael</string>
+    <string name="guest_notification_non_ephemeral">Gellir cadw neu dileu dy weithgaredd wrth adael</string>
+    <string name="guest_notification_non_ephemeral_non_first_login">Ailosoda i ddileu gweithgaredd sesiwn
+nawr, neu gellir ei gadw a dileu gweithgaredd wrth adael</string>
     <string name="user_image_take_photo">Tynnu llun</string>
     <string name="user_image_choose_photo">Dewisa ddelwedd</string>
     <string name="user_image_photo_selector">Dewis y llun</string>
+    <string name="failed_attempts_now_wiping_device">Gormod o ymdrechion anghywir. Caiff data\'r ddyfais hon ei ddileu.</string>
+    <string name="failed_attempts_now_wiping_user">Gormod o ymdrechion anghywir. Caiff y defnyddiwr hwn ei ddileu.</string>
+    <string name="failed_attempts_now_wiping_profile">Gormod o ymdrechion anghywir. Caiff y proffil gwaith hwn ei ddileu.</string>
+    <string name="failed_attempts_now_wiping_dialog_dismiss">Diystyru</string>
     <string name="cached_apps_freezer_device_default">Rhagosodiad y ddyfais</string>
     <string name="cached_apps_freezer_disabled">Wedi\'i analluogi</string>
     <string name="cached_apps_freezer_enabled">Galluogwyd</string>
-    <string name="cached_apps_freezer_reboot_dialog_text">Rhaid ailgychwyn dy ddyfais er mwyn i\'r newid hwn fod yn berthnasol. Ailgychwyna nawr neu ddiddymu.</string>
+    <string name="cached_apps_freezer_reboot_dialog_text">Rhaid ailgychwyn dy ddyfais er mwyn i\'r newid hwn fod yn berthnasol. Ailgychwyna nawr neu diddymu.</string>
     <string name="media_transfer_wired_usb_device_name">Clustffonau gwifr</string>
     <string name="wifi_hotspot_switch_on_text">Ymlaen</string>
     <string name="wifi_hotspot_switch_off_text">I ffwrdd</string>
@@ -614,8 +666,19 @@
     <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="avatar_picker_title">Dewis llun proffil</string>
+    <string name="default_user_icon_description">Eicon defnyddiwr rhagosodedig</string>
     <string name="physical_keyboard_title">Bysellfwrdd corfforol</string>
     <string name="keyboard_layout_dialog_title">Dewis gosodiad bysellfwrdd</string>
     <string name="keyboard_layout_default_label">Arferol</string>
     <string name="turn_screen_on_title">Troi\'r sgrin ymlaen</string>
+    <string name="allow_turn_screen_on">Caniatáu troi\'r sgrin ymlaen</string>
+    <string name="allow_turn_screen_on_description">Ychwanegu ap i droi\u2019r sgrin ymlaen. Os rhoddir, bydd yr ap yn gallu troi\u2019r sgrin ymlaen unrhyw bryd heb i ti fod wedi dewis gwneud.</string>
+    <string name="bt_le_audio_broadcast_dialog_title">Stopio darlledu <xliff:g id="app_name" example="App Name 1">%1$s</xliff:g>?</string>
+    <string name="bt_le_audio_broadcast_dialog_sub_title">Os wyt yn darlledu <xliff:g id="switchApp" example="App Name 2">$1%s</xliff:g> neu newid yr allbwn, bydd dy ddarllediad cyfredol yn stopio</string>
+    <string name="bt_le_audio_broadcast_dialog_switch_app">Darlledu <xliff:g id="switchApp" example="App Name 2">%1$s</xliff:g></string>
+    <string name="bt_le_audio_broadcast_dialog_different_output">Newid allbwn</string>
+    <string name="back_navigation_animation">Animeiddiadau ystum yn ôl</string>
+    <string name="back_navigation_animation_summary">Galluogi animeiddiadau system ar gyfer rhagweld mynd yn ôl.</string>
+    <string name="back_navigation_animation_dialog">Mae\u2019r gosodiad hwn yn galluogi animeiddiadau system ar gyfer animeiddiad ystumiau a ragwelir. Mae arno angen fesul ap gosod \"enableOnBackInvokedCallback\" i \'true\' yn y ffeil maniffest.</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 9184ac2..e1e9c06 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
@@ -78,9 +78,6 @@
     <string name="kg_prompt_reason_restart_pattern">Tienes de dibuxar el patrón darréu de reaniciar el preséu</string>
     <string name="kg_prompt_reason_restart_pin">Tienes d\'introducir el PIN darréu de reaniciar el preséu</string>
     <string name="kg_prompt_reason_restart_password">Tienes d\'introducir la contraseña darréu de reaniciar el preséu</string>
-    <string name="kg_prompt_reason_timeout_pattern">Tienes de dibuxar el patrón pa tener más seguranza</string>
-    <string name="kg_prompt_reason_timeout_pin">Tienes d\'introducir el PIN pa tener más seguranza</string>
-    <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_face_not_recognized">Nun se reconoz</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 fefdec6..d207672 100644
--- a/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res-keyguard/values-cy/strings.xml
@@ -24,9 +24,11 @@
     <string name="keyguard_sim_error_message_short">Cerdyn Annilys.</string>
     <string name="keyguard_charged">Wedi gwefru</string>
     <string name="keyguard_plugged_in_wireless"><xliff:g id="percentage" example="20%">%s</xliff:g> • Yn gwefru\u2019n ddiwifr</string>
+    <string name="keyguard_plugged_in_dock"><xliff:g id="percentage" example="20%">%s</xliff:g> • Yn gwefru</string>
     <string name="keyguard_plugged_in"><xliff:g id="percentage">%s</xliff:g> • Yn gwefru</string>
     <string name="keyguard_plugged_in_charging_fast"><xliff:g id="percentage">%s</xliff:g> • Yn gwefru\'n gyflym</string>
     <string name="keyguard_plugged_in_charging_slowly"><xliff:g id="percentage">%s</xliff:g> • Yn gwefru\'n araf</string>
+    <string name="keyguard_plugged_in_charging_limited"><xliff:g id="percentage">%s</xliff:g> • Gwefru wedi\u2019i optimeiddio i warchod y batri</string>
     <string name="keyguard_instructions_when_pattern_disabled">Gwasga Dewislen i ddatgloi.</string>
     <string name="keyguard_network_locked_message">Rhwydwaith wedi\'i gloi</string>
     <string name="keyguard_missing_sim_message_short">Dim cerdyn SIM</string>
@@ -49,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>
@@ -69,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>
@@ -77,13 +98,29 @@
     <string name="kg_prompt_reason_restart_pattern">Rhaid rhoi\'r patrwm ar ôl ailgychwyn y ddyfais</string>
     <string name="kg_prompt_reason_restart_pin">Rhaid rhoi\'r PIN ar ôl ailgychwyn y ddyfais</string>
     <string name="kg_prompt_reason_restart_password">Rhaid rhoi\'r cyfrinair ar ôl ailgychwyn y ddyfais</string>
-    <string name="kg_prompt_reason_timeout_pattern">Rhaid rhoi\'r patrwm fel cam diogelwch ychwanegol</string>
-    <string name="kg_prompt_reason_timeout_pin">Rhaid rhoi\'r PIN fel cam diogelwch ychwanegol</string>
-    <string name="kg_prompt_reason_timeout_password">Rhaid rhoi\'r cyfrinair fel cam diogelwch ychwanegol</string>
+    <string name="kg_prompt_reason_timeout_pattern">Am ddiogelwch ychwanegol, defnyddia batrwm yn lle</string>
+    <string name="kg_prompt_reason_timeout_pin">Am ddiogelwch ychwanegol, defnyddia PIN yn lle</string>
+    <string name="kg_prompt_reason_timeout_password">Am ddiogelwch ychwanegol, defnyddia gyfrinair yn lle</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_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>
+    <string name="keyguard_unlock_to_continue">Datglo dy ddyfais i barhau</string>
 </resources>
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 0a45f25..48c93a7 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
@@ -78,9 +78,6 @@
     <string name="kg_prompt_reason_restart_pattern">Tha pàtran riatanach an dèidh an t-uidheam ath-thòiseachadh</string>
     <string name="kg_prompt_reason_restart_pin">Tha PIN riatanach an dèidh an t-uidheam ath-thòiseachadh</string>
     <string name="kg_prompt_reason_restart_password">Tha facal-faire riatanach an dèidh an t-uidheam ath-thòiseachadh</string>
-    <string name="kg_prompt_reason_timeout_pattern">Tha pàtran riatanach a chùm barrachd tèarainteachd</string>
-    <string name="kg_prompt_reason_timeout_pin">Tha PIN riatanach a chùm barrachd tèarainteachd</string>
-    <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_face_not_recognized">Gun aithneachadh</string>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-ast-rES/strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values-ast-rES/strings.xml
index 4e6abaa..23c4534 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
@@ -96,7 +96,6 @@
     <string name="accessibility_camera_button">Cámara</string>
     <string name="accessibility_phone_button">Teléfonu</string>
     <string name="accessibility_voice_assist_button">Asistencia per voz</string>
-    <string name="accessibility_unlock_button">Desbloquiar</string>
     <string name="accessibility_scanning_face">Escaniando la cara</string>
     <string name="accessibility_send_smart_reply">Unviar</string>
     <string name="cancel">Encaboxar</string>
@@ -139,7 +138,6 @@
     <string name="accessibility_airplane_mode">Mou avión.</string>
     <string name="accessibility_vpn_on">VPN activada.</string>
     <string name="accessibility_battery_level"><xliff:g id="number">%d</xliff:g> por cientu de batería.</string>
-    <string name="accessibility_battery_level_with_estimate"><xliff:g id="percentage" example="95%">%1$s</xliff:g> por cientu de batería, aproximadamente <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g> según el to usu</string>
     <string name="accessibility_battery_level_charging">Batería en carga, <xliff:g id="battery_percentage">%d</xliff:g> por cientu.</string>
     <string name="accessibility_overflow_action">Ver tolos avisos</string>
     <string name="accessibility_tty_enabled">Teletipu activáu.</string>
@@ -588,6 +586,7 @@
     <string name="mobile_data_disable_title">¿Quies desactivar los datos móviles?</string>
     <string name="mobile_data_disable_message">Nun vas tener accesu a los datos nin a internet pente «<xliff:g id="carrier" example="T-Mobile">%s</xliff:g>». La conexón a internet namás va tar disponible per Wi-Fi.</string>
     <string name="mobile_data_disable_message_default_carrier">la to operadora</string>
+    <string name="auto_data_switch_dialog_negative_button">Non, gracies</string>
     <string name="touch_filtered_warning">Pola mor d\'una aplicación que bloquía la solicitú de
         permisos, «Axustes» nun pue verificar la to rempuesta.</string>
     <string name="slice_permission_title">¿Quies permitir que «<xliff:g id="app" example="Example App">%1$s</xliff:g> amuese fragmentos de l\'aplicación «<xliff:g id="app_2" example="Other Example App">%2$s</xliff:g>»?</string>
@@ -691,4 +690,5 @@
     <string name="clipboard_edit_text_done">Fecho</string>
     <string name="clipboard_overlay_window_name">Cartafueyu</string>
     <string name="add">Amestar</string>
+    <string name="rear_display_bottom_sheet_cancel">Encaboxar</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 d8c493d..4b7e014 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-cy/strings.xml
@@ -73,6 +73,7 @@
     <string name="screenshot_failed_to_save_unknown_text">Rho gynnig ar gymryd sgrinlun eto</string>
     <string name="screenshot_failed_to_save_text">Methu cadw\'r sgrinlun</string>
     <string name="screenshot_failed_to_capture_text">Ni chaniateir cymryd sgrinluniau gan yr ap neu dy sefydliad.</string>
+    <string name="screenshot_blocked_by_admin">Mae tynnu sgrinluniau wedi\'i rwystro gan dy weinyddwr TG</string>
     <string name="screenshot_edit_label">Golygu</string>
     <string name="screenshot_edit_description">Golygu\'r sgrinlun</string>
     <string name="screenshot_share_description">Rhannu\'r sgrinlun</string>
@@ -114,7 +115,6 @@
     <string name="accessibility_voice_assist_button">Cymorth Llais</string>
     <string name="accessibility_wallet_button">Waled</string>
     <string name="accessibility_qr_code_scanner_button">Sganiwr Codau QR</string>
-    <string name="accessibility_unlock_button">Datgloi</string>
     <string name="accessibility_lock_icon">Dyfais dan glo</string>
     <string name="accessibility_scanning_face">Sganio wyneb</string>
     <string name="accessibility_send_smart_reply">Anfon</string>
@@ -160,7 +160,6 @@
     <string name="accessibility_airplane_mode">Modd awyren.</string>
     <string name="accessibility_vpn_on">VPN ymlaen.</string>
     <string name="accessibility_battery_level">Batri <xliff:g id="number">%d</xliff:g> y cant.</string>
-    <string name="accessibility_battery_level_with_estimate">Batri <xliff:g id="percentage" example="95%">%1$s</xliff:g>\u066A, tua <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g> yn weddill yn seiliedig ar dy ddefnydd</string>
     <string name="accessibility_battery_level_charging">Batri\'n gwefru, <xliff:g id="battery_percentage">%d</xliff:g> y cant.</string>
     <string name="accessibility_overflow_action">Gweld pob hysbysiad</string>
     <string name="accessibility_tty_enabled">Galluogwyd TeleTypewriter (TTY).</string>
@@ -190,6 +189,10 @@
     <string name="accessibility_sensors_off_active">Synhwyryddion i ffwrdd ar waith</string>
     <string name="accessibility_clear_all">Clirio pob hysbysiad.</string>
     <string name="notification_group_overflow_indicator">+ <xliff:g id="number" example="3">%s</xliff:g></string>
+    <string name="notification_group_overflow_description">{count, plural,
+        =1 {# hysbysiad arall tu mewn.}
+        other {# hysbysiad arall tu mewn.}
+    }</string>
     <string name="accessibility_rotation_lock_on_landscape">Mae\'r sgrin wedi\'i chloi yn y gorweddiad tirwedd.</string>
     <string name="accessibility_rotation_lock_on_portrait">Mae\'r sgrin wedi\'i chloi yn y gorweddiad darlun.</string>
     <string name="dessert_case">Cyflwyniad Pwdinau</string>
@@ -228,7 +231,6 @@
     <string name="quick_settings_brightness_dialog_title">Disgleirdeb</string>
     <string name="quick_settings_inversion_label">Gwrthdroad lliwiau</string>
     <string name="quick_settings_color_correction_label">Cywiriad lliw</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>
     <string name="quick_settings_connected">Wedi cysylltu</string>
@@ -237,6 +239,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>
@@ -312,6 +320,11 @@
     <string name="guest_wipe_session_wipe">Dechrau eto</string>
     <string name="guest_wipe_session_dontwipe">Ydw, parhau</string>
     <string name="user_limit_reached_title">Terfyn defnyddwyr wedi\'i gyrraedd</string>
+    <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>
@@ -426,7 +439,7 @@
     <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>
     <string name="wallet_lockscreen_settings_label">Gosodiadau\'r sgrin cloi</string>
-    <string name="qr_code_scanner_title">Sganio cod QR</string>
+    <string name="qr_code_scanner_updating_secondary_label">Yn diweddaru</string>
     <string name="status_bar_work">Proffil gwaith</string>
     <string name="status_bar_airplane">Modd awyren</string>
     <string name="zen_alarm_warning_indef">Ni fyddi\'n clywed dy larwm nesaf tan <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g> oni bai dy fod yn diffodd hwn cyn hynny.</string>
@@ -436,8 +449,8 @@
     <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>
-    <string name="tuner_warning">Mae Tiwniwr Rhyngwyneb y System yn rhoi dulliau ychwanegol i addasu rhyngwyneb defnyddiwr Android. Gall rhai nodweddion arbrofol cael eu haddasu, torri neu ddiflannu mewn fersiynau yn y dyfodol. Defnyddia â gofal.</string>
-    <string name="tuner_persistent_warning">Gall rhai nodweddion arbrofol cael eu haddasu, torri neu ddiflannu mewn fersiynau yn y dyfodol. Defnyddia â gofal.</string>
+    <string name="tuner_warning">Mae Tiwniwr Rhyngwyneb y System yn rhoi dulliau ychwanegol i addasu rhyngwyneb defnyddiwr Android. Gall rhai nodweddion arbrofol cael eu haddasu, torri neu diflannu mewn fersiynau yn y dyfodol. Defnyddia â gofal.</string>
+    <string name="tuner_persistent_warning">Gall rhai nodweddion arbrofol cael eu haddasu, torri neu diflannu mewn fersiynau yn y dyfodol. Defnyddia â gofal.</string>
     <string name="got_it">Deall yn iawn</string>
     <string name="tuner_toast">Llongyfarchiadau! Mae Tiwniwr Rhyngwyneb y System wedi ei ychwanegu i\'r Gosodiadau.</string>
     <string name="remove_from_settings">Tynnu o\'r Gosodiadau</string>
@@ -478,7 +491,7 @@
     <string name="notification_conversation_summary_low">Dim sain na dirgryniad ac mae\'n ymddangos yn is yn yr adran sgwrsio</string>
     <string name="notification_channel_summary_default">Gall ganu neu ddirgrynu yn seiliedig ar osodiadau\'r ffôn</string>
     <string name="notification_channel_summary_default_with_bubbles">Gall ganu neu ddirgrynu yn dibynnu ar osodiadau\'r ffôn. Mae sgyrsiau gan <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> fel swigod yn rhagosodedig.</string>
-    <string name="notification_channel_summary_automatic">Cael y system i bennu a ddylai\'r hysbysiad hwn wneud sain neu ddirgrynu</string>
+    <string name="notification_channel_summary_automatic">Cael y system i bennu a ddylai\'r hysbysiad hwn wneud sain neu dirgrynu</string>
     <string name="notification_channel_summary_automatic_alerted">&lt;b&gt;Statws:&lt;/b&gt; Wedi\'i codi i Rhagosodiad</string>
     <string name="notification_channel_summary_automatic_silenced">&lt;b&gt;Statws:&lt;/b&gt; Wedi\'i ddisgyn i Tawel</string>
     <string name="notification_channel_summary_automatic_promoted">&lt;b&gt;Statws:&lt;/b&gt; Wedi\'i Osod yn Uwch</string>
@@ -512,6 +525,16 @@
     <string name="notification_menu_snooze_action">Atgoffa fi</string>
     <string name="snooze_undo">Dad-wneud</string>
     <string name="snoozed_for_time">Ar oediad am <xliff:g id="time_amount" example="15 minutes">%1$s</xliff:g></string>
+    <string name="snoozeHourOptions">{count, plural,
+       =1 {# awr}
+        =2 {# awr}
+        other {# awr}
+    }</string>
+    <string name="snoozeMinuteOptions">{count, plural,
+        =1 {# funud}
+        two {# funud}
+        other {# munud}
+    }</string>
     <string name="battery_detail_switch_title">Arbedwr Batri</string>
     <string name="keyboard_key_button_template">Botwm <xliff:g id="name">%1$s</xliff:g></string>
     <string name="keyboard_key_home">Cartref</string>
@@ -658,6 +681,7 @@
     <string name="notification_channel_battery">Batri</string>
     <string name="notification_channel_screenshot">Sgrinluniau</string>
     <string name="notification_channel_instant">Apiau ar Unwaith</string>
+    <string name="notification_channel_setup">Gosod</string>
     <string name="notification_channel_storage">Storfa</string>
     <string name="notification_channel_hints">Awgrymiadau</string>
     <string name="instant_apps">Apiau ar Unwaith</string>
@@ -680,6 +704,7 @@
     <string name="mobile_data_disable_title">Troi data symudol i ffwrdd?</string>
     <string name="mobile_data_disable_message">Ni fydd gennyt fynediad at ddata na\'r rhyngrwyd trwy <xliff:g id="carrier" example="T-Mobile">%s</xliff:g>. Bydd y rhyngrwyd ond ar gael dros Wi-Fi.</string>
     <string name="mobile_data_disable_message_default_carrier">dy ddarparwr gwasanaeth</string>
+    <string name="auto_data_switch_dialog_negative_button">Dim diolch</string>
     <string name="touch_filtered_warning">Ni all Gosodiadau gwirio dy ymateb gan fod ap yn rhwystro cais am ganiatâd.</string>
     <string name="slice_permission_title">Caniatáu i <xliff:g id="app" example="Example App">%1$s</xliff:g> ddangos sleisiau <xliff:g id="app_2" example="Other Example App">%2$s</xliff:g>?</string>
     <string name="slice_permission_text_1"> - Gall ddarllen gwybodaeth o <xliff:g id="app" example="Example App">%1$s</xliff:g></string>
@@ -731,6 +756,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="accessibility_control_favorite">Ffefrynwyd</string>
     <string name="accessibility_control_favorite_position">Ffefrynwyd, safle <xliff:g id="number" example="1">%d</xliff:g></string>
@@ -797,7 +827,9 @@
     <string name="media_output_dialog_button_stop_casting">Stopio taflu</string>
     <string name="media_output_dialog_accessibility_seekbar">Uchder sain</string>
     <string name="media_output_broadcast">Darlledu</string>
+    <string name="media_output_broadcast_code">Cyfrinair</string>
     <string name="media_output_broadcast_dialog_save">Cadw</string>
+    <string name="media_output_broadcast_starting">Yn dechrau…</string>
     <string name="media_output_broadcast_update_error">Methu cadw. Ceisia eto.</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>
@@ -865,6 +897,10 @@
     <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_footer_label">{count, plural,
+=1 {Mae # ap yn weithredol}
+        other {Mae # ap yn weithredol}
+    }</string>
     <string name="fgs_dot_content_description">Gwybodaeth newydd</string>
     <string name="fgs_manager_dialog_title">Apiau gweithredol</string>
     <string name="fgs_manager_app_item_stop_button_label">Stopio</string>
@@ -878,4 +914,9 @@
     <string name="clipboard_edit">golygu</string>
     <string name="add">Ychwanegu</string>
     <string name="manage_users">Rheoli defnyddwyr</string>
+    <string name="dream_overlay_status_bar_notification_indicator">{count, plural,
+=1 {# hysbysiad}
+    other {# hysbysiad}
+    }</string>
+    <string name="rear_display_bottom_sheet_cancel">Diddymu</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 c06bbad..0af6f17 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-eo/strings.xml
@@ -30,4 +30,5 @@
     <string name="status_bar_airplane">Aviadila reĝimo</string>
     <string name="keyboard_shortcut_group_system_notifications">Sciigoj</string>
     <string name="controls_media_settings_button">Agordoj</string>
+    <string name="rear_display_bottom_sheet_cancel">Nuligi</string>
 </resources>
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 7d8efd5..a319f89 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-gd/strings.xml
@@ -95,7 +95,6 @@
     <string name="accessibility_camera_button">Camara</string>
     <string name="accessibility_phone_button">Fòn</string>
     <string name="accessibility_voice_assist_button">Taic gutha</string>
-    <string name="accessibility_unlock_button">Thoir a’ ghlas dheth</string>
     <string name="accessibility_scanning_face">A’ sganadh d’ aodainn</string>
     <string name="accessibility_send_smart_reply">Cuir</string>
     <string name="cancel">Sguir dheth</string>
@@ -138,7 +137,6 @@
     <string name="accessibility_airplane_mode">Modh itealain.</string>
     <string name="accessibility_vpn_on">Tha VPN air.</string>
     <string name="accessibility_battery_level">Tha <xliff:g id="number">%d</xliff:g> sa cheud aig a’ bhataraidh.</string>
-    <string name="accessibility_battery_level_with_estimate">Tha am bataraidh air <xliff:g id="percentage" example="95%">%1$s</xliff:g> sa cheud, foghnaidh seo do mu <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g> stèidhichte air do chleachdadh</string>
     <string name="accessibility_battery_level_charging">Tha am bataraidh ’ga theàirrdseadh, <xliff:g id="battery_percentage">%d</xliff:g> sa cheud.</string>
     <string name="accessibility_overflow_action">Seall gach brath</string>
     <string name="accessibility_tty_enabled">Tha am fònadh teacsa an comas.</string>
@@ -582,6 +580,7 @@
     <string name="mobile_data_disable_title">An cuir thu dheth dàta mobile?</string>
     <string name="mobile_data_disable_message">Cha bhi cothrom agad air dàta no an t-eadar-lìon slighe <xliff:g id="carrier" example="T-Mobile">%s</xliff:g>. Chan fhaigh thu an t-eadar-lìon ach slighe WiFi.</string>
     <string name="mobile_data_disable_message_default_carrier">a’ ghiùlanair agad</string>
+    <string name="auto_data_switch_dialog_negative_button">Cha chuir mi seo an comas</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="slice_permission_title">A bheil thu airson cead a thoirt dha <xliff:g id="app" example="Example App">%1$s</xliff:g> ach an seall e slisean dhe <xliff:g id="app_2" example="Other Example App">%2$s</xliff:g>?</string>
@@ -668,4 +667,5 @@
     <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>
+    <string name="rear_display_bottom_sheet_cancel">Sguir dheth</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 43d26b6..11c4fdf 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
@@ -44,7 +44,6 @@
     <string name="accessibility_camera_button">Takamiṛat</string>
     <string name="accessibility_phone_button">Tiliɣri</string>
     <string name="accessibility_voice_assist_button">Amarag aɣectan</string>
-    <string name="accessibility_unlock_button">Serreḥ</string>
     <string name="accessibility_send_smart_reply">Azen</string>
     <string name="cancel">Sefsex</string>
     <string name="biometric_dialog_confirm">Sentem</string>
@@ -199,6 +198,7 @@
     <string name="notification_channel_hints">Astuces</string>
     <string name="app_info">Talɣut n usnas</string>
     <string name="mobile_data">Isefka izirazen</string>
+    <string name="auto_data_switch_dialog_negative_button">Uhu tannemmit</string>
     <string name="slice_permission_allow">Sireg</string>
     <string name="slice_permission_deny">Aggi</string>
     <string name="no_auto_saver_action">Uhu tannemmit</string>
@@ -229,4 +229,5 @@
     <string name="clipboard_edit_text_done">Immed</string>
     <string name="clipboard_overlay_window_name">Ɣef afus</string>
     <string name="add">Rnu</string>
+    <string name="rear_display_bottom_sheet_cancel">Sefsex</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 65a45e8..97f3378 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-ku/strings.xml
@@ -34,7 +34,6 @@
     <string name="accessibility_recent">پیشاندانی گشتی</string>
     <string name="accessibility_camera_button">کامێرا</string>
     <string name="accessibility_phone_button">تەلەفۆن</string>
-    <string name="accessibility_unlock_button">کردنەوە</string>
     <string name="accessibility_bluetooth_connected">بلوتوس پەیوەندکراوە.</string>
     <string name="accessibility_bluetooth_name">پەیوەندکراوە بە <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
     <string name="accessibility_not_connected">نەبەستراوەتەوە.</string>
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 7680ff5..086db93 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values-lb/strings.xml
@@ -36,7 +36,6 @@
     <string name="accessibility_recent">Iwwersiicht</string>
     <string name="accessibility_camera_button">Fotoapparat</string>
     <string name="accessibility_phone_button">Telefon</string>
-    <string name="accessibility_unlock_button">Entspären</string>
     <string name="accessibility_bluetooth_connected">Bluetooth connectéiert.</string>
     <string name="accessibility_bluetooth_name">Verbonne mat <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
     <string name="accessibility_not_connected">Net connectéiert.</string>
@@ -120,6 +119,7 @@
     <string name="tuner_time">Zäit</string>
     <string name="tuner_menu">Menü</string>
     <string name="app_info">App-Info</string>
+    <string name="auto_data_switch_dialog_negative_button">Nee Merci</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>
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 79950e1..53c1edf 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
@@ -66,7 +66,6 @@
     <string name="accessibility_camera_button">Fotocàmera</string>
     <string name="accessibility_phone_button">Telèfonu</string>
     <string name="accessibility_voice_assist_button">Assistèntzia de boghe</string>
-    <string name="accessibility_unlock_button">Isbloca</string>
     <string name="cancel">Annulla</string>
     <string name="biometric_dialog_empty_space_description">Toca pro annullare s\'autenticatzione</string>
     <string name="biometric_dialog_authenticated">Autenticadu</string>
@@ -230,6 +229,7 @@
     <string name="accessibility_qs_edit_tile_start_add">Agiunghe casella</string>
     <string name="tuner_menu">Menù</string>
     <string name="app_info">Informatziones de s\'aplicatzione</string>
+    <string name="auto_data_switch_dialog_negative_button">No, gràtzias</string>
     <string name="slice_permission_allow">Permite</string>
     <string name="slice_permission_deny">Nega</string>
     <string name="no_auto_saver_action">No, gràtzias</string>
@@ -240,4 +240,5 @@
     <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>
+    <string name="rear_display_bottom_sheet_cancel">Annulla</string>
 </resources>
diff --git a/overlay/packages/apps/Camera2/res/values-cy/strings.xml b/overlay/packages/apps/Camera2/res/values-cy/strings.xml
index 5ec9b2a..57f6dad 100644
--- a/overlay/packages/apps/Camera2/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Camera2/res/values-cy/strings.xml
@@ -155,7 +155,7 @@
     <string name="dialog_cancel">Diddymu</string>
     <string name="dialog_report">Rhoi Adborth</string>
     <string name="dialog_dismiss">Diystyru</string>
-    <string name="spaceIsLow_content" product="default">Mae dy gerdyn SD yn rhedeg yn brin o le. Newidia\'r gosodiad ansawdd neu ddileu rhai delweddau neu ffeiliau eraill.</string>
+    <string name="spaceIsLow_content" product="default">Mae dy gerdyn SD yn rhedeg yn brin o le. Newidia\'r gosodiad ansawdd neu dileu rhai delweddau neu ffeiliau eraill.</string>
     <string name="video_reach_size_limit">Wedi cyrraedd y terfyn maint.</string>
     <string name="pano_too_fast_prompt">Rhy gyflym</string>
     <string name="pano_dialog_prepare_preview">Yn paratoi\'r panorama</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/Notification/res/values-cy/strings.xml b/overlay/packages/apps/Car/Notification/res/values-cy/strings.xml
index 183ca8b..91914a8 100644
--- a/overlay/packages/apps/Car/Notification/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/Notification/res/values-cy/strings.xml
@@ -34,5 +34,7 @@
     <string name="notification_older">Hysbysiadau hŷn</string>
     <string name="empty_notification_header">Dim hysbysiadau</string>
     <string name="show_count_more">Dangos <xliff:g id="count">%d</xliff:g> yn rhagor</string>
+    <string name="see_more_message">Gweld mwy</string>
+    <string name="restricted_hun_message_content">Neges newydd</string>
     <string name="manage_text">Rheoli</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 ae4dc3f..d1bc646 100644
--- a/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Car/Settings/res/values-cy/strings.xml
@@ -24,6 +24,11 @@
     <string name="night_mode_tile_label">Modd nos</string>
     <string name="network_and_internet">Rhwydwaith a\'r rhyngrwyd</string>
     <string name="mobile_network_settings">Rhwydwaith symudol</string>
+    <string name="mobile_network_summary_count">        {count, plural,
+            =1    {# SIM}
+            other {# SIM}
+        }
+    </string>
     <string name="mobile_network_active_sim">Gweithredol / SIM</string>
     <string name="mobile_network_inactive_sim">Anweithredol / SIM</string>
     <string name="mobile_network_active_esim">Gweithredol / SIM wedi\u2019i lawrlwytho</string>
@@ -32,6 +37,7 @@
     <string name="mobile_network_toggle_title">Data symudol</string>
     <string name="mobile_network_toggle_summary">Defnyddio\'r rhwydwaith symudol fel cysylltiad data</string>
     <string name="mobile_network_mobile_network_toggle_title">Rhwydwaith symudol</string>
+    <string name="mobile_network_mobile_network_toggle_summary">Defnyddio data symudol</string>
     <string name="mobile_network_state_off">I ffwrdd</string>
     <string name="confirm_mobile_data_disable">Troi data symudol i ffwrdd?</string>
     <string name="sim_selection_required_pref">Rhaid dewis</string>
@@ -52,6 +58,13 @@
     <string name="cell_data_warning">Rhybudd data <xliff:g name="amount" example="1 GB">^1</xliff:g></string>
     <string name="cell_data_limit">Cyfyngiad data <xliff:g name="amount" example="1 GB">^1</xliff:g></string>
     <string name="cell_data_warning_and_limit">Rhybudd data <xliff:g name="amount" example="1 GB">^1</xliff:g> / Terfyn data <xliff:g name="amount" example="2 GB">^2</xliff:g></string>
+    <string name="billing_cycle_days_left">        {count, plural,
+            zero {}
+            two {# ddiwrnod yn weddill}
+=1    {# diwrnod yn weddill}
+            other {# diwrnod yn weddill}
+        }
+    </string>
     <string name="billing_cycle_none_left">Dim amser yn weddill</string>
     <string name="billing_cycle_less_than_one_day_left">Llai na diwrnod yn weddill</string>
     <string name="carrier_and_update_text">Diweddarwyd gan <xliff:g name="carrier" example="Google Fi">^1</xliff:g> <xliff:g name="time" example="3m">^2</xliff:g> yn ôl</string>
@@ -66,6 +79,7 @@
     <string name="cycle_reset_day_of_month_picker_positive_button">Gosod</string>
     <string name="data_warning_limit_title">Terfyn a rhybudd data</string>
     <string name="app_usage_cycle">Cylchred defnydd data ap</string>
+    <string name="mobile_data_usage">Defnydd data symudol</string>
     <string name="set_data_warning">Gosod rhybudd data</string>
     <string name="data_warning">Rhybudd data</string>
     <string name="set_data_limit">Gosod terfyn data</string>
@@ -76,6 +90,8 @@
     <string name="data_usage_limit_editor_title">Gosod terfyn defnydd data</string>
     <string name="usage_bytes_threshold_picker_positive_button">Gosod</string>
     <string name="data_usage_warning_save_title">Cadw</string>
+    <string name="network_and_internet_oem_network_title">Rhwydwaith OEM</string>
+    <string name="network_and_internet_network_preferences_title">Dewisiadau rhwydwaith</string>
     <string name="wifi_settings">Wi\u2011Fi</string>
     <string name="wifi_starting">Yn troi Wi-Fi ymlaen\u2026</string>
     <string name="wifi_stopping">Yn troi Wi-Fi i ffwrdd\u2026</string>
@@ -85,6 +101,9 @@
     <string name="wifi_failed_connect_message">Methwyd cysylltu â\'r rhwydwaith</string>
     <string name="wifi_setup_add_network">Ychwanegu rhwydwaith</string>
     <string name="wifi_setup_connect">Cysylltu</string>
+    <string name="wifi_connecting">Yn cysylltu\u2026</string>
+    <string name="wifi_disconnected">Heb gysylltu</string>
+    <string name="wifi_not_in_range_message">Rhwydwaith dim o fewn cyrraedd</string>
     <string name="wifi_password">Cyfrinair</string>
     <string name="wifi_show_password">Dangos cyfrinair</string>
     <string name="wifi_no_network_name">Rho enw rwydwaith</string>
@@ -133,6 +152,8 @@
     <string name="wifi_hotspot_name_summary_connected">Gall dyfeisiau eraill cysylltu â <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>
     <string name="wifi_hotspot_password_title">Cyfrinair y llecyn</string>
     <string name="wifi_hotspot_security_title">Diogelwch</string>
+    <string name="wifi_hotspot_wpa3_sae">WPA3-Personol</string>
+    <string name="wifi_security_psk_sae">WPA2/WPA3-Personol</string>
     <string name="wifi_hotspot_wpa2_personal">WPA2-Personol</string>
     <string name="wifi_hotspot_security_none">Dim</string>
     <string name="wifi_hotspot_ap_band_title">Band AP</string>
@@ -145,6 +166,7 @@
     <string name="wifi_ap_5G">5.0 GHz</string>
     <string name="wifi_ap_band_select_one">Rhaid dewis o leiaf un band ar gyfer y llecyn Wi\u2011Fi:</string>
     <string name="tether_settings_title_all">Llecyn Wi\u2011Fi a thenynnu</string>
+    <string name="hotspot_settings_title">Llecyn Wi-Fi</string>
     <string name="wifi_hotspot_state_off">I ffwrdd</string>
     <string name="wifi_hotspot_auto_off_title">Troi\'r llecyn i ffwrdd yn awtomatig</string>
     <string name="wifi_hotspot_auto_off_summary">Bydd y llecyn Wi\u2011Fi yn troi i ffwrdd os na fydd unrhyw ddyfeisiau wedi\'u cysylltu</string>
@@ -183,6 +205,10 @@
     <string name="bluetooth_ask_discovery_no_name">Mae ap eisiau gwneud dy uned system yn weladwy i ddyfeisiau Bluetooth eraill am <xliff:g id="timeout">%1$d</xliff:g> eiliad.</string>
     <string name="bluetooth_ask_enablement_and_discovery">Mae <xliff:g id="app_name">%1$s</xliff:g> eisiau troi Bluetooth ymlaen a gwneud dy uned system yn weladwy i ddyfeisiau eraill am <xliff:g id="timeout">%2$d</xliff:g> eiliad.</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name">Mae ap eisiau troi Bluetooth ymlaen a gwneud dy uned system yn weladwy i ddyfeisiau eraill am <xliff:g id="timeout">%1$d</xliff:g></string>
+    <string name="bluetooth_my_devices">Fy nyfeisiau</string>
+    <string name="bluetooth_previously_connected">Wedi\u2019u cysylltu yn y gorffennol</string>
+    <string name="bluetooth_device_connected_toast">%1$s wedi cysylltu</string>
+    <string name="bluetooth_device_disconnected_toast">%1$s wedi datgysylltu</string>
     <string name="bluetooth_notif_ticker">Cais paru Bluetooth</string>
     <string name="bluetooth_device_context_pair_connect">Paru a chysylltu</string>
     <string name="bluetooth_pairing_key_msg">Cod paru Bluetooth</string>
@@ -221,6 +247,7 @@
     <string name="notification_ringtone_title">Sain hysbysiad rhagosodedig</string>
     <string name="alarm_ringtone_title">Tôn larwm rhagosodedig</string>
     <string name="ringtone_picker_save_title">Cadw</string>
+    <string name="display_brightness">Disgleirdeb</string>
     <string name="units_settings">Unedau</string>
     <string name="units_speed_title">Cyflymder</string>
     <string name="units_distance_title">Pellter</string>
@@ -273,27 +300,55 @@
     <string name="all_applications">Dangos pob ap</string>
     <string name="default_applications">Apiau rhagosodedig</string>
     <string name="app_permissions">Caniatâd yr ap</string>
+    <string name="app_permissions_summary">Rheoli mynediad yr ap at dy ddata</string>
     <string name="applications_settings">Gwybodaeth ap</string>
     <string name="force_stop">Gorfodi stopio</string>
     <string name="force_stop_dialog_title">Gorfodi stopio?</string>
     <string name="force_stop_dialog_text">Os wyt yn gorfodi ap i stopio, mae\'n bosib iddo ymddwyn yn anarferol.</string>
     <string name="prioritize_app_performance_dialog_action_on">Iawn</string>
+    <string name="prioritize_app_performance_dialog_action_off">Dim diolch</string>
     <string name="disable_text">Analluogi</string>
     <string name="enable_text">Galluogi</string>
     <string name="uninstall_text">Dadosod</string>
     <string name="app_disable_dialog_text">Os rwyt yn analluogi\'r ap hwn, mae\'n bosib na fydd Android a rhai apiau eraill yn gweithio yn gywir.</string>
     <string name="app_disable_dialog_positive">Analluogi\'r ap</string>
+    <string name="not_installed">Heb ei osod ar y proffil hwn</string>
     <string name="permissions_label">Caniatâd</string>
     <string name="notifications_label">Hysbysiadau</string>
     <string name="storage_application_label">Storfa a storfa dros dro</string>
+    <string name="prioritize_app_performance_label">Blaenoriaethu perfformiad ap</string>
     <string name="application_version_label">Fersiwn: %1$s</string>
     <string name="runtime_permissions_summary_no_permissions_granted">Dim caniatâd wedi\'i roi</string>
     <string name="runtime_permissions_summary_no_permissions_requested">Heb ofyn am unrhyw ganiatâd</string>
+    <string name="unused_apps">Apiau heb eu defnyddio</string>
+    <string name="unused_apps_summary">        {count, plural,
+            zero {}
+            =1    {# ap heb ei ddefnyddio}
+            other {# ap heb eu defnyddio}
+        }
+    </string>
+    <string name="unused_apps_switch">Tynnu caniatâd yn ôl a rhyddhau lle</string>
     <string name="storage_type_internal">%s yn y storfa fewnol</string>
     <string name="data_usage_summary_title">Defnydd data</string>
     <string name="data_usage_app_summary_title">Defnydd data apiau</string>
+    <string name="data_usage_usage_history_title">Hanes defnydd</string>
+    <string name="data_usage_all_apps_title">Pob ap</string>
+    <string name="app_data_usage_title">Defnydd data a Wi\u2011Fi</string>
+    <string name="app_data_usage_usage_history_title">Hanes defnydd</string>
+    <string name="app_data_usage_total_usage">Cyfanswm defnydd</string>
+    <string name="app_data_usage_foreground">Tu Blaen</string>
     <string name="app_data_usage_background">Cefndir</string>
+    <string name="app_data_usage_allow_data_title">Caniatáu data</string>
+    <string name="app_data_usage_allow_data_summary">Gadael i\'r ap hwn defnyddio data symudol</string>
+    <string name="app_data_usage_restrict_data_title">Cyfyngu data</string>
+    <string name="app_data_usage_background_data_summary">Defnyddio data symudol dim ond tra bod yr ap ar y blaen</string>
     <string name="computing_size">Yn cyfrifo\u2026</string>
+    <string name="runtime_permissions_additional_count">        {count, plural,
+            zero {}
+=1    {# caniatâd ychwanegol}
+            other {# caniatâd ychwanegol}
+        }
+    </string>
     <string name="direct_boot_unaware_dialog_message_car">Noder: Ar ôl ailddechrau, ni all yr ap hwn ddechrau nes bod dy gerbyd wedi ei ddatgloi.</string>
     <string name="assist_and_voice_input_settings">Cymorth a mewnbwn llais</string>
     <string name="assist_app_settings">Ap cynorthwyo</string>
@@ -330,6 +385,10 @@
     <string name="app_link_open_never">Peidio ag agor yn yr ap hwn</string>
     <string name="app_launch_supported_domain_urls_title">Dolenni a gefnogir</string>
     <string name="apps_settings_title">Apiau</string>
+    <string name="apps_recently_opened">Wedi\'i agor yn ddiweddar</string>
+    <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="special_access">Mynediad arbennig yr ap</string>
     <string name="show_system">Dangos apiau system</string>
     <string name="hide_system">Cuddio apiau system</string>
@@ -346,13 +405,18 @@
     <string name="usage_access_title">Mynediad at ddefnydd</string>
     <string name="usage_access_description">Mae mynediad defnydd yn caniatáu ap i ddilyn pa apiau eraill wyt yn eu defnyddio a pha mor aml, yn ogystal â dy ddarparwr gwasanaeth, iaith y system a manylion eraill.</string>
     <string name="wifi_control_title">Rheolaeth Wi-Fi</string>
-    <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="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 dechrau llecyn Wi-Fi.</string>
     <string name="more_special_access_title">Rhagor</string>
     <string name="location_settings_title">Lleoliad</string>
     <string name="location_no_recent_access">Dim apiau diweddar</string>
     <string name="location_settings_app_permissions_title">Caniatâd lefel apiau</string>
     <string name="location_settings_services_title">Gwasanaethau Lleoliad</string>
     <string name="microphone_no_recent_access">Dim apiau diweddar</string>
+    <string name="microphone_app_permission_summary_microphone_on">        {count, plural,
+=1    {Mae gan # o {total_count} ap fynediad}
+            other {Mae gan # o {total_count} ap fynediad}
+        }
+    </string>
     <string name="microphone_settings_loading_app_permission_stats">Yn llwytho\u2026</string>
     <string name="system_setting_title">System</string>
     <string name="system_update_settings_title">Diweddariadau system</string>
@@ -389,6 +453,11 @@
     <string name="settings_license_activity_title">Trwyddedau trydydd parti</string>
     <string name="settings_license_activity_unavailable">Mae yna broblem wrth lwytho\'r trwyddedau.</string>
     <string name="settings_license_activity_loading">Yn llwytho\u2026</string>
+    <string name="show_dev_countdown">        {count, plural,
+=1    {Rwyt nawr # cam i ffwrdd o fod yn ddatblygwr.}
+other {Rwyt nawr # cam i ffwrdd o fod yn ddatblygwr.}
+        }
+    </string>
     <string name="show_dev_on">Rwyt bellach â mynediad fel datblygwr!</string>
     <string name="show_dev_already">Dim angen; rwyt eisoes yn ddatblygwr.</string>
     <string name="developer_options_settings">Dewisiadau datblygwr</string>
@@ -441,8 +510,28 @@
     <string name="sms_messaging_permission_title">Negesu trwy ddata symudol y car</string>
     <string name="install_apps_permission_title">Gosod apiau newydd</string>
     <string name="uninstall_apps_permission_title">Dadosod apiau</string>
+    <string name="user_add_user_menu">Ychwanegu proffil</string>
+    <string name="user_new_user_name">Proffil newydd</string>
+    <string name="user_add_user_title">"Ychwanegu proffil newydd?"</string>
+    <string name="user_limit_reached_message">        {count, plural,
+            zero {}
+          =1    {Gellir ond creu un proffil.}
+            two {Gellir ond creu hyd at # broffil.}
+            few {Gellir ond creu hyd at # phroffil.}
+            many {Gellir ond creu hyd at # phroffil.}
+            other {Gellir ond creu hyd at # proffil.}
+        }
+    </string>
+    <string name="add_user_error_title">Methwyd creu proffil newydd</string>
+    <string name="delete_user_dialog_title">Dileu\'r proffil hwn?</string>
+    <string name="delete_user_dialog_message">"Caiff holl apiau a data'r proffil hwn eu dileu"</string>
+    <string name="delete_user_error_title">Ni ddileuwyd y proffil. Gellir ailgychwyn y ddyfais a rhoi cynnig arall arni.</string>
+    <string name="delete_user_error_set_ephemeral_title">Caiff y proffil hwn ei ddileu pan fyddi\'n newid proffil neu\'n ailgychwyn y cerbyd.</string>
     <string name="delete_user_error_dismiss">Diystyru</string>
     <string name="delete_user_error_retry">Ailgeisio</string>
+    <string name="delete_last_user_dialog_title">Dileu\'r unig broffil sy\'n weddill?</string>
+    <string name="delete_last_user_delete_warning">"Os fyddi'n dileu'r unig broffil sy'n weddill ar gyfer y cerbyd caiff yr holl apiau, data, a gosodiadau yn gysylltiedig â'r proffil eu dileu."</string>
+    <string name="delete_last_user_system_setup_required_message">"Ar ôl ailosod, gellir osod proffil newydd."</string>
     <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>
@@ -450,7 +539,9 @@
     <string name="current_user_name">Ti (%1$s)</string>
     <string name="user_name_label">Enw</string>
     <string name="user_summary_not_set_up">Heb ei osod</string>
+    <string name="edit_user_name_title">Golygu enw\'r proffil</string>
     <string name="name_input_blank_error">Ni all y maes fod yn wag.</string>
+    <string name="name_input_invalid_error">Rhoddwyd enw proffil annilys.</string>
     <string name="users_list_title">Defnyddwyr</string>
     <string name="profiles_list_title">Proffiliau</string>
     <string name="user_details_admin_title">Wedi rhoi caniatâd i %1$s</string>
@@ -463,6 +554,7 @@
     <string name="storage_audio_files_title">Ffeiliau sain</string>
     <string name="memory_calculating_size">Yn cyfrifo\u2026</string>
     <string name="storage_application_size_label">Maint ap</string>
+    <string name="storage_data_size_label">Data proffil</string>
     <string name="storage_cache_size_label">Cuddstôr</string>
     <string name="storage_total_size_label">Cyfanswm</string>
     <string name="storage_clear_user_data_text">Clirio\'r storfa</string>
@@ -504,8 +596,17 @@
     <string name="sync_button_sync_cancel">Diddymu cysoni</string>
     <string name="sync_is_failing">Mae cysoni yn cael rhai problemau. Mi fydd yn ei ôl yn fuan.</string>
     <string name="privacy_settings_title">Preifatrwydd</string>
+    <string name="privacy_vehicle_data_title">Data system gwybodloniant</string>
+    <string name="privacy_location_summary">Rheoli mynediad ap at dy leoliad</string>
     <string name="mute_camera_title">Camera</string>
     <string name="mute_camera_summary">Rheoli mynediad apiau at dy gamerâu</string>
+    <string name="mute_mic_title">Meicroffon</string>
+    <string name="mute_mic_summary">Rheoli mynediad ap i\'r meicroffon</string>
+    <string name="vehicle_data_title">Data system gwybodloniant</string>
+    <string name="vehicle_data_summary">Rheoli gweithgareddau a gwybodaeth a gedwir ar y cerbyd hwn</string>
+    <string name="vehicle_data_delete_user_title">Dileu dy broffil</string>
+    <string name="vehicle_data_delete_user_summary">Dileu dy broffil a chyfrifon o\'r system gwybodloniant</string>
+    <string name="action_unavailable">Dyw\'r weithred hon ddim ar gael ar dy broffil</string>
     <string name="security_settings_title">Diogelwch</string>
     <string name="security_settings_subtitle">Clo sgrin</string>
     <string name="security_lock_none">Dim</string>
@@ -540,6 +641,8 @@
     <string name="okay">Iawn</string>
     <string name="remove_screen_lock_title">Tynnu clo\'r sgrin?</string>
     <string name="remove_screen_lock_message">Bydd hyn yn caniatáu i unrhyw un gael mynediad at dy gyfrif</string>
+    <string name="security_profile_lock_title">Clo\'r proffil</string>
+    <string name="security_unlock_profile_summary">Gosod datgloi awtomatig</string>
     <string name="lock_settings_enter_pin">Rho dy PIN</string>
     <string name="lock_settings_enter_password">Rho dy gyfrinair</string>
     <string name="choose_lock_pin_message">Er diogelwch, gosoda PIN</string>
@@ -565,6 +668,77 @@
     <string name="lockpassword_password_recently_used">Dyw gweinyddwr y ddyfais ddim yn caniatáu defnyddio cyfrinair diweddar</string>
     <string name="error_saving_password">Gwall wrth gadw\'r cyfrinair</string>
     <string name="lockpassword_password_denylisted_by_admin">Mae dy weinyddwr TG wedi rhwystro cyfrineiriau cyffredin. Rho gynnig ar gyfrinair gwahanol.</string>
+    <string name="lockpassword_password_requires_alpha">Rhaid cynnwys o leiaf un llythyren</string>
+    <string name="lockpassword_password_requires_digit">Rhaid cynnwys o leiaf un digid</string>
+    <string name="lockpassword_password_requires_symbol">Rhaid cynnwys o leiaf un symbol</string>
+    <string name="lockpassword_password_requires_letters">        {count, plural,
+        zero {}
+        two {Rhaid cynnwys o leiaf # lythyren}
+=1    {Rhaid cynnwys o leiaf # llythyren}
+        other {Rhaid cynnwys o leiaf # llythyren}
+        }
+    </string>
+    <string name="lockpassword_password_requires_lowercase">        {count, plural,
+        zero {}
+        two {Rhaid cynnwys o leiaf # lythyren fach}
+=1    {Rhaid cynnwys o leiaf # llythyren fach}
+        other {Rhaid cynnwys o leiaf # llythyren fach}
+        }
+    </string>
+    <string name="lockpassword_password_requires_uppercase">        {count, plural,
+        zero {}
+        two {Rhaid cynnwys o leiaf # briflythyren}        
+        few {Rhaid cynnwys o leiaf # phriflythyren}
+        many {Rhaid cynnwys o leiaf # phriflythyren}
+=1    {Rhaid cynnwys o leiaf # priflythyren}
+        other {Rhaid cynnwys o leiaf # priflythyren}
+        }
+    </string>
+    <string name="lockpassword_password_requires_numeric">        {count, plural,
+        zero {}
+        two {Rhaid cynnwys o leiaf # ddigid rhifol}
+=1    {Rhaid cynnwys o leiaf # digid rhifol}
+        other {Rhaid cynnwys o leiaf # digid rhifol}
+        }
+    </string>
+    <string name="lockpassword_password_requires_symbols">        {count, plural,
+        zero {}
+=1    {Rhaid cynnwys o leiaf # symbol arbennig}
+        other {Rhaid cynnwys o leiaf # symbol arbennig}
+        }
+    </string>
+    <string name="lockpassword_password_requires_nonletter">        {count, plural,
+=1    {Rhaid cynnwys o leiaf # nod na sy\'n llythyren}
+        other {Rhaid cynnwys o leiaf # nod na sy\'n llythyren}
+        }
+    </string>
+    <string name="lockpassword_password_requires_nonnumerical">        {count, plural,
+        =1    {Rhaid cynnwys o leiaf # nod na sy\'n rhif}
+        other {Rhaid cynnwys o leiaf # nod na sy\'n rhif}
+        }
+    </string>
+    <string name="lockpassword_password_too_short">        {count, plural,
+=1    {Rhaid cynnwys o leiaf # nod}
+        other {Rhaid cynnwys o leiaf # nod}
+        }
+    </string>
+    <string name="lockpassword_pin_too_short">        {count, plural,
+        two {Rhaid cynnwys o leiaf # ddigid}
+=1    {Rhaid cynnwys o leiaf # digid}
+        other {Rhaid cynnwys o leiaf # digid}
+        }
+    </string>
+    <string name="lockpassword_password_too_long">        {count, plural,
+        =1    {Rhaid bod yn llai na # nod}
+        other {Rhaid bod yn llai na # nod}
+        }
+    </string>
+    <string name="lockpassword_pin_too_long">        {count, plural,
+        two {Rhaid bod yn llai na # ddigid}
+=1    {Rhaid bod yn llai na # digid}
+        other {Rhaid bod yn llai na # digid}
+        }
+    </string>
     <string name="setup_lock_settings_options_button_label">Dewisiadau sgrin cloi</string>
     <string name="build_info_fmt"><xliff:g example="google/gcar_emu_x86/..." id="fingerprint">%1$s</xliff:g>\n<xliff:g example="Thu Aug 30" id="date">%2$s</xliff:g> : <xliff:g example="4" id="num_days">%3$s</xliff:g> diwrnod yn ôl</string>
     <string name="credentials_reset">Clirio tystnodiadau</string>
@@ -589,8 +763,16 @@
     <string name="suggestion_dismiss_button">DIYSTYRU</string>
     <string name="restricted_while_driving">Nodwedd ddim ar gael tra\'n gyrru.</string>
     <string name="default_search_query">Chwilio</string>
+    <string name="assistant_and_voice_setting_title">Cynorthwyyd a llais</string>
+    <string name="assistant_and_voice_assistant_app_title">Ap cynorthwyydd digidol</string>
     <string name="assistant_and_voice_use_text_from_screen_title">Defnyddio testun o\'r sgrin</string>
     <string name="assistant_and_voice_use_screenshot_title">Defnyddio sgrinlun</string>
+    <string name="number_of_device_admins">        {count, plural,
+        zero {}
+        =1    {# ap yn weithredol}
+        other {# ap yn weithredol}
+        }
+    </string>
     <string name="enterprise_privacy_none">Dim</string>
     <string name="enterprise_privacy_enterprise_set_default_apps">Apiau rhagosodedig</string>
     <string name="factory_reset_parked_title">Ailosod y system gwybodloniant</string>
@@ -612,5 +794,10 @@
     <string name="camera_toggle_summary">Caniatáu pob ap i gael mynediad i\'r camera</string>
     <string name="camera_manage_permissions">Rheoli caniatâd camera</string>
     <string name="camera_no_recent_access">Dim apiau diweddar</string>
+    <string name="camera_app_permission_summary_camera_on">        {count, plural,
+=1    {Mae gan # o {total_count} ap fynediad}
+            other {Mae gan # o {total_count} ap fynediad}
+        }
+    </string>
     <string name="camera_settings_loading_app_permission_stats">Yn llwytho\u2026</string>
 </resources>
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/CellBroadcastReceiver/res/values-cy/strings.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values-cy/strings.xml
index 5c8ad0a..eaf048a 100644
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values-cy/strings.xml
+++ b/overlay/packages/apps/CellBroadcastReceiver/res/values-cy/strings.xml
@@ -79,6 +79,7 @@
     <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">Tra i ffwrdd, caiff negeseuon diogelwch y cyhoedd dal eu hanfon fel hysbysiadau</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>
@@ -159,6 +160,7 @@
     <string name="maximum_waiting_time">Terfyn amser aros:</string>
     <string name="seconds">eiliadau</string>
     <string name="message_copied">Neges wedi\'i chopio</string>
+    <string name="top_intro_roaming_text">Tra\u2019n crwydro, mae\u2019n bosib na fyddi\u2019n derbyn rhai rhybuddion sydd heb eu cynnwys yn y gosodiadau hyn</string>
     <string name="notification_cb_settings_changed_title">Gosodiadau wedi\'u newid gan y darparwr gwasanaeth</string>
     <string name="notification_cb_settings_changed_text">Tapia i weld gosodiadau rhybuddion argyfwng</string>
 </resources>
diff --git a/overlay/packages/apps/CertInstaller/res/values-fur-rIT/strings.xml b/overlay/packages/apps/CertInstaller/res/values-fur-rIT/strings.xml
new file mode 100644
index 0000000..f15e6b4
--- /dev/null
+++ b/overlay/packages/apps/CertInstaller/res/values-fur-rIT/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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="extracting_pkcs12">Daûr a tirâ fûr\u2026</string>
+    <string name="pkcs12_file_password_dialog_title">Tire fûr di %s</string>
+</resources>
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/DeskClock/res/values-fur-rIT/strings.xml b/overlay/packages/apps/DeskClock/res/values-fur-rIT/strings.xml
new file mode 100644
index 0000000..2800cde
--- /dev/null
+++ b/overlay/packages/apps/DeskClock/res/values-fur-rIT/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2016 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" xmlns:tools="http://schemas.android.com/tools">
+    <string name="alarm_alert_dismiss_text">Distude</string>
+</resources>
diff --git a/overlay/packages/apps/DocumentsUI/res/values-cy/strings.xml b/overlay/packages/apps/DocumentsUI/res/values-cy/strings.xml
index 5c483fc..7174e1b 100644
--- a/overlay/packages/apps/DocumentsUI/res/values-cy/strings.xml
+++ b/overlay/packages/apps/DocumentsUI/res/values-cy/strings.xml
@@ -88,6 +88,8 @@
     <string name="save_error">Methwyd â chadw\'r ddogfen</string>
     <string name="create_error">Methwyd â chreu ffolder</string>
     <string name="query_error">Methu â llwytho cynnwys ar hyn o bryd</string>
+    <string name="quiet_mode_error_title">Mae apiau gwaith ar saib</string>
+    <string name="quiet_mode_button">Troi apiau gwaith ymlaen</string>
     <string name="cant_select_work_files_error_title">Ni ellir dewis ffeiliau gwaith</string>
     <string name="cant_select_work_files_error_message">Dyw dy weinyddwyr TG  ddim yn dy 
 ganiatáu i gael at ffeiliau gwaith o 
diff --git a/overlay/packages/apps/DocumentsUI/res/values-fur-rIT/strings.xml b/overlay/packages/apps/DocumentsUI/res/values-fur-rIT/strings.xml
new file mode 100644
index 0000000..7b8a057
--- /dev/null
+++ b/overlay/packages/apps/DocumentsUI/res/values-fur-rIT/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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="menu_extract">Tire fûr su\u2026</string>
+</resources>
diff --git a/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml b/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml
index 1d37088..46baec5 100644
--- a/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml
+++ b/overlay/packages/apps/EmergencyInfo/res/values-cy/strings.xml
@@ -123,6 +123,7 @@
     <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">Gyda dy ffôn wedi\u2019i ddatgloi, tapia\u2019r eicon pensil i ychwanegu gwybodaeth i\u2019w ddangos yma os bydd 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/Gallery2/res/values-cy/strings.xml b/overlay/packages/apps/Gallery2/res/values-cy/strings.xml
index fcd6963..29b238b 100644
--- a/overlay/packages/apps/Gallery2/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Gallery2/res/values-cy/strings.xml
@@ -349,8 +349,8 @@
     <string name="pref_camera_id_label_back">CAMERA BLAEN</string>
     <string name="pref_camera_id_label_front">CAMERA CEFN</string>
     <string name="dialog_ok">Iawn</string>
-    <string name="spaceIsLow_content" product="nosdcard">Mae dy storfa USB yn rhedeg yn brin o le. Newidia\'r gosodiad ansawdd neu ddileu rhai delweddau neu ffeiliau eraill.</string>
-    <string name="spaceIsLow_content" product="default">Mae dy gerdyn SD yn rhedeg yn brin o le. Newidia\'r gosodiad ansawdd neu ddileu rhai delweddau neu ffeiliau eraill.</string>
+    <string name="spaceIsLow_content" product="nosdcard">Mae dy storfa USB yn rhedeg yn brin o le. Newidia\'r gosodiad ansawdd neu dileu rhai delweddau neu ffeiliau eraill.</string>
+    <string name="spaceIsLow_content" product="default">Mae dy gerdyn SD yn rhedeg yn brin o le. Newidia\'r gosodiad ansawdd neu dileu rhai delweddau neu ffeiliau eraill.</string>
     <string name="video_reach_size_limit">Wedi cyrraedd y terfyn maint.</string>
     <string name="pano_too_fast_prompt">Rhy gyflym</string>
     <string name="pano_dialog_prepare_preview">Yn paratoi panorama</string>
diff --git a/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml b/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml
index 4ab0e2c..e7452cd 100644
--- a/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml
+++ b/overlay/packages/apps/ManagedProvisioning/res/values-cy/strings.xml
@@ -26,6 +26,7 @@
   <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">Gall dy weinyddwr TG fonitro a rheoli gosodiadau, mynediad corfforaethol, apiau, caniatâd, data, a gweithgaredd rhwydwaith yn gysylltiedig â\u2019r proffil hwn, yn ogystal â dy hanes galwadau a hanes chwilio cysylltiadau. Cysyllta â dy weinyddwr TG am ragor o wybodaeth ac i ddysgu mwy am bolisï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>
@@ -187,4 +188,8 @@
   <string name="financed_make_payments_subheader_description">Gall <xliff:g id="creditor_name" example="creditor_name">%1$s</xliff:g> osod ap <xliff:g id="creditor_name" example="creditor_name">%2$s</xliff:g> fel y gelli wneud taliadau am y ddyfais hon.</string>
   <string name="financed_restrict_device_subheader_title">Gall y ddyfais hon cael ei chyfyngu</string>
   <string name="financed_restrict_device_subheader_description">Gall <xliff:g id="creditor_name" example="creditor_name">%1$s</xliff:g> gyfyngu mynediad i\'r ddyfais hon os nad wyt yn gwneud taliadau.</string>
+  <string name="error_role_holder_hash_mismatch">Methu gosod y ddyfais. Cysyllta â dy weinyddwr TG a chyfeirio at \"Invalid checksum\".</string>
+  <string name="error_role_holder_download_install_failed">Rho gynnig arall arn\u2019n hwyrach neu gofyn i dy weinyddwr TG am gymorth.</string>
+  <string name="error_role_holder_package_invalid">Methu gosod y ddyfais. Cysyllta â dy weinyddwr TG a chyfeirio at \"Missing or corrupted components\".</string>
+  <string name="setting_up">Yn gosod\u2026</string>
 </resources>
diff --git a/overlay/packages/apps/Messaging/res/values-cy/strings.xml b/overlay/packages/apps/Messaging/res/values-cy/strings.xml
index 8dcfd32..ceb99c7 100644
--- a/overlay/packages/apps/Messaging/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Messaging/res/values-cy/strings.xml
@@ -122,7 +122,7 @@
     <string name="message_status_sending">Yn anfon…</string>
     <string name="message_status_send_failed">Heb ei anfon. Tapia i geisio eto.</string>
     <string name="message_status_send_retrying">Heb ei anfon. Yn ceisio eto…</string>
-    <string name="message_status_resend">Ail-anfon neu ddileu</string>
+    <string name="message_status_resend">Ail-anfon neu dileu</string>
     <string name="message_status_send_failed_emergency_number">Gwna alwad llais i\'r gwasanaethau brys. Dyw dy neges destun heb ei anfon ar hyn o bryd.</string>
     <string name="message_status_failed">Wedi methu</string>
     <string name="message_title_manual_download">Neges MMS newydd i\'w lawrlwytho</string>
@@ -130,7 +130,7 @@
     <string name="message_title_download_failed">Methwyd â lawrlwytho</string>
     <string name="message_status_download_failed">Tapia i geisio eto</string>
     <string name="message_status_download">Tapia i lawrlwytho</string>
-    <string name="message_status_download_action">Lawrlwytho neu ddileu</string>
+    <string name="message_status_download_action">Lawrlwytho neu dileu</string>
     <string name="message_status_downloading">Yn lawrlwytho…</string>
     <string name="message_status_download_error">Neges wedi dod i ben neu ddim ar gael</string>
     <string name="mms_info">maint: <xliff:g id="messageSize">%1$s</xliff:g>, dod i ben: <xliff:g id="messageExpire">%2$s</xliff:g></string>
diff --git a/overlay/packages/apps/Nfc/res/values-cy/strings.xml b/overlay/packages/apps/Nfc/res/values-cy/strings.xml
index 7bd7abc..f327ba5 100644
--- a/overlay/packages/apps/Nfc/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Nfc/res/values-cy/strings.xml
@@ -28,6 +28,8 @@
     <string name="pair_no">Na</string>
     <string name="tap_again_to_pay">Tapia eto i dalu gyda <xliff:g id="app">%1$s</xliff:g></string>
     <string name="tap_again_to_complete">Tapia eto i gwblhau gyda <xliff:g id="app">%1$s</xliff:g></string>
+    <string name="tap_again_description">Dalia at y darllenydd</string>
+    <string name="appchooser_description">Dewis ap i sganio</string>
     <string name="transaction_failure">Methwyd â chwblhau\'r trosglwyddiad hwn gyda <xliff:g id="app">%1$s</xliff:g>.</string>
     <string name="could_not_use_app">Methwyd â defnyddio <xliff:g id="ssid">%1$s</xliff:g>.</string>
     <string name="pay_with">Talu gyda</string>
diff --git a/overlay/packages/apps/Settings/res/values-cy/arrays.xml b/overlay/packages/apps/Settings/res/values-cy/arrays.xml
index dabca5c..aedd9d4 100644
--- a/overlay/packages/apps/Settings/res/values-cy/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-cy/arrays.xml
@@ -588,7 +588,7 @@
         <item>O hyd</item>
         <item>Oni bai bod ap talu arall ar agor</item>
     </string-array>
-    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>Byth</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/Settings/res/values-cy/strings.xml b/overlay/packages/apps/Settings/res/values-cy/strings.xml
index 18784c1..eebb7b1 100644
--- a/overlay/packages/apps/Settings/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-cy/strings.xml
@@ -79,7 +79,7 @@
     <string name="bluetooth_only_visible_to_paired_devices">Dim ond yn weladwy i ddyfeisiau wedi\'u paru</string>
     <string name="bluetooth_visibility_timeout">Amser i fod yn weladwy</string>
     <string name="bluetooth_lock_voice_dialing">Cloi deialu llais</string>
-    <string name="bluetooth_lock_voice_dialing_summary">Rhwystro defnydd o\'r deialydd Bluetooth tra bod y sgrin ar glo    </string>
+    <string name="bluetooth_lock_voice_dialing_summary">Rhwystro defnydd o\'r deialydd Bluetooth tra bod y sgrin wedi\'i chloi</string>
     <string name="bluetooth_devices">Dyfeisiau Bluetooth</string>
     <string name="bluetooth_device_name">Enw\'r ddyfais</string>
     <string name="bluetooth_device_details">Gosodiadau\'r ddyfais</string>
@@ -96,6 +96,9 @@
     <string name="bluetooth_empty_list_user_restricted">Nid oes gennyt ganiatâd i addasu gosodiadau Bluetooth.</string>
     <string name="bluetooth_pairing_pref_title">Paru â dyfais newydd</string>
     <string name="keywords_add_bt_device">bluetooth</string>
+    <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_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_is_visible_message">Mae <xliff:g id="device_name">%1$s</xliff:g> yn weladwy i ddyfeisiau gerllaw tra bod gosodiadau Bluetooth ar agor.</string>
@@ -374,9 +377,12 @@
     <string name="security_settings_face_enroll_introduction_title">Datgloi gyda dy wyneb</string>
     <string name="security_settings_face_enroll_consent_introduction_title">Caniatáu Datgloi ag Wyneb</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled">Defnyddio dy wyneb i ddilysu</string>
-    <string name="security_settings_face_enroll_introduction_message" product="default">Defnyddia dy wyneb i ddatgloi dy ffôn, caniatáu taliadau, neu fewngofnodi i apiau.</string>
+    <string name="security_settings_face_enroll_introduction_message" 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_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>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled">Defnyddia dy wyneb i ddatgloi dy ffôn neu i awdurdodi taliadau.\n\nNoder: Ni ellir defnyddio dy wyneb i ddatgloi\u2019r ddyfais hon. Am ragor o wybodaeth, cysyllta â gweinyddwr dy sefydliad.</string>
-    <string name="security_settings_face_enroll_introduction_message_setup">Defnyddia dy wyneb i ddatgloi dy ffôn, caniatáu taliadau, neu fewngofnodi i apiau</string>
+    <string name="security_settings_face_enroll_introduction_message_setup">Defnyddia dy wyneb i ddatgloi dy ffôn, caniatáu taliadau, neu mewngofnodi i apiau.</string>
     <string name="security_settings_face_enroll_repeat_title">Rho dy wyneb yn y cylch</string>
     <string name="security_settings_face_enroll_enrolling_skip">Neidio</string>
     <string name="face_add_max">Gellir ychwanegu hyd at <xliff:g id="count" example="5">%d</xliff:g> wyneb</string>
@@ -426,8 +432,11 @@
     <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_v2_message" product="tablet">Defnyddio ôl dy fys i ddatgloi dy lechen neu i ddilysu mai ti sy\u2019n ei defnyddio, 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" product="default">Caniatáu i dy blentyn defnyddio ôl ei fys i ddatgloi ei ffôn neu ddilysu mai nhw sydd yn ei ddefnyddio. Mae hyn yn digwydd wrth iddyn nhw fewngofnodi i apiau, cymeradwyo taliadau, a mwy.</string>
+    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default">Caniatáu i dy blentyn defnyddio ôl ei fys i ddatgloi ei ffôn neu dilysu mai nhw sydd yn ei ddefnyddio. Mae hyn yn digwydd wrth iddyn nhw fewngofnodi i apiau, cymeradwyo taliadau, a mwy.</string>
+    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet">Caniatáu i dy blentyn defnyddio ôl ei fys i ddatgloi ei lechen neu dilysu mai nhw sydd yn ei ddefnyddio. Mae hyn yn digwydd wrth iddyn nhw fewngofnodi i apiau, cymeradwyo taliadau, a mwy.</string>
+    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device">Caniatáu i dy blentyn defnyddio ôl ei fys i ddatgloi ei ddyfais neu dilysu mai nhw sydd yn ei ddefnyddio. Mae hyn yn digwydd wrth iddyn nhw fewngofnodi i apiau, cymeradwyo taliadau, a mwy.</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_1">Rwyt mewn rheolaeth</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1">Rwyt ti a dy blentyn mewn rheolaeth</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_2">Cofia</string>
@@ -443,6 +452,7 @@
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup">Pan weli\'r eicon hwn, defnyddia ôl dy fys i ddilysu, fel pan fyddi\'n mewngofnodi i apiau neu\'n cadarnhau taliad</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1">Cofia</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="default">Gall ddefnyddio ôl dy fys i ddatgloi dy ffôn fod yn llai diogel na PIN neu batrwm cryf</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="tablet">Gall ddefnyddio ôl dy fys i ddatgloi dy lechen fod yn llai diogel na PIN neu batrwm cryf</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2">Sut mae\'n gweithio</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2">Mae Datgloi ag Ôl Bys yn creu model unigryw o ôl dy fys i ddilysu mai ti sydd yno. I greu\u2019r model hwn ar ddechrau, rhaid cymryd lluniau o ôl dy fys o wahanol fannau.</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2">Mae Datgloi ag Ôl Bys yn creu model unigryw o ôl bys dy blentyn i ddilysu mai nhw sydd yno. I greu\u2019r model hwn ar ddechrau, rhaid cymryd lluniau o\'r ôl bys o wahanol fannau.</string>
@@ -476,9 +486,9 @@
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r llechen hon os yw\'n cael ei cholli, dwyn neu ailosod.</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r ddyfais hon os yw\'n cael ei cholli, dwyn neu ailosod.</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r ffôn hwn os yw\'n cael ei golli, dwyn neu ailosod.</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r llechen hon os yw\'n cael ei cholli neu ddwyn.</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r ddyfais hon os yw\'n cael ei cholli neu ddwyn.</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r ffôn hwn os yw\'n cael ei golli neu ddwyn.</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r llechen hon os yw\'n cael ei cholli neu ei dwyn.</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r ddyfais hon os yw\'n cael ei cholli neu ei dwyn.</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default">Ni fydd nodweddion diogelu\'r ddyfais ar waith. Ni fydd yn bosib rhwystro eraill rhag defnyddio\'r ffôn hwn os yw\'n cael ei golli neu ei ddwyn.</string>
     <string name="skip_anyway_button_label">Neidio beth bynnag</string>
     <string name="go_back_button_label">Mynd nôl</string>
     <string name="skip_lock_screen_dialog_button_label">Neidio</string>
@@ -510,7 +520,6 @@
     <string name="security_settings_sfps_enroll_progress_a11y_message">Yn cofrestru\u2019r ôl bys <xliff:g id="percentage" example="10">%d</xliff:g> y cant</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message">Yn cofrestru\u2019r ôl bys <xliff:g id="percentage" example="10">%d</xliff:g> y cant</string>
     <string name="security_settings_fingerprint_enroll_finish_title">Ychwanegwyd yr ôl bys</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default">Nawr gellir defnyddio ôl dy fys i ddatgloi dy ddyfais a dilysu mai ti sy\u2019n ei ddefnyddio, fel pan rwyt yn mewngofnodi i apiau.</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip">Gwneud hyn yn hwyrach</string>
     <string name="security_settings_udfps_tip_fingerprint_help">Coda dy fys, yna cyffyrdda eto</string>
     <string name="security_settings_udfps_side_fingerprint_help">Rho ochr ôl dy fys ar y synhwyrydd a\u2019i dal, yna newid i\u2019r ochr arall</string>
@@ -568,19 +577,23 @@
     <string name="security_settings_fingerprint_enroll_done">Gorffen</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title">Wps, nid dyna\u2019r synhwyrydd</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message">Cyffyrdda\'r synhwyrydd ar gefn dy ffôn. Defnyddia dy fynegfys (bys cyntaf).</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message">Ni weithiodd cofrestriad ôl bys. Rho gynnig arall arni neu ddefnyddio bys arall.</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message">Ni weithiodd cofrestriad ôl bys. Rho gynnig arall arni neu defnyddio bys arall.</string>
     <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_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="security_advanced_settings">Rhagor o osodiadau diogelwch</string>
+    <string name="security_advanced_settings_keywords">diogelwch, rhagor o osodiadau diogelwch, gosodiadau diogelwch, mwy o osodiadau diogelwch, mwy o osodiadau, rhagor o osodiadau, gosodiadau diogelwch uwch</string>
     <string name="privacy_advanced_settings">Rhagor o osodiadau preifatrwydd</string>
     <string name="fingerprint_add_max">Gellir ychwanegu hyd at <xliff:g id="count" example="5">%d</xliff:g> ôl bys</string>
     <string name="fingerprint_intro_error_max">Rwyt wedi ychwanegu\'r nifer mwyaf o olion bysau a ganiateir.</string>
     <string name="fingerprint_intro_error_unknown">Methu ag ychwanegu rhagor o ôl fysedd</string>
     <string name="fingerprint_last_delete_title">Tynnu pob un o\'r olion bysedd?</string>
+    <string name="fingerprint_delete_title">Dileu \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
     <string name="fingerprint_delete_message">Wyt ti am ddileu\'r ôl bys hwn?</string>
     <string name="fingerprint_last_delete_message" product="default">Ni fydd yn bosib defnyddio ôl dy fys i ddatgloi dy ddyfais na dilysu mai ti sy\u2019n defnyddio apiau.</string>
+    <string name="fingerprint_last_delete_message" product="tablet">Ni fydd yn bosib defnyddio ôl dy fys i ddatgloi dy lechen na dilysu mai ti sy\u2019n defnyddio apiau.</string>
     <string name="fingerprint_last_delete_message_profile_challenge">Ni fydd yn bosib defnyddio ôl dy fys i ddatgloi dy broffil gwaith, awdurdodi prynnu pethau, na mewngofnodi i apiau gwaith.</string>
     <string name="fingerprint_last_delete_confirm">Ie, dw i am ei dynnu</string>
     <string name="encryption_settings_title">Amgryptiad</string>
@@ -632,17 +645,17 @@
     <string name="fingerprint_unlock_set_unlock_pin">Ôl bys + PIN</string>
     <string name="fingerprint_unlock_set_unlock_password">Ôl bys + Cyfrinair</string>
     <string name="fingerprint_unlock_skip_fingerprint">Parhau heb ôl bys</string>
-    <string name="fingerprint_unlock_title">Mae\'n bosib datgloi dy ffôn gan ddefnyddio ôl dy fys. I fod yn ddiogel, mae\'r opsiwn yma angen clo sgrin arall wrth gefn.</string>
+    <string name="fingerprint_unlock_title" product="default">Mae\'n bosib datgloi dy ffôn gan ddefnyddio ôl dy fys. I fod yn ddiogel, mae\'r opsiwn yma angen clo sgrin arall wrth gefn.</string>
     <string name="face_unlock_set_unlock_pattern">Datgloi ag Wyneb + Patrwm</string>
     <string name="face_unlock_set_unlock_pin">Datgloi ag Wyneb + PIN</string>
     <string name="face_unlock_set_unlock_password">Datgloi ag Wyneb + Cyfrinair</string>
     <string name="face_unlock_skip_face">Parhau heb Datgloi ag Wyneb</string>
-    <string name="face_unlock_title">Mae\'n bosib datgloi dy ffôn gan ddefnyddio dy wyneb. I fod yn ddiogel, mae\'r opsiwn yma angen clo sgrin arall wrth gefn.</string>
+    <string name="face_unlock_title" product="default">Mae\'n bosib datgloi dy ffôn gan ddefnyddio dy wyneb. I fod yn ddiogel, mae\'r opsiwn yma angen clo sgrin arall wrth gefn.</string>
     <string name="biometrics_unlock_set_unlock_pattern">Patrwm \u2022 Wyneb \u2022 Ôl bys</string>
     <string name="biometrics_unlock_set_unlock_pin">PIN \u2022 Wyneb \u2022 Ôl bys</string>
     <string name="biometrics_unlock_set_unlock_password">Cyfrinair \u2022 Wyneb \u2022 Ôl bys</string>
     <string name="biometrics_unlock_skip_biometrics">Parhau heb wyneb neu ôl bys</string>
-    <string name="biometrics_unlock_title">Mae\'n bosib datgloi dy ffôn gan ddefnyddio dy wyneb neu ôl dy fys. I fod yn ddiogel, mae\'r opsiwn yma angen clo sgrin arall wrth gefn.</string>
+    <string name="biometrics_unlock_title" product="default">Mae\'n bosib datgloi dy ffôn gan ddefnyddio dy wyneb neu ôl dy fys. I fod yn ddiogel, mae\'r opsiwn yma angen clo sgrin arall wrth gefn.</string>
     <string name="unlock_set_unlock_disabled_summary">Analluogwyd gan weinyddwr, polisi amgryptio, neu storfa tyst-nodyn</string>
     <string name="unlock_set_unlock_mode_off">Dim</string>
     <string name="unlock_set_unlock_mode_none">Llusgo</string>
@@ -696,6 +709,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>
@@ -859,6 +878,7 @@
     <string name="device_details_title">Manylion y ddyfais</string>
     <string name="bluetooth_device_mac_address">Cyfeiriad Bluetooth y ddyfais: <xliff:g id="address">%1$s</xliff:g></string>
     <string name="bluetooth_unpair_dialog_title">Anghofio\'r ddyfais?</string>
+    <string name="remove_association_button">Tynnu cydgysylltiad</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title">Datgysylltu\'r Ap?</string>
     <string name="bluetooth_unpair_dialog_body" product="default">Ni fydd dy ffôn mwyach wedi ei baru â \"<xliff:g id="device_name">%1$s</xliff:g></string>
     <string name="bluetooth_unpair_dialog_body" product="tablet">Ni fydd dy lechen mwyach wedi ei pharu â \"<xliff:g id="device_name">%1$s</xliff:g>.\"</string>
@@ -924,6 +944,7 @@
     <string name="nfc_disclaimer_title">Rhoi NFC ar waith</string>
     <string name="nfc_disclaimer_content">Mae cyfathrebiad maes cyfagos (NFC - near field communication) yn ddull trosglwyddo data rhwng y ddyfais hon a dyfeisiau neu dargedau cyfagos, megis terfynellau talu, darllenwyr mynediad, a thagiau neu hysbysebion rhyngweithiol.</string>
     <string name="nfc_secure_settings_title">Gofyn i ddatgloi\'r ddyfais ar gyfer NFC</string>
+    <string name="nfc_secure_toggle_summary" product="default">Caniatáu defnydd NFC dim ond pan fo\'r sgrin wedi\'i datgloi</string>
     <string name="android_beam_settings_title">Android Beam</string>
     <string name="android_beam_on_summary">Yn barod i drawsyrru cynnwys ap trwy NFC</string>
     <string name="android_beam_off_summary">I ffwrdd</string>
@@ -1044,6 +1065,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network">Canola\u2019r cod QR isod i gysylltu â \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network">Ymuna â Wi\u2011Fi wrth sganoi cod QR</string>
     <string name="wifi_dpp_share_wifi">Rhannu Wi\u2011Fi</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device">Sgania\'r cod QR hon gyda dyfais arall i ymuno â \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device">Sgania\u2019r cod QR hwn i gysylltu â \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
     <string name="wifi_dpp_failure_authentication_or_configuration">Rho gynnig arall arni. Os yw\u2019r broblem yn parhau, cysyllta â gwneuthurwr y ddyfais.</string>
     <string name="wifi_dpp_failure_not_compatible">Aeth rhywbeth o\'i le</string>
@@ -1147,6 +1169,7 @@
     <string name="wifi_advanced_ssid_title">SSID</string>
     <string name="wifi_advanced_device_mac_address_title">Cyfeiriad MAC dyfais</string>
     <string name="wifi_advanced_randomized_mac_address_title">Cyfeiriad MAC ar hap</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title">Cyfeiriad MAC ar hap (defnyddiwyd diwethaf)</string>
     <string name="wifi_advanced_ip_address_title">Cyfeiriad IP</string>
     <string name="wifi_details_title">Manylion y rhwydwaith</string>
     <string name="wifi_details_subnet_mask">Masg isrwyd</string>
@@ -1164,6 +1187,8 @@
     <string name="wifi_ip_settings_invalid_gateway">Rho gyfeiriad porth dilys.</string>
     <string name="wifi_ip_settings_invalid_dns">Rho gyfeiriad DNS dilys.</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length">Rho hyd ragddodiad rhwydwaith rhwng 0 a 32.</string>
+    <string name="wifi_dns1">DNS 1 (oni bai bod DNS Preifat yn damsang)</string>
+    <string name="wifi_dns2">DNS 2 (oni bai bod DNS Preifat yn damsang)</string>
     <string name="wifi_gateway">Porth</string>
     <string name="wifi_network_prefix_length">Hyd rhagddodiad rhwydwaith</string>
     <string name="wifi_p2p_settings_title">Llecyn Wi\u2011Fi</string>
@@ -1197,6 +1222,9 @@
     <string name="wifi_hotspot_footer_info_local_only">Gall apiau creu llecyn Wi-Fi er mwyn rhannu cynnwys gyda dyfeisiau cyfagos.</string>
     <string name="wifi_hotspot_auto_off_title">Troi\'r llecyn i ffwrdd yn awtomatig</string>
     <string name="wifi_hotspot_auto_off_summary">Pan nad oes dyfeisiau wedi\'u cysylltu</string>
+    <string name="wifi_hotspot_maximize_compatibility">Ehangu cytunedd</string>
+    <string name="wifi_hotspot_maximize_compatibility_single_ap_summary">Mae\'n helpu dyfeisiau eraill i ganfod y llecyn hwn. Mae\'n lleihau cyflymder cysylltiad llecyn.</string>
+    <string name="wifi_hotspot_maximize_compatibility_dual_ap_summary">Mae\'n helpu dyfeisiau eraill i ganfod y llecyn hwn. Mae\'n cynyddu defnydd batri.</string>
     <string name="wifi_tether_starting">Yn troi\'r llecyn Wi-Fi ymlaen\u2026</string>
     <string name="wifi_tether_stopping">Yn troi\'r llecyn Wi-Fi i ffwrdd\u2026</string>
     <string name="wifi_tether_enabled_subtext">Mae <xliff:g id="network_ssid">%1$s</xliff:g> yn weithredol</string>
@@ -1300,6 +1328,7 @@
     <string name="auto_rotate_option_off">I ffwrdd</string>
     <string name="auto_rotate_option_on">Ymlaen</string>
     <string name="auto_rotate_option_face_based">Ymlaen - Ar sail wyneb</string>
+    <string name="auto_rotate_switch_face_based">Synhwyro Wynebau</string>
     <string name="color_mode_title">Lliwiau</string>
     <string name="color_mode_option_natural">Naturiol</string>
     <string name="color_mode_option_boosted">Cyfnerthwyd</string>
@@ -1412,6 +1441,7 @@
     <string name="style_suggestion_title">Cyfaddasu dy ffôn</string>
     <string name="style_suggestion_summary">Rho gynnig ar wahanol arddulliau, papurau wal, a mwy</string>
     <string name="screensaver_settings_title">Arbedwr sgrin</string>
+    <string name="screensaver_settings_when_to_dream_bedtime">Dim ar gael am fod modd amser gwely ymlaen</string>
     <string name="screensaver_settings_summary_either_long">Wrth wefru neu wedi docio</string>
     <string name="screensaver_settings_summary_sleep">Wrth wefru</string>
     <string name="screensaver_settings_summary_dock">Tra wedi\'i docio</string>
@@ -1669,7 +1699,7 @@
     <string name="storage_wizard_slow_v2_title"><xliff:g id="name" example="SD card">^1</xliff:g> araf</string>
     <string name="storage_wizard_slow_v2_body">Gellir dal i ddefnyddio\'r <xliff:g id="name" example="SanDisk SD card">^1</xliff:g>, ond fe all fod yn araf.
 \n\nMae\'n bosib na fydd apiau wedi\'u cadw ar <xliff:g id="name" example="SD card">^2</xliff:g> yn gweithio\'n gywir a gall trosglwyddo cynnwys cymryd amser hir.
-\n\nRho gynnig ar ddefnyddio <xliff:g id="name" example="SD card">^3</xliff:g> cyflymach neu ddefnyddio\'r <xliff:g id="name" example="SD card">^4</xliff:g> hwn ar gyfer storfa gludadwy yn lle.</string>
+\n\nRho gynnig ar ddefnyddio <xliff:g id="name" example="SD card">^3</xliff:g> cyflymach neu defnyddio\'r <xliff:g id="name" example="SD card">^4</xliff:g> hwn ar gyfer storfa gludadwy yn lle.</string>
     <string name="storage_wizard_slow_v2_start_over">Dechrau eto</string>
     <string name="storage_wizard_slow_v2_continue">Parhau</string>
     <string name="battery_status_title">Statws batri</string>
@@ -2066,8 +2096,10 @@
     <string name="enable_text">Galluogi</string>
     <string name="clear_user_data_text">Clirio\'r storfa</string>
     <string name="app_factory_reset">Dadosod diweddariadau</string>
+    <string name="auto_launch_enable_text">Mae rhai gweithredoedd wedi\u2019dewis yn agor yn y tab hwn fel rhagosodiad.</string>
     <string name="always_allow_bind_appwidgets_text">Rwyt wedi dewis caniatáu i’r ap hwn greu teclynnau a chael mynediad at eu data.</string>
     <string name="auto_launch_disable_text">Dim rhagosodiadau wedi\'u gosod.</string>
+    <string name="clear_activities">Clirio dewisiadau rhagosodedig</string>
     <string name="screen_compatibility_text">Mae\'n bosib nad yw\'r ap hwn wedi ei ddylunio ar gyfer dy sgrin. Gellir rheoli sut mae\'n addasu i dy sgrin yma.</string>
     <string name="ask_compatibility">Gofyn wrth lansio</string>
     <string name="enable_compatibility">Graddio\'r ap</string>
@@ -2223,6 +2255,7 @@
     <string name="keyboard_layout_picker_title">Gosodiadau bysellfyrddau</string>
     <string name="user_dict_settings_title">Geiriadur personol</string>
     <string name="user_dict_settings_for_work_title">Geiriadur personol ar gyfer gwaith</string>
+    <string name="user_dict_settings_summary">Ychwanega eiriau i\'w ddefnyddio mewn apiau fel gwiriwr sillafu</string>
     <string name="user_dict_settings_add_menu_title">Ychwanegu</string>
     <string name="user_dict_settings_add_dialog_title">Ychwanegu i\'r geiriadur</string>
     <string name="user_dict_settings_add_screen_title">Ymadrodd</string>
@@ -2295,8 +2328,11 @@
     <string name="accessibility_captioning_about_title">Ynghylch dewisiadau capsiynau</string>
     <string name="accessibility_captioning_footer_learn_more_content_description">Dysgu mwy am ddewisiadau capsiynau</string>
     <string name="accessibility_screen_magnification_title">Chwyddo</string>
+    <string name="accessibility_screen_magnification_shortcut_title">Llwybr byr at chwyddiad</string>
     <string name="accessibility_screen_magnification_about_title">Ynghylch chwyddiad</string>
     <string name="accessibility_screen_magnification_footer_learn_more_content_description">Dysgu mwy am chwyddiad</string>
+    <string name="accessibility_magnification_mode_title">Math o chwyddiad</string>
+    <string name="accessibility_magnification_area_settings_message">Chwydda dy sgrin lawn, rhan benodol, neu newid rhwng y ddau opsiwn</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary">Sgrin lawn</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary">Sgrin rannol</string>
     <string name="accessibility_magnification_area_settings_all_summary">Newid rhwng sgrin lawn a sgrin rannol</string>
@@ -2304,9 +2340,11 @@
     <string name="accessibility_magnification_mode_dialog_option_full_screen">Chwyddo\'r sgrin gyfan</string>
     <string name="accessibility_magnification_mode_dialog_option_window">Chwyddo rhan o\'r sgrin</string>
     <string name="accessibility_magnification_mode_dialog_option_switch">Newid rhwng sgrin lawn a sgrin rannol</string>
+    <string name="accessibility_magnification_area_settings_mode_switch_summary">Tapia\'r botwm newid i symud rhwng y ddau opsiwn</string>
     <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_switch_shortcut_negative_button">Defnyddio tap triphlyg</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>
@@ -2352,6 +2390,7 @@
     <string name="accessibility_shortcut_edit_dialog_summary_hardware">Pwyso a dal y ddwy fysell sain</string>
     <string name="accessibility_shortcut_edit_dialog_title_triple_tap">Tapio\'r sgrin teirgwaith</string>
     <string name="accessibility_shortcut_triple_tap_keyword">tapio\'r sgrin teirgwaith</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_triple_tap">Tapia ar y sgrin yn gyflym {0,number,integer} gwaith. Gall y llwybr brys hwn arafu dy ddyfais.</string>
     <string name="accessibility_shortcut_edit_dialog_title_advance">Uwch</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning">Mae\'r botwm Hygyrchedd wedi\'i osod i <xliff:g id="service" example="Select to Speak">%1$s</xliff:g>. I ddefnyddio chwyddo, cyffyrdda a dal y botwm Hygyrchedd, yna dewisa chwyddo.</string>
     <string name="accessibility_screen_magnification_gesture_navigation_warning">Mae\u2019r ystumiad hygyrchedd wedi\u2019i osod i <xliff:g id="service" example="Select to Speak">%1$s</xliff:g>. I ddefnyddio chwyddiad, llusga i fyny gyda dau fys o waelod y sgrin a dal. Yna dewis chwyddiad.</string>
@@ -2367,8 +2406,11 @@
     <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_or_gesture_title">Defnyddio fotwm neu ystum</string>
     <string name="accessibility_button_location_title">Lleoliad</string>
     <string name="accessibility_button_size_title">Maint</string>
+    <string name="accessibility_button_fade_title">Pylu pan nad yw mewn defnydd</string>
+    <string name="accessibility_button_fade_summary">Mae\u2019n pylu ar ôl ychydig eiliadau fel ei bod yn haws gweld dy sgrin</string>
     <string name="accessibility_button_opacity_title">Tryloywder pan nad yw\'n cael ei ddefnyddio</string>
     <string name="accessibility_button_low_label">Tryloyw</string>
     <string name="accessibility_button_high_label">Anhryloyw</string>
@@ -2443,6 +2485,7 @@
         <item quantity="many"><xliff:g id="number_device_count">%1$d</xliff:g> theclyn clyw wedi\'u cadw</item>
         <item quantity="other"><xliff:g id="number_device_count">%1$d</xliff:g> teclyn clyw wedi\'u cadw</item>
     </plurals>
+    <string name="accessibility_audio_adjustment_title">Addasiad sain</string>
     <string name="accessibility_summary_shortcut_enabled">Llwybr byr ymlaen</string>
     <string name="accessibility_summary_shortcut_disabled">I ffwrdd</string>
     <string name="accessibility_summary_state_enabled">Ymlaen</string>
@@ -2456,6 +2499,12 @@
     <string name="daltonizer_mode_tritanomaly_title">Glas-melyn</string>
     <string name="daltonizer_mode_grayscale_title">Graddlwyd</string>
     <string name="daltonizer_mode_tritanomaly_summary">Tritanomaledd</string>
+    <string name="reduce_bright_colors_preference_title">Pŵl iawn</string>
+    <string name="reduce_bright_colors_switch_title">Gwneud y sgrin yn bŵl iawn</string>
+    <string name="reduce_bright_colors_shortcut_title">Llwybr byr at bŵl iawn</string>
+    <string name="reduce_bright_colors_about_title">Ynghylch pŵl iawn</string>
+    <string name="reduce_bright_colors_preference_summary" product="default">Pylu\u2019r sgrin yn is na disgleirdeb lleiaf dy ffôn</string>
+    <string name="reduce_bright_colors_preference_summary" product="tablet">Pylu\u2019r sgrin yn is na disgleirdeb lleiaf dy lechen</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>
@@ -2646,7 +2695,6 @@
     <string name="history_details_title">Manylion hanes</string>
     <string name="advanced_battery_preference_title">Defnydd batri</string>
     <string name="advanced_battery_preference_summary_with_hours">Gweld defnydd y 24 awr ddiwethaf</string>
-    <string name="advanced_battery_preference_summary">Gweld defnydd ers gwefru\'n llawn</string>
     <string name="details_subtitle">Manylion defnydd</string>
     <string name="controls_subtitle">Addasu defnydd pŵer</string>
     <string name="packages_subtitle">Pecynnau wedi\'u cynnwys</string>
@@ -2824,7 +2872,7 @@
     <string name="battery_sugg_bluetooth_basic">Troi Bluetooth i ffwrdd pan nad yw\'n cael ei ddefnyddio</string>
     <string name="battery_sugg_bluetooth_headset">Ceisia gysylltu â dyfais Bluetooth arall</string>
     <string name="battery_desc_apps">Batri a ddefnyddiwyd gan apiau</string>
-    <string name="battery_sugg_apps_info">Atal neu ddadosod yr ap</string>
+    <string name="battery_sugg_apps_info">Atal neu dadosod yr ap</string>
     <string name="battery_sugg_apps_gps">Dewisa fodd arbed batri</string>
     <string name="battery_sugg_apps_settings">Mae\'n bosib bod yr ap yn cynnig gosodiadau i leihau defnydd batri</string>
     <string name="battery_desc_users">Batri a ddefnyddiwyd gan y defnyddiwr</string>
@@ -2846,25 +2894,18 @@
     <string name="battery_detail_power_usage">Defnydd batri</string>
     <string name="battery_detail_info_title">Ers gwefru\'n llawn</string>
     <string name="battery_detail_manage_title">Rheoli defnydd batri</string>
-    <string name="battery_total_and_bg_usage">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> • <xliff:g id="time" example="39 min">^2</xliff:g> cefndir\ners gwefru\'n llawn</string>
     <string name="battery_total_and_bg_usage_24hr">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> • <xliff:g id="time" example="39 min">^2</xliff:g> cefndir\ndros y 24 awr ddiwethaf</string>
     <string name="battery_total_and_bg_usage_with_period">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> • <xliff:g id="time" example="39 min">^2</xliff:g> cefndir\nam <xliff:g id="time_period" example="12 am-2 am">^3</xliff:g></string>
-    <string name="battery_total_usage_less_minute">Cyfanswm llai na munud ers gwefru\'n llawn</string>
     <string name="battery_total_usage_less_minute_24hr">Cyfanswm llai na munud dros y 24 awr ddiwethaf</string>
     <string name="battery_total_usage_less_minute_with_period">Cyfanswm llai na munud am <xliff:g id="time_period" example="12 am-2 am">^1</xliff:g></string>
-    <string name="battery_bg_usage_less_minute">Cefndir llai na munud ers gwefru\'n llawn</string>
     <string name="battery_bg_usage_less_minute_24hr">Cefndir llai na munud dros y 24 awr ddiwethaf</string>
     <string name="battery_bg_usage_less_minute_with_period">Cefndir llai na munud am <xliff:g id="time_period" example="12 am-2 am">^1</xliff:g></string>
-    <string name="battery_total_usage">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> ers gwefru\'n llawn</string>
     <string name="battery_total_usage_24hr">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> dros y 24 awr ddiwethaf</string>
     <string name="battery_total_usage_with_period">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> am <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>
-    <string name="battery_bg_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> cefndir ers gwefru\'n llawn</string>
     <string name="battery_bg_usage_24hr"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> cefndir dros y 24 awr ddiwethaf</string>
     <string name="battery_bg_usage_with_period"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> cefndir am <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>
-    <string name="battery_total_usage_and_bg_less_minute_usage">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> • cefndir llai na munud\ners gwefru\'n llawn</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> • cefndir llai na munud\ndros y 24 awr ddiwethaf</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period">Cyfanswm <xliff:g id="time" example="1 hr 15 min">^1</xliff:g> • cefndir llai na munud\nam <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>
-    <string name="battery_not_usage">Dim defnydd ers gwefru\'n llawn diwethaf</string>
     <string name="battery_not_usage_24hr">Dim defnydd dros y 24 awr ddiwethaf</string>
     <string name="battery_usage_other_users">Defnyddwyr eraill</string>
     <string name="advanced_battery_graph_subtext">Mae\'r batri\'n weddill wedi\'i amcan ar sail defnydd dy ddyfais</string>
@@ -3615,6 +3656,7 @@
     <string name="call_volume_option_title">Uchder sain galwadau</string>
     <string name="alarm_volume_option_title">Uchder sain larymau</string>
     <string name="ring_volume_option_title">Uchder sain canu a hysbysiadau</string>
+    <string name="separate_ring_volume_option_title">Uchder sain caniad ffôn</string>
     <string name="notification_volume_option_title">Uchder sain hysbysiadau</string>
     <string name="ringtone_title">Tôn caniad y ffôn</string>
     <string name="notification_ringtone_title">Sain hysbysiad rhagosodedig</string>
@@ -3643,6 +3685,12 @@
     <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_schedules_summary">        {count, plural,
+           =0 {Dim}
+            =1    {1 amserlen wedi\'i osod}
+            other {# 1 amserlen wedi\'u gosod}
+        }
+    </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>
@@ -3713,12 +3761,21 @@
     <string name="zen_mode_sound_summary_on">Ymlaen</string>
     <string name="zen_mode_duration_summary_always_prompt">Gofyn bob tro</string>
     <string name="zen_mode_duration_summary_forever">Nes dy fod yn ei ddiffodd</string>
-    <string name="zen_mode_duration_summary_time_hours">        {count, plural, zero {} other {# awr}
+    <string name="zen_mode_duration_summary_time_hours">        {count, plural,
+            zero {# oriau}
+            =1    {1 awr}
+            other {# awr}
         }
     </string>
     <string name="zen_mode_duration_summary_time_minutes">        {count, plural, zero {} two {# funud} other {# munud}
         }
     </string>
+    <string name="zen_mode_sound_summary_off">        {count, plural,
+            =0    {I ffwrdd}
+            =1    {I ffwrdd / Gall 1 amserlen droi ymlaen yn awtomatig}
+            other {I ffwrdd / Gall # amserlen troi ymlaen yn awtomatig}
+        }
+    </string>
     <string name="zen_category_behavior">Pa bethau all dorri ar draws Dim Tarfu</string>
     <string name="zen_category_people">Pobol</string>
     <string name="zen_category_apps">Apiau</string>
@@ -4865,7 +4922,7 @@
     <string name="dark_theme_slice_subtitle">Mae\u2019n helpu ymestyn oes batri</string>
     <string name="quick_settings_developer_tiles">Teils gosodiadau cyflym datblygwr</string>
     <string name="adb_authorization_timeout_title">Analluogi terfyn amser awdurdodiad adb</string>
-    <string name="adb_authorization_timeout_summary">Analluogi dod ag awdurdodiadau adb i ben yn awtomatig i systemau sydd heb gysylltu o fewn y cyfnod amser rhagosodedig (7 diwrnod) neu ddewis y defnyddiwr (o leiaf 1 diwrnod).</string>
+    <string name="adb_authorization_timeout_summary">Analluogi dod ag awdurdodiadau ADB i ben yn awtomatig i systemau sydd heb gysylltu o fewn y cyfnod amser rhagosodedig (7 diwrnod) neu dewis y defnyddiwr (o leiaf 1 diwrnod).</string>
     <string name="winscope_trace_quick_settings_title">Olrhain WinScope</string>
     <string name="sensors_off_quick_settings_title">Synwyryddion i Ffwrdd</string>
     <string name="managed_profile_settings_title">Gosodiadau proffil gwaith</string>
@@ -4936,6 +4993,10 @@
     <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>
     <string name="ambient_display_title" product="device">Tariad dwbl i wirio\'r ddyfais</string>
+    <string name="one_handed_mode_swipe_down_category">Llusgo i lawr i</string>
+    <string name="one_handed_mode_use_shortcut_category">Defnyddio\u2019r llwybr byr i</string>
+    <string name="one_handed_action_pull_down_screen_title">Tynnu\u2019r sgrin o fewn cyffwrdd</string>
+    <string name="one_handed_action_pull_down_screen_summary">Daw top y sgrin i lawr o fewn cyffwrdd i dy fawd.</string>
     <string name="one_handed_action_show_notification_title">Dangos hysbysiadau</string>
     <string name="one_handed_action_show_notification_summary">Bydd hysbysiadau a gosodiadau yn ymddangos.</string>
     <string name="ambient_display_summary">I wirio\u2019r amser, hysbysiadau, a gwybodaeth arall, rho dap dwbl ar dy sgrin.</string>
@@ -4959,6 +5020,7 @@
     <string name="emergency_gesture_category_call_for_help_title">Galw am help</string>
     <string name="emergency_gesture_call_for_help_title">Galw am help</string>
     <string name="emergency_gesture_call_for_help_dialog_title">Rhif i\'w alw am help</string>
+    <string name="emergency_gesture_call_for_help_summary"><xliff:g id="phone_number" example="911">%1$s</xliff:g>. Tapia i\u2019w newid</string>
     <string name="fingerprint_swipe_for_notifications_title">Llusgo ôl bys ar gyfer hysbysiadau</string>
     <string name="fingerprint_gesture_screen_title">Sganio ôl bys</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default">I weld dy hysbysiadau, llithra bys lawr dros y synhwyrydd olion bysedd ar gefn dy ffôn.</string>
@@ -4969,7 +5031,7 @@
     <string name="gesture_setting_off">I ffwrdd</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Mae\'r cychwynnydd eisoes wedi ei ddatgloi.</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity">Cysylltu â\'r rhyngrwyd gyntaf</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Cysylltu â\'r rhyngrwyd neu gysylltu â dy ddarparwr gwasanaeth</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Cysyllta â\'r rhyngrwyd neu cysyllta dy ddarparwr gwasanaeth</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device">Dim ar gael ar ddyfeisiau wedi eu cloi i ddarparwr gwasanaeth</string>
     <string name="oem_lock_info_message">Rhaid ailgychwyn y ddyfais i alluogi nodwedd gwarchod y ddyfais.</string>
     <string name="automatic_storage_manager_freed_bytes">Cyfanswm o <xliff:g id="size" example="3.25MB">%1$s</xliff:g> wedi ei ryddhau.\n\nRhedwyd diwethaf ar <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
@@ -5206,7 +5268,7 @@
     <string name="my_device_info_device_identifiers_category_title">Adnabyddwyr dyfeisiau</string>
     <string name="change_wifi_state_title">Rheolaeth Wi-Fi</string>
     <string name="change_wifi_state_app_detail_switch">Caniatáu i\'r ap reoli Wi-Fi</string>
-    <string name="change_wifi_state_app_detail_summary">Caniatáu i\'r ap hwn 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="change_wifi_state_app_detail_summary">Caniatáu i\'r ap hwn droi Wi-Fi ymlaen ac i ffwrdd, sganio am a chysylltu â rhwydweithiau Wi-Fi, tynnu neu ychwanegu rhwydweithiau neu dechrau llecyn Wi-Fi.</string>
     <string name="media_output_title">Chwarae cyfryngau i</string>
     <string name="media_output_label_title">Chwarae <xliff:g id="label" example="Music Player">%s</xliff:g> ar</string>
     <string name="media_output_default_summary">Y ddyfais hon</string>
@@ -5401,7 +5463,7 @@
     <string name="post_dsds_reboot_notification_text">Tapia i ddiweddaru gosodiadau SIM</string>
     <string name="network_changed_notification_text">Mae dy rwydwaith symudol wedi newid</string>
     <string name="dsds_notification_after_suw_title">Gosod dy SIM arall</string>
-    <string name="dsds_notification_after_suw_text">Dewisa dy SIM weithredol neu ddewis dau SIM ar yr un pryd</string>
+    <string name="dsds_notification_after_suw_text">Dewisa dy SIM weithredol neu defnyddio dau SIM ar yr un pryd</string>
     <string name="choose_sim_title">Dewisa rif i\'w ddefnyddio</string>
     <string name="choose_sim_text">{count, plural, zero {} one {Mae # rhif ar gael ar y ddyfais hon, a dim ond un at y tro gellir ei ddefnyddio.} two {Mae # rif ar gael ar y ddyfais hon, ond dim ond un at y tro gellir ei ddefnyddio.} other {Mae # rhif ar gael ar y ddyfais hon, ond dim ond un at y tro gellir ei ddefnyddio.}
     }</string>
@@ -5527,6 +5589,8 @@
     <string name="power_menu_long_press_for_assist_sensitivity_high_label">Hir</string>
     <string name="lockscreen_privacy_wallet_setting_toggle">Dangos waled</string>
     <string name="lockscreen_privacy_controls_setting_toggle">Dangos rheolyddion y ddyfais</string>
+    <string name="lockscreen_double_line_clock_summary">Dangos cloc llinell ddwbl pan ar gael</string>
+    <string name="lockscreen_double_line_clock_setting_toggle">Cloc llinell ddwbl</string>
     <string name="media_output_panel_stop_casting_button">Stopio taflu</string>
     <string name="volte_5G_limited_title">Troi VoLTE i ffwrdd?</string>
     <string name="volte_5G_limited_text">Mae hyn hefyd yn troi dy gysylltiad 5g i ffwrdd.\nYn ystod galwad llais, ni fydd yn bosib defnyddio\u2019r rhyngrwyd a bydd rhai apiau ddim yn gweithio.</string>
@@ -5557,7 +5621,11 @@
         <annotation id="url">Dysgu rhagor</annotation></string>
     <string name="calls_preference_title">Galwadau</string>
     <string name="sms_preference_title">SMS</string>
+    <string name="calls_sms_preferred">ffafrir</string>
+    <string name="calls_sms_calls_preferred">ffafrio ar gyfer galwadau</string>
+    <string name="calls_sms_sms_preferred">ffafrio ar gyfer SMS</string>
     <string name="calls_sms_unavailable">dim ar gael</string>
+    <string name="calls_sms_temp_unavailable">Dim ar gael ar hyn o bryd</string>
     <string name="calls_sms_no_sim">Dim SIM</string>
     <string name="network_and_internet_preferences_title">Dewisiadau rhwydwaith</string>
     <string name="keywords_internet">cysylltiad rhwydwaith, rhyngrwyd, di-wifr, dara, wifi, wi-fi, symudol, 4g, 3g, 2g, lte, 5g</string>
@@ -5566,15 +5634,21 @@
     <string name="reset_your_internet_title">Ailosod dy gysylltiad rhyngrwyd?</string>
     <string name="reset_internet_text" product="default">Daw hyn a\u2019r alwad i ben</string>
     <string name="reset_internet_text" product="tablet">Daw hyn a\u2019r alwad i ben</string>
+    <string name="resetting_internet_text">Yn ailosod dy ryngrwyd\u2026</string>
+    <string name="fix_connectivity">Trwsio cysylltedd</string>
     <string name="networks_available">Rhwydweithiau ar gael</string>
     <string name="to_switch_networks_disconnect_ethernet">I newid rhwydwaith, datgysyllta ether-rwyd</string>
+    <string name="wifi_is_off">Mae Wi\u2011Fi i ffwrdd</string>
     <string name="tap_a_network_to_connect">Tapia rwydwaith i gysylltu</string>
+    <string name="carrier_wifi_offload_title">Cysylltiadau W+</string>
+    <string name="carrier_wifi_offload_summary">Caniatáu Google Fi i ddefnyddio rhwydweithiau W+ i wella cyflymder ac argaeledd</string>
     <string name="carrier_wifi_network_title">Rhwydwaith W+</string>
     <string name="sim_category_title">SIM</string>
     <string name="downloaded_sim_category_title">SIM wedi\'i LAWRLWYTHO</string>
     <string name="downloaded_sims_category_title">SIMiau wedi\'u LAWRLWYTHO</string>
     <string name="sim_category_active_sim">Gweithredol</string>
     <string name="sim_category_inactive_sim">Anweithredol</string>
+    <string name="sim_category_default_active_sim">\u0020/ Rhagosodiad ar gyfer <xliff:g name="default_sim_config" example=" / Default for calls">%1$s</xliff:g></string>
     <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>
@@ -5589,6 +5663,7 @@
     <string name="mobile_data_disable_message">Ni fydd gennyt fynediad at ddata na\u2019r rhyngrwyd trwy <xliff:g id="carrier" example="T-Mobile">%s</xliff:g>. Bydd y rhyngrwyd ond ar gael dros Wi\u2011Fi.</string>
     <string name="mobile_data_disable_message_default_carrier">dy ddarparwr gwasanaeth</string>
     <string name="aware_summary_when_bedtime_on">Dim ar gael am fod modd amser gwely ymlaen</string>
+    <string name="reset_importance_completed">Cwblhawyd ailosod pwysigrwydd hysbysiadau.</string>
     <string name="apps_dashboard_title">Apiau</string>
     <string name="bluetooth_message_access_notification_content">Mae dyfais eisiau cael mynediad at dy negeseuon. Tapia am fanylion.</string>
     <string name="bluetooth_message_access_dialog_title">Caniatáu mynediad at negeseuon?</string>
@@ -5634,6 +5709,8 @@
     <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="show_clip_access_notification">Dangos mynediad i\'r clipfwrdd</string>
+    <string name="show_clip_access_notification_summary">Mae\u2019n dangos neges pan fo apiau yn cael mynediad at destun, delwedau neu gynnwys arall rwyt wedi\u2019i gopïo.</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>
diff --git a/overlay/packages/apps/Settings/res/values-eo/arrays.xml b/overlay/packages/apps/Settings/res/values-eo/arrays.xml
index 2e831ef..d1f5395 100644
--- a/overlay/packages/apps/Settings/res/values-eo/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-eo/arrays.xml
@@ -204,7 +204,7 @@
         <item>Run in background</item>
         <item>Accessibility volume</item>
     </string-array>
-    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>Neniam</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/Settings/res/values-gd/arrays.xml b/overlay/packages/apps/Settings/res/values-gd/arrays.xml
index 3427a05..0e95256 100644
--- a/overlay/packages/apps/Settings/res/values-gd/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-gd/arrays.xml
@@ -576,7 +576,7 @@
         <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">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>Chan ann idir</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/Settings/res/values-gd/strings.xml b/overlay/packages/apps/Settings/res/values-gd/strings.xml
index 883158a..663e23f 100644
--- a/overlay/packages/apps/Settings/res/values-gd/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-gd/strings.xml
@@ -453,8 +453,8 @@
     <string name="fingerprint_unlock_set_unlock_pin">Lorg-mheòir + PIN</string>
     <string name="fingerprint_unlock_set_unlock_password">Lorg-mheòir + facal-faire</string>
     <string name="fingerprint_unlock_skip_fingerprint">Lean air adhart às aonais luirg-mheòir</string>
-    <string name="fingerprint_unlock_title">’S urrainn dhut a’ ghlas a thoirt far an uidheim agad le do lorg-mheòir. A chùm tèarainteachd, tha an roghainn seo feumach air glas sgrìn dàrnach.</string>
-    <string name="face_unlock_title">’S urrainn dhut a’ ghlas a thoirt far an uidheim agad le d’ aodann. A chùm tèarainteachd, tha an roghainn seo feumach air glas sgrìn dàrnach.</string>
+    <string name="fingerprint_unlock_title" product="default">’S urrainn dhut a’ ghlas a thoirt far an uidheim agad le do lorg-mheòir. A chùm tèarainteachd, tha an roghainn seo feumach air glas sgrìn dàrnach.</string>
+    <string name="face_unlock_title" product="default">’S urrainn dhut a’ ghlas a thoirt far an uidheim agad le d’ aodann. A chùm tèarainteachd, tha an roghainn seo feumach air glas sgrìn dàrnach.</string>
     <string name="unlock_set_unlock_disabled_summary">Chaidh a chur à comas le rianaire, le poileasaidh crioptachaidh no
         le stòras theisteasan</string>
     <string name="unlock_set_unlock_mode_off">Na glais</string>
@@ -1157,6 +1157,7 @@
     <string name="style_suggestion_title">Gnàthaich am fòn agad</string>
     <string name="style_suggestion_summary">Cleachd stoidhlean eadar-dhealaichte, pàipearan-balla is a bharrachd</string>
     <string name="screensaver_settings_title">Sàbhalaiche-sgrìn</string>
+    <string name="screensaver_settings_when_to_dream_bedtime">Chan eil seo ri fhaighinn air sgàth ’s gu bheil modh an ama-cadail air</string>
     <string name="screensaver_settings_summary_either_long">Rè teàirrdseadh no docadh</string>
     <string name="screensaver_settings_summary_sleep">Rè teàirrdsidh</string>
     <string name="screensaver_settings_summary_dock">Nuair a bhios e docaichte</string>
@@ -3205,6 +3206,7 @@
     <string name="call_volume_option_title">Àirde fuaime nan gairm</string>
     <string name="alarm_volume_option_title">Àirde fuaim nan caismeachdan</string>
     <string name="ring_volume_option_title">Àirde na seirme ⁊ nam brathan</string>
+    <string name="separate_ring_volume_option_title">Àirde fuaim na seirme</string>
     <string name="notification_volume_option_title">Àirde fuaim nam brathan</string>
     <string name="ringtone_title">Seirm an fhòn</string>
     <string name="notification_ringtone_title">Fuaim bhunaiteach nam brathan</string>
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 3372ced..af46f71 100644
--- a/overlay/packages/apps/Settings/res/values-kab-rDZ/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-kab-rDZ/arrays.xml
@@ -487,7 +487,7 @@
         <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">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>Weṛǧin</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/Settings/res/values-ku/arrays.xml b/overlay/packages/apps/Settings/res/values-ku/arrays.xml
index 10cc7c8..17ae0f5 100644
--- a/overlay/packages/apps/Settings/res/values-ku/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-ku/arrays.xml
@@ -447,7 +447,7 @@
         <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">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>هه‌رگیز</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/Settings/res/values-lb/arrays.xml b/overlay/packages/apps/Settings/res/values-lb/arrays.xml
index 19a4b06..b4fcbc2 100644
--- a/overlay/packages/apps/Settings/res/values-lb/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-lb/arrays.xml
@@ -499,7 +499,7 @@
         <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">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>Ni</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/Settings/res/values-lb/strings.xml b/overlay/packages/apps/Settings/res/values-lb/strings.xml
index 8ff4c38..978c59d 100644
--- a/overlay/packages/apps/Settings/res/values-lb/strings.xml
+++ b/overlay/packages/apps/Settings/res/values-lb/strings.xml
@@ -1452,6 +1452,7 @@
     <string name="default_sound">Standard-Toun</string>
     <string name="media_volume_option_title">Medielautstäerkt</string>
     <string name="alarm_volume_option_title">Weckerlautstäerkt</string>
+    <string name="separate_ring_volume_option_title">Schelltounlautstäerkt</string>
     <string name="notification_volume_option_title">Notifikatiounslautstäerkt</string>
     <string name="ringtone_title">Schelltoun</string>
     <string name="notification_ringtone_title">Standard-Notifikatiounstoun</string>
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 ef9ac3f..031d04b 100644
--- a/overlay/packages/apps/Settings/res/values-sc-rIT/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-sc-rIT/arrays.xml
@@ -460,7 +460,7 @@
         <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">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>Mai</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/Settings/res/values-ug/arrays.xml b/overlay/packages/apps/Settings/res/values-ug/arrays.xml
index d270c57..dfd8e4c 100644
--- a/overlay/packages/apps/Settings/res/values-ug/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-ug/arrays.xml
@@ -447,7 +447,7 @@
         <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">
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>ھەرگىز</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
diff --git a/overlay/packages/apps/TV/res/values-cy/strings.xml b/overlay/packages/apps/TV/res/values-cy/strings.xml
index e2acc17..89f760f 100644
--- a/overlay/packages/apps/TV/res/values-cy/strings.xml
+++ b/overlay/packages/apps/TV/res/values-cy/strings.xml
@@ -160,13 +160,13 @@
 \n\nPwysa De i addasu\'r amserlen recordio.</item>
         <item quantity="one">Am fod sianel arall yn cael ei recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
 \n\nPwysa De i addasu\'r amserlen recordio.</item>
-        <item quantity="two">Am fod sianel arall yn cael ei recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
+        <item quantity="two">Am fod sianeli eraill yn cael eu recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
 \n\nPwysa De i addasu\'r amserlen recordio.</item>
-        <item quantity="few">Am fod sianel arall yn cael ei recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
+        <item quantity="few">Am fod sianeli eraill yn cael eu recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
 \n\nPwysa De i addasu\'r amserlen recordio.</item>
-        <item quantity="many">Am fod sianel arall yn cael ei recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
+        <item quantity="many">Am fod sianeli eraill yn cael eu recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
 \n\nPwysa De i addasu\'r amserlen recordio.</item>
-        <item quantity="other">Am fod sianel arall yn cael ei recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
+        <item quantity="other">Am fod sianeli eraill yn cael eu recordio, ni ellir recordio\'r sianel hon tan <xliff:g id="end_time" example="9:30 PM">%1$s</xliff:g>.
 \n\nPwysa De i addasu\'r amserlen recordio.</item>
     </plurals>
     <string name="channel_banner_no_title">Dim teitl</string>
@@ -282,7 +282,7 @@
     <string name="dvr_recording_failed_resource_busy">Methwyd tiwnio i\'r sianel, efallai oherwydd signal gwan, cysylltiad gwael â\'r antena, neu wrthdaro â recordiad arall.</string>
     <string name="dvr_recording_failed_input_unavailable"><xliff:g id="inputId" example="com.example.partnersupportsampletvinput/.SampleTvInputService">%1$s</xliff:g> dim ar gael.</string>
     <string name="dvr_recording_failed_input_dvr_unsupported">Ni chefnogir recordio\'r sianel hon.</string>
-    <string name="dvr_recording_failed_insufficient_space">Dim digon o le. Cysyllta ddyfais storfa allanol neu ddileu rhai recordiadau.</string>
+    <string name="dvr_recording_failed_insufficient_space">Dim digon o le. Cysyllta ddyfais storfa allanol neu dileu rhai recordiadau.</string>
     <string name="dvr_series_deletion_title">Dileu recordiadau</string>
     <string name="dvr_series_deletion_description">Dewisa\'r penodau i\'w dileu. Ni fydd posib eu hadfer ar ôl eu dileu.</string>
     <string name="dvr_series_deletion_no_recordings">Does dim recordiadau i\'w dileu.</string>
diff --git a/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml b/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml
index 1dc67e9..37f58ea 100644
--- a/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml
+++ b/overlay/packages/apps/ThemePicker/res/values-cy/strings.xml
@@ -17,6 +17,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Papur wal ac arddull</string>
     <string name="theme_title">Arddull</string>
+    <string name="clock_title">Cloc Dy Hun</string>
+    <string name="clock_description">Dewis cloc dy hun</string>
+    <string name="clock_picker_entry_content_description">Newid cloc dy hun</string>
     <string name="grid_title">Grid apiau</string>
     <string name="apply_theme_btn">Gosod</string>
     <string name="edit_custom_theme_lbl">Tapia i\'w olygu</string>
@@ -81,4 +84,20 @@
     <string name="themed_icon_title" msgid="4305612684940220645">Eiconau themâu</string>
     <string name="beta_title">Beta</string>
     <string name="gird_picker_entry_content_description" msgid="7538418512525897691">Newid grid apiau</string>
+    <string name="wallpaper_color_tab">Lliwiau papur wal</string>
+    <string name="wallpaper_color_title">Lliw papur wal</string>
+    <string name="preset_color_tab">Lliwiau sylfaenol</string>
+    <string name="color_changed">Wedi newid y lliw</string>
+    <string name="adaptive_color_title">Deinamig</string>
+    <string name="keyguard_slot_name_bottom_start">Botwm chwith</string>
+    <string name="keyguard_slot_name_bottom_end">Botwm dde</string>
+    <string name="keyguard_affordance_none">Dim</string>
+    <string name="keyguard_affordance_enablement_dialog_title">I ddewis `<xliff:g id="appName" example="Wallet">%1$s</xliff:g>`, gwiria\u2019r canlynol</string>
+    <string name="keyguard_affordance_enablement_dialog_action_template">Agor <xliff:g id="appName" example="Wallet">%1$s</xliff:g></string>
+    <string name="keyguard_affordance_enablement_dialog_message">I ychwanegu\u2019r ap <xliff:g id="appName" example="Wallet">%1$s</xliff:g> fel llwybr byr, sicrha</string>
+    <string name="keyguard_affordance_enablement_dialog_dismiss_button">Iawn</string>
+    <string name="keyguard_quick_affordance_title">Llwybrau Byr</string>
+    <string name="keyguard_quick_affordance_section_title">Llwybrau Byr</string>
+    <string name="keyguard_quick_affordance_two_selected_template"><xliff:g id="first">%1$s</xliff:g>, <xliff:g id="second">%2$s</xliff:g></string>
+    <string name="keyguard_quick_affordance_none_selected">Dim</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 09aafc1..94daeb9 100644
--- a/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
+++ b/overlay/packages/apps/Trebuchet/res/values-cy/strings.xml
@@ -31,7 +31,7 @@
     <string name="split_screen_position_right">Hollti\'r dde</string>
     <string name="split_app_info_accessibility">Gwybodaeth ap ar gyfer %1$s</string>
     <string name="long_press_widget_to_add">Cyffyrdda a dal dy gyffwrdd i symud teclyn.</string>
-    <string name="long_accessible_way_to_add">Rho dap dwbl a dal dy gyffwrdd i symud teclyn neu ddefnyddio gweithredoedd addasu.</string>
+    <string name="long_accessible_way_to_add">Rho dap dwbl a dal dy gyffwrdd i symud teclyn neu defnyddio gweithredoedd addasu.</string>
     <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>
@@ -60,7 +60,7 @@
     <string name="all_apps_label">Pob ap</string>
     <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="long_accessible_way_to_add_shortcut">Rho dap dwbl a dal dy gyffwrdd i symud llwybr byr neu defnyddio gweithredoedd addasu.</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>
@@ -81,6 +81,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>
@@ -152,5 +157,6 @@
     <string name="work_apps_paused_edu_accept">Deall yn iawn</string>
     <string name="work_apps_enable_btn_text">Troi apiau gwaith ymlaen</string>
     <string name="developer_options_filter_hint">Hidlydd</string>
+    <string name="search_pref_screen_title_tablet">Chwilio dy lechen</string>
     <string name="remote_action_failed">Methiant: <xliff:g id="what" example="Pause">%1$s</xliff:g></string>
 </resources>
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 6bbab66..18deed3 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,11 @@
     <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="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>
@@ -816,7 +887,7 @@
     <string name="high_power_system">Optimeiddiad pŵer ddim ar gael</string>
     <string name="manage_notification_access_title">Mynediad at hysbysiadau</string>
     <string name="no_notification_listeners">Does dim apiau a osodwyd wedi gofyn am fynediad at hysbysiadau.</string>
-    <string name="notification_listener_security_warning_summary">Mi fydd yn bosib i\'r apiau hyn darllen pob hysbysiad, gan gynnwys gwybodaeth bersonol fel enwau cyswllt a chynnwys negeseuon rwyt yn eu derbyn. Mi fyddan hefyd yn gallu diystyru hysbysiadau neu ddewis gweithredu\'r botymau maen nhw\'n eu cynnwys.    </string>
+    <string name="notification_listener_security_warning_summary">Mi fydd yn bosib i\'r apiau hyn darllen pob hysbysiad, gan gynnwys gwybodaeth bersonol fel enwau cyswllt a chynnwys negeseuon rwyt yn eu derbyn. Mi fyddan hefyd yn gallu diystyru hysbysiadau neu dewis gweithredu\'r botymau maen nhw\'n eu cynnwys.    </string>
     <string name="directory_access">Mynediad at gyfeiriadur</string>
     <string name="directory_access_description">Mae gan yr apiau hyn ganiatâd i edrych yn rhai cyfeiriaduron.</string>
     <string name="directory_on_volume"><xliff:g id="volume" example="SD Card">%1$s</xliff:g> (<xliff:g id="directory" example="Movies">%2$s</xliff:g>)</string>
diff --git a/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml b/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml
index 5ad5353..fc98682 100644
--- a/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml
+++ b/overlay/packages/apps/WallpaperPicker2/res/values-cy/strings.xml
@@ -32,6 +32,7 @@
     <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">Sgriniau cartref 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>
@@ -80,6 +81,8 @@
     <string name="preview">Rhagolwg</string>
     <string name="tab_info">Gwybodaeth</string>
     <string name="tab_customize">Addasu</string>
+    <string name="tab_effects">Effeithiau</string>
+    <string name="my_photos">Fy Lluniau</string>
     <string name="configure_wallpaper">Gosodiadau…</string>
     <string name="delete_live_wallpaper">Dileu</string>
     <string name="delete_wallpaper_confirmation">Dileu\u2019r papur wal hwn o dy ffôn?</string>
@@ -94,6 +97,7 @@
     <string name="wallpaper_title">Papur wal</string>
     <string name="wallpaper_preview_card_content_description">Rhagolwg papur wal</string>
     <string name="collection_not_exist_msg">Dyw\'r casglaiad ddim yn bodoli.</string>
+    <string name="cancel">Diddymu</string>
     <string name="hide_ui_preview_text">Cuddio Rhagolwg UI</string>
     <string name="hint_hide_ui_preview">Mae UI wedi\'i guddio yn rhagolwg. Rho dap dwbl i\'w ddatguddio.</string>
     <string name="show_ui_preview_text">Dangos Rhagolwg UI</string>
@@ -105,4 +109,12 @@
     <string name="accessibility_customize_shown">Addasu wedi\'i ddangos</string>
     <string name="accessibility_info_hidden">Gwybodaeth wedi\'i guddio</string>
     <string name="accessibility_info_shown">Gwybodaeth wedi\'i ddangos</string>
+    <string name="settings_snackbar_description">Galluoga ffeiliau a chyfryngau yn y gosodiadau.</string>
+    <string name="settings_snackbar_enable">Galluogi</string>
+    <string name="open_my_photos">Agor Fy Lluniau</string>
+    <string name="lock_screen_tab">Sgrin cloi</string>
+    <string name="home_screen_tab">Sgrin gartref</string>
+    <string name="reset">Ailosod</string>
+    <string name="reset_confirmation_dialog_title">Wyt ti\u2019n siŵr?</string>
+    <string name="reset_confirmation_dialog_message">Bydd hyn yn ailosod yr holl newidiadau rwyt wedi\u2019u gwneud.</string>
 </resources>
diff --git a/overlay/packages/apps/WallpaperPicker2/res/values-gd/strings.xml b/overlay/packages/apps/WallpaperPicker2/res/values-gd/strings.xml
index 6d631d6..ac2c672 100644
--- a/overlay/packages/apps/WallpaperPicker2/res/values-gd/strings.xml
+++ b/overlay/packages/apps/WallpaperPicker2/res/values-gd/strings.xml
@@ -112,4 +112,6 @@
     <string name="wallpaper_preview_card_content_description">Ro-shealladh air pàipear-balla</string>
     <string name="collection_not_exist_msg">Chan eil an cruinneachadh ann</string>
     <string name="apply_btn" msgid="7965877231041987336">Cuir an sàs</string>
+    <string name="lock_screen_tab">An sgrìn-ghlasaidh</string>
+    <string name="home_screen_tab">An sgrìn dachaigh</string>
 </resources>
diff --git a/overlay/packages/apps/WallpaperPicker2/res/values-kab-rDZ/strings.xml b/overlay/packages/apps/WallpaperPicker2/res/values-kab-rDZ/strings.xml
index 7a20f92..d370e16 100644
--- a/overlay/packages/apps/WallpaperPicker2/res/values-kab-rDZ/strings.xml
+++ b/overlay/packages/apps/WallpaperPicker2/res/values-kab-rDZ/strings.xml
@@ -39,4 +39,6 @@
     <string name="previous_page_content_description" msgid="6025726405430262788">Ɣer deffir</string>
     <string name="wallpaper_title">Agalis</string>
     <string name="apply_btn" msgid="7965877231041987336">Snes</string>
+    <string name="lock_screen_tab">Agdil usewḥel</string>
+    <string name="home_screen_tab">Agdil agejdan</string>
 </resources>
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 492287d..abb78c5 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
@@ -21,4 +21,14 @@
     <string name="download_fail_ok">Iawn</string>
     <string name="upload_succ_ok">Iawn</string>
     <string name="bt_error_btn_ok">Iawn</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>
 </resources>
diff --git a/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings_pbap.xml b/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings_pbap.xml
new file mode 100644
index 0000000..74a7b55
--- /dev/null
+++ b/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings_pbap.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_session_key_dialog_title">Rho\u2019r allwedd sesiwn ar gyfer %1$s.</string>
+    <string name="pbap_session_key_dialog_header">Mae angen allwedd sesiwn Bluetooth.</string>
+    <string name="pbap_acceptance_timeout_message">Daeth yr amser i ben wrth dderbyn cysylltiad â %1$s.</string>
+    <string name="pbap_authentication_timeout_message">Daeth yr amser i ben wrth roi\'r allwedd sesiwn i %1$s.</string>
+    <string name="auth_notif_ticker">Cais dilysiad Obex</string>
+    <string name="auth_notif_title">Allwedd Sesiwn</string>
+    <string name="auth_notif_message">Rho\u2019r allwedd sesiwn ar gyfer %1$s.</string>
+    <string name="defaultname">Cit car</string>
+    <string name="unknownName">Enw anhysbys</string>
+    <string name="localPhoneName">Fy enw i</string>
+    <string name="defaultnumber">000000</string>
+    <string name="pbap_notification_group">Rhannu Cysylltiad Bluetooth</string>
+</resources>
diff --git a/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings_sap.xml b/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings_sap.xml
new file mode 100644
index 0000000..55933a5
--- /dev/null
+++ b/overlay/packages/modules/Bluetooth/android/app/res/values-cy/strings_sap.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="bluetooth_sap_notif_title">Mynediad Bluetooth at SIM</string>
+    <string name="bluetooth_sap_notif_ticker">Mynediad Bluetooth at SIM</string>
+    <string name="bluetooth_sap_notif_message">Gofyn i\u2019r cleient ddatgysylltu?</string>
+    <string name="bluetooth_sap_notif_disconnecting">Yn aros i\u2019r cleient ddatgysylltu</string>
+    <string name="bluetooth_sap_notif_disconnect_button">Datgysylltu</string>
+    <string name="bluetooth_sap_notif_force_disconnect_button">Gorfodi datgysylltu</string>
+</resources>
diff --git a/overlay/packages/modules/CaptivePortalLogin/res/values-cy/strings.xml b/overlay/packages/modules/CaptivePortalLogin/res/values-cy/strings.xml
index 057bc4a..1475c6a 100644
--- a/overlay/packages/modules/CaptivePortalLogin/res/values-cy/strings.xml
+++ b/overlay/packages/modules/CaptivePortalLogin/res/values-cy/strings.xml
@@ -27,7 +27,9 @@
     <string name="download_completed">Lawrlwytho wedi\'i gwblhau</string>
     <string name="error_downloading_paramfile">Methwyd lawrlwytho %1$s</string>
     <string name="channel_name_downloads">Wedi eu lawrlwytho</string>
-    <string name="channel_description_downloads">Hysbysiadau yn dangos llwythi wedi eu cwblhau neu ddiddymu</string>
+    <string name="channel_description_downloads">Hysbysiadau yn dangos llwythi wedi eu cwblhau neu diddymu</string>
     <string name="channel_name_download_progress">Cynnydd lawrlwytho</string>
     <string name="channel_description_download_progress">Hysbysiadau yn dangos cynnydd llwytho ffeiliau i lawr</string>
+    <string name="cancel_pending_downloads">Llwytho wedi\u2019i diddymu</string>
+    <string name="file_too_large_cancel_download">Ffeil yn rhy fawr. Llwytho wedi\u2019i diddymu</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 57cf062..b5f6fbb 100644
--- a/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml
+++ b/overlay/packages/modules/Permission/PermissionController/res/values-cy/strings.xml
@@ -19,6 +19,8 @@
     <string name="permission_search_keyword">caniatâd</string>
     <string name="cancel">Diddymu</string>
     <string name="back">Nôl</string>
+    <string name="available">Ar gael</string>
+    <string name="blocked">Wedi\'i rhwystro</string>
     <string name="uninstall_or_disable">Dadosod neu analluogi</string>
     <string name="app_not_found_dlg_title">Ni chanfuwyd yr ap</string>
     <string name="grant_dialog_button_deny">Peidio â chaniatáu</string>
@@ -52,7 +54,17 @@
     <string name="unused_apps">Apiau heb eu defnyddio</string>
     <string name="no_unused_apps">Dim apiau heb eu defnyddio</string>
     <string name="zero_unused_apps">0 apiau heb eu defnyddio</string>
+    <string name="review_permission_decisions">Penderfyniadau caniatâd diweddar</string>
+    <string name="review_permission_decisions_view_all">Gweld pob penderfyniad caniatâd diweddar</string>
     <string name="review_permission_decisions_empty">Dim penderfyniadau caniatâd diweddar</string>
+    <string name="auto_permission_manager_summary">Rheoli mynediad data at galendr, logiau galwadau, a mwy</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>
@@ -60,17 +72,27 @@
     <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>
     <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>
     <string name="app_permissions_group_summary2"><xliff:g id="count" example="10">%1$d</xliff:g>/<xliff:g id="count" example="10">%2$d</xliff:g> ap y caniateir</string>
     <string name="menu_show_system">Dangos apiau system</string>
     <string name="menu_hide_system">Cuddio apiau system</string>
+    <string name="menu_show_7_days_data">Dangos 7 diwrnod</string>
+    <string name="menu_show_24_hours_data">Dangos 24 awr</string>
     <string name="manage_permission">Rheoli caniatâd</string>
     <string name="no_apps">Dim apiau</string>
     <string name="location_settings">Gosodiadau Lleoliad</string>
     <string name="location_warning">Mae <xliff:g id="app_name" example="Package Installer">%1$s</xliff:g> yn ddarparwr gwasanaethau lleoliad ar gyfer y ddyfais hon. Gellir addasu mynediad lleoliad yng ngosodiadau lleoliad.</string>
     <string name="system_warning">Os wyt yn gwrthod y caniatâd hwn, bydd rhai nodweddion sylfaenol dy ddyfais yn methu â gweithio fel y bwriedir.</string>
+    <string name="deny_read_media_visual_warning">Dyluniwyd yr ap hwn ar gyfer hen fersiwn Android. Os nad wyt yn rhoi caniatâd i\u2019r ap gael mynediad at luniau a fideos, caiff mynediad at gerddoriaeth a sain arall hefyd ei wrthod.</string>
+    <string name="deny_read_media_aural_warning">Dyluniwyd yr ap hwn ar gyfer hen fersiwn Android. Os nad wyt yn rhoi caniatâd i\u2019r ap gael mynediad at gerddoriaeth a sain arall, caiff mynediad at luniau a fideos hefyd ei wrthod.</string>
     <string name="cdm_profile_revoke_warning">Os wyt yn gwrthod y caniatâd hwn, bydd rhai nodweddion o dy ddyfais a reolir gan yr ap hwn o bosib ddim yn gweithio yn gywir.</string>
     <string name="permission_summary_enforced_by_policy">Gorfodwyd fel polisi</string>
     <string name="permission_summary_disabled_by_policy_background_only">Analluogir mynediad cefndir fel polisi.</string>
@@ -116,6 +138,28 @@
     <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="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="duration_used_days">{count, plural,
+        =1 {1 diwrnod}
+        two {# ddiwrnod}
+        other {# diwrnod}
+    }
+    </string>
+    <string name="duration_used_hours">{count, plural,
+        =1 {1 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>
@@ -137,6 +181,12 @@
     <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>
     <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>
@@ -172,6 +222,7 @@
     <string name="app_permission_footer_app_permissions_link">Gweld pob caniatâd <xliff:g id="app" example="Maps">%1$s</xliff:g></string>
     <string name="app_permission_footer_permission_apps_link">Gweld pob ap gyda\'r caniatâd hwn</string>
     <string name="assistant_mic_label">Dangos defnydd meicroffon cynorthwyydd</string>
+    <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="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>
@@ -190,6 +241,7 @@
     <string name="auto_revoked_app_summary_many">Caniatâd <xliff:g id="permission_name" example="Microphone">%1$s</xliff:g> a <xliff:g id="number" example="2">%2$s</xliff:g> arall wedi eu tynnu yn ôl</string>
     <string name="unused_apps_page_title">Apiau heb eu defnyddio</string>
     <string name="unused_apps_page_summary">Os na chaiff ap ei ddefnyddio am rai misoedd:\n\n\u2022 Tynnir caniatâd yn ôl i warchod dy ddata\n\u2022 Rhoddir stop ar hysbysiadau i arbed batri\n\u2022 Tynnir ffeiliau dros dro i ryddhau lle\n\nI roi caniatâd a chaniatáu hysbysiadau eto, agora\u2019r ap.</string>
+    <string name="unused_apps_page_tv_summary">Os na chaiff ap ei ddefnyddio am rai misoedd:\n\n\u2022 Tynnir caniatâd yn ôl i warchod dy ddata\n\u2022 Tynnir ffeiliau dros dro i ryddhau lle\n\nI roi caniatâd eto, agora\u2019r ap.</string>
     <string name="last_opened_category_title">Agorwyd diwethaf dros <xliff:g id="number" example="3">%s</xliff:g> mis yn ôl</string>
     <string name="last_opened_summary">Agorwyd yr ap diwethaf ar <xliff:g id="date" example="March 12, 2020">%s</xliff:g></string>
     <string name="last_opened_summary_short">Agorwyd diwethaf <xliff:g id="date" example="March 12, 2020">%s</xliff:g></string>
@@ -219,13 +271,47 @@
     <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>
+    <string name="days">{count, plural,
+        =1 {1 diwrnod}
+        two {# ddiwrnod}
+        other {# diwrnod}
+    }
+    </string>
+    <string name="hours">{count, plural,
+        =1 {1 awr}
+        other {# awr}
+    }
+    </string>
+    <string name="minutes">{count, plural,
+        =1 {1 munud}
+        two {# funud}
+        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_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>
     <string name="permission_removed_page_title">Caniatâd wedi\'u tynnu yn ôl</string>
@@ -234,6 +320,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>
@@ -256,16 +354,24 @@
     <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_7d_access">Wedi\u2019u cyrchu diwethaf <xliff:g id="time_date" example="Jan 3">%1$s</xliff:g> am <xliff:g id="time_date" example="12:42 PM">%2$s</xliff:g></string>
     <string name="app_perms_content_provider_24h">Wedi cael mynediad yn y 24 awr ddiwethaf</string>
+    <string name="app_perms_content_provider_7d">Wedi cael mynediad yn y 7 diwrnod diwethaf</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_7d_access_background">Wedi\u2019u cyrchu diwethaf <xliff:g id="time_date" example="Jan 3">%1$s</xliff:g> am <xliff:g id="time_date" example="12:42 PM">%2$s</xliff:g> \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_content_provider_7d_background">Wedi\u2019u cyrchu yn y 7 diwrnod 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_7d_access_media_only">Wedi\u2019u cyrchu diwethaf <xliff:g id="time_date" example="Jan 3">%1$s</xliff:g> am <xliff:g id="time_date" example="12:42 PM">%2$s</xliff:g> \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_content_provider_7d_media_only">Wedi\u2019u cyrchu yn y 7 diwrnod 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_7d_access_all_files">Wedi\u2019u cyrchu diwethaf <xliff:g id="time_date" example="Jan 3">%1$s</xliff:g> am <xliff:g id="time_date" example="12:42 PM">%2$s</xliff:g> \u2022 Holl Ffeiliau</string>
     <string name="app_perms_content_provider_24h_all_files">Wedi cael mynediad yn y 24 awr diwethaf \u2022 Pob Ffeil</string>
+    <string name="app_perms_content_provider_7d_all_files">Wedi\u2019u cyrchu yn y 7 diwrnod diwethaf \u2022 Holl Ffeiliau</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>
@@ -318,8 +424,12 @@
     <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_label">Ap llywio rhagosodedig</string>
+    <string name="role_automotive_navigation_description">Apiau sy\u2019n caniatáu chwilio mannau o ddiddordeb a chynnig llywio tro wrth dro</string>
+    <string name="role_automotive_navigation_request_title">Gosod <xliff:g id="app_name" example="Super Navigation">%1$s</xliff:g> fel dy ap llywio rhagosodedig?</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="role_companion_device_computer_description">Mae\u2019r gwasanaeth hon yn rhannu dy luniau, cyfryngau, a hysbysiadau o dy ffôn gyda dyfeisiau eraill.</string>
     <string name="request_role_current_default">Rhagosodiad cyfredol</string>
     <string name="request_role_dont_ask_again">Peidio â gofyn eto</string>
     <string name="request_role_set_as_default">Gosod fel rhagosodiad</string>
@@ -392,6 +502,12 @@
     <string name="permgrouprequest_calendar">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at dy galendr?</string>
     <string name="permgrouprequest_sms">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; anfon a gweld negeseuon SMS?</string>
     <string name="permgrouprequest_storage">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at luniau, cyfryngau a ffeiliau eraill ar dy ddyfais?</string>
+    <string name="permgrouprequest_storage_q_to_s">Caniatáu i
+        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at &lt;b&gt;luniau, fideos, cerddoriaeth a sain&lt;/b&gt; ar y ddyfais hon?</string>
+    <string name="permgrouprequest_storage_pre_q">Caniatáu i
+        &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at &lt;b&gt;luniau, fideos, cerddoriaeth, sain a ffeiliau eraill&lt;/b&gt; ar y ddyfais hon?</string>
+    <string name="permgrouprequest_read_media_aural">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at luniau a sain ar y ddyfais hon?</string>
+    <string name="permgrouprequest_read_media_visual">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at luniau a fideos ar y ddyfais hon?</string>
     <string name="permgrouprequest_microphone">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; recordio sain?</string>
     <string name="permgrouprequestdetail_microphone">Bydd yr ap ond yn gallu recordio sain tra dy fod yn defnyddio\u2019r ap</string>
     <string name="permgroupbackgroundrequest_microphone">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; recordio sain?</string>
@@ -408,6 +524,9 @@
     <string name="permgrouprequest_calllog">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at gofnodion dy alwadau ffôn?</string>
     <string name="permgrouprequest_phone">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; wneud a rheoli galwadau ffôn?</string>
     <string name="permgrouprequest_sensors">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael at ddata synhwyrydd am dy arwyddion bywyd?</string>
+    <string name="permgroupbackgroundrequest_sensors">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael at ddata\u2019r synhwyrydd am dy arwyddion bywyd?</string>
+    <string name="permgroupupgraderequest_sensors">Parhau i ganiatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; gael mynediad at ddata\u2019r synhwyrydd arwyddion bywyd tra bod yn cael ei ddefnyddio?</string>
+    <string name="permgrouprequest_notifications">Caniatáu i &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; anfon hysbysiadau atat?</string>
     <string name="auto_granted_permissions">Caniatâd a rheolir</string>
     <string name="auto_granted_location_permission_notification_title">Gellir cael mynediad at leoliad</string>
     <string name="auto_granted_permission_notification_body">Mae dy weinyddwr TG yn caniatáu i <xliff:g id="app_name" example="Gmail">%s</xliff:g> gael gwybod dy leoliad</string>
@@ -422,7 +541,52 @@
     <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="privdash_label_7d">7 diwrnod\ndiwethaf</string>
+    <string name="blocked_camera_title">Camera\u2019r ddyfais wedi\u2019i rwystro</string>
+    <string name="blocked_microphone_title">Meicroffon y ddyfais wedi\u2019i rwystro</string>
+    <string name="blocked_location_title">Lleoliad dyfais i ffwrdd</string>
+    <string name="blocked_sensor_summary">Ar gyfer apiau a gwasanaethau</string>
+    <string name="blocked_mic_summary">Gall data meicroffon dal i gael ei rannu os wyt ti\u2019n galw rhif argyfwng.</string>
+    <string name="blocked_sensor_button_label">Newid</string>
+    <string name="safety_center_dashboard_page_title">Diogelwch a Phreifatrwydd</string>
     <string name="safety_center_rescan_button">Sganio</string>
     <string name="safety_center_issue_card_dismiss_button">Diystyru</string>
+    <string name="security_settings">Gosodiadau Diogelwch</string>
+    <string name="sensor_permissions_qs">Caniatâd Synhwyrydd</string>
+    <string name="privacy_controls_qs">Rheolyddion Preifatrwydd</string>
+    <string name="permissions_removed_qs">Caniatâd wedi\'i dynnu yn ôl</string>
+    <string name="camera_usage_qs">Gweld mwy o ddefnydd camera</string>
+    <string name="microphone_usage_qs">Gweld mwy o ddefnydd meicroffon</string>
+    <string name="remove_camera_qs">Tynnu caniatâd camera</string>
+    <string name="remove_microphone_qs">Tynnu caniatâd meicroffon</string>
+    <string name="manage_service_qs">Rheoli gwasanaeth</string>
+    <string name="manage_permissions_qs">Rheoli caniatâd</string>
+    <string name="active_call_usage_qs">Yn cael ei ddefnyddio gan alwad ffôn</string>
+    <string name="recent_call_usage_qs">Wedi ei ddefnyddio\u2019n ddiweddar mewn galwad ffôn</string>
+    <string name="active_app_usage_qs">Yn cael ei ddefnyddio gan <xliff:g id="app_name" example="Gmail">%1$s</xliff:g></string>
+    <string name="recent_app_usage_qs">Wedi ei ddefnyddio\u2019n ddiweddar gan <xliff:g id="app_name" example="Gmail">%1$s</xliff:g></string>
+    <string name="active_app_usage_1_qs">Yn cael ei ddefnyddio gan <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> (<xliff:g id="attribution_label" example="For Wallet">%2$s</xliff:g>)</string>
+    <string name="recent_app_usage_1_qs">Wedi ei ddefnyddio\u2019n ddiweddar gan <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> (<xliff:g id="attribution_label" example="For Wallet">%2$s</xliff:g>)</string>
+    <string name="active_app_usage_2_qs">Yn cael ei ddefnyddio gan <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> (<xliff:g id="attribution_label" example="For Wallet">%2$s</xliff:g> \u2022 <xliff:g id="proxy_label" example="Speech services">%3$s</xliff:g>)</string>
+    <string name="recent_app_usage_2_qs">Wedi ei ddefnyddio\u2019n ddiweddar gan <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> (<xliff:g id="attribution_label" example="For Wallet">%2$s</xliff:g> \u2022 <xliff:g id="proxy_label" example="Speech services">%3$s</xliff:g>)</string>
+    <string name="safety_privacy_qs_tile_title">Diogelwch a Phreifatrwydd</string>
+    <string name="safety_privacy_qs_tile_subtitle">Gwirio statws</string>
+    <string name="media_confirm_dialog_positive_button">Cadarnhau</string>
     <string name="media_confirm_dialog_negative_button">Nôl</string>
+    <string name="media_confirm_dialog_title_a_to_p_aural_allow">Caiff mynediad at ffeiliau eraill hefyd ei ganiatáu</string>
+    <string name="media_confirm_dialog_title_a_to_p_aural_deny">Ni chaiff mynediad at ffeiliau eraill ei ganiatáu chwaith</string>
+    <string name="media_confirm_dialog_title_a_to_p_visual_allow">Caiff mynediad at ffeiliau eraill hefyd ei ganiatáu</string>
+    <string name="media_confirm_dialog_title_a_to_p_visual_deny">Ni chaiff mynediad at ffeiliau eraill ei ganiatáu chwaith</string>
+    <string name="media_confirm_dialog_title_q_to_s_aural_allow">Caiff mynediad at luniau a fideos hefyd ei ganiatáu</string>
+    <string name="media_confirm_dialog_title_q_to_s_aural_deny">Ni chaiff mynediad at luniau na fideos ei ganiatáu chwaith</string>
+    <string name="media_confirm_dialog_title_q_to_s_visual_allow">Caiff mynediad at gerddoriaeth a ffeiliau sain hefyd ei ganiatáu</string>
+    <string name="media_confirm_dialog_title_q_to_s_visual_deny">Ni chaiff mynediad at gerddoriaeth na ffeiliau sain ei ganiatáu chwaith</string>
+    <string name="media_confirm_dialog_message_a_to_p_aural_allow">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os caiff yr ap hwn fynediad at ffeiliau sain a cherddoriaeth, mi fydd ganddo hefyd mynediad at luniau, fideos, a ffeiliau eraill.</string>
+    <string name="media_confirm_dialog_message_a_to_p_aural_deny">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os na chaiff yr ap hwn fynediad at ffeiliau sain a cherddoriaeth, ni fydd ganddo chwaith mynediad at luniau, fideos, na ffeiliau eraill.</string>
+    <string name="media_confirm_dialog_message_a_to_p_visual_allow">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os caiff yr ap hwn fynediad at luniau a fideos, mi fydd ganddo hefyd mynediad at sain, cerddoriaeth, a ffeiliau eraill.</string>
+    <string name="media_confirm_dialog_message_a_to_p_visual_deny">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os na chaiff yr ap hwn fynediad at luniau a fideos, ni fydd ganddo chwaith mynediad at sain, cerddoriaeth, na ffeiliau eraill.</string>
+    <string name="media_confirm_dialog_message_q_to_s_aural_allow">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os caiff yr ap hwn fynediad at ffeiliau sain a cherddoriaeth, mi fydd ganddo hefyd mynediad at luniau a fideos.</string>
+    <string name="media_confirm_dialog_message_q_to_s_aural_deny">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os na chaiff yr ap hwn fynediad at ffeiliau sain a cherddoriaeth, ni fydd ganddo chwaith mynediad at luniau na fideos.</string>
+    <string name="media_confirm_dialog_message_q_to_s_visual_allow">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os caiff yr ap hwn fynediad at luniau a fideos, mi fydd ganddo hefyd mynediad at ffeiliau sain a cherddoriaeth.</string>
+    <string name="media_confirm_dialog_message_q_to_s_visual_deny">Nid yw\u2019r ap hwn yn cefnogi fersiwn diweddaraf Android. Os na chaiff yr ap hwn fynediad at ffeiliau sain a cherddoriaeth, ni fydd ganddo chwaith mynediad at luniau na fideos.</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 61af795..e32adb4 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
@@ -69,6 +69,7 @@
     <string name="wifi_disable_mac_randomization_dialog_success">Diweddarwyd y gosodiad. Ceisia gysylltu eto.</string>
     <string name="wifi_disable_mac_randomization_dialog_failure">Methu newid gosodiad preifatrwydd</string>
     <string name="wifi_disable_mac_randomization_dialog_network_not_found">Ni chanfuwyd rhwydwaith</string>
+    <string name="wifi_eap_error_message_code_32756"><xliff:g id="ssid">%1$s</xliff:g> : gwall dilysiad EAP 32756</string>
     <string name="wifi_eap_error_message_code_32760"><xliff:g id="ssid">%1$s</xliff:g> : Gwall dilysu EAP 32760</string>
     <string name="wifi_eap_error_message_code_32761"><xliff:g id="ssid">%1$s</xliff:g> : Gwall dilysu EAP 32761</string>
     <string name="wifi_eap_error_message_code_32762"><xliff:g id="ssid">%1$s</xliff:g> : Gwall dilysu EAP 32762</string>
@@ -76,10 +77,42 @@
     <string name="wifi_eap_error_message_code_32764"><xliff:g id="ssid">%1$s</xliff:g> : Gwall dilysu EAP 32764</string>
     <string name="wifi_eap_error_message_code_32765"><xliff:g id="ssid">%1$s</xliff:g> : Gwall dilysu EAP 32765</string>
     <string name="wifi_eap_error_message_code_32766"><xliff:g id="ssid">%1$s</xliff:g> : Gwall dilysu EAP 32766</string>
+    <string name="wifi_eap_error_message_code_32767"><xliff:g id="ssid">%1$s</xliff:g> : gwall dilysiad EAP 32767</string>
+    <string name="wifi_eap_error_message_code_16384"><xliff:g id="ssid">%1$s</xliff:g> : gwall dilysiad EAP 16384</string>
+    <string name="wifi_eap_error_message_code_16385"><xliff:g id="ssid">%1$s</xliff:g> : gwall dilysiad EAP 16385</string>
+    <string name="wifi_eap_error_message_unknown_error_code"><xliff:g id="ssid">%1$s</xliff:g> : gwall dilysiad EAP, cod gwall anhysbys</string>
     <string name="wifi_softap_auto_shutdown_timeout_expired_title">Llecyn Wi-Fi wedi\'i droi i ffwrdd</string>
     <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_title">Mae <xliff:g id="app">%1$s</xliff:g> eisiau defnyddio adnodd rhwydweithio</string>
+    <string name="wifi_interface_priority_message">Gall hyn achosi problemau i <xliff:g id="apps">%3$s</xliff:g>.</string>
+    <string name="wifi_interface_priority_message_plural">Gall hyn achosi problemau i\'r apiau hyn: <xliff:g id="apps">%3$s</xliff:g>.</string>
     <string name="wifi_interface_priority_approve">Caniatáu</string>
+    <string name="wifi_interface_priority_reject">Peidio â chaniatáu</string>
+    <string name="wifi_ca_cert_dialog_title">Wyt ti\'n ymddiried yn y rhwydwaith hon?</string>
+    <string name="wifi_ca_cert_dialog_continue_text">Ydw. Cysylltu.</string>
+    <string name="wifi_ca_cert_dialog_abort_text">Nac ydw. Dim cysylltu.</string>
+    <string name="wifi_ca_cert_dialog_message_hint">Rho ganiatâd i\'r rhwydwaith hon gysylltu dim ond os yw\u2019r wybodaeth isod yn edrych yn gwyir.\n\n</string>
+    <string name="wifi_ca_cert_dialog_message_server_name_text">Enw Gweinydd:\n<xliff:g id="value">%1$s</xliff:g>\n\n</string>
+    <string name="wifi_ca_cert_dialog_message_issuer_name_text">Enw Darparwr:\n<xliff:g id="value">%1$s</xliff:g>\n\n</string>
+    <string name="wifi_ca_cert_dialog_message_organization_text">Sefydliad:\n<xliff:g id="value">%1$s</xliff:g>\n\n</string>
+    <string name="wifi_ca_cert_dialog_message_contact_text">Cyswllt:\n<xliff:g id="value">%1$s</xliff:g>\n\n</string>
+    <string name="wifi_ca_cert_dialog_message_signature_name_text">Llofnod:\n<xliff:g id="value">%1$s</xliff:g>\n\n</string>
+    <string name="wifi_ca_cert_notification_title">Rhaid dilysu\u2019r rhwydwaith</string>
+    <string name="wifi_ca_cert_notification_message">Adolyga manylion rhwydwaith <xliff:g id="ssid">%1$s</xliff:g> cyn cysylltu. Tapia i barhau.</string>
+    <string name="wifi_ca_cert_failed_to_install_ca_cert">Methwyd gosod tystysgrif.</string>
+    <string name="wifi_ca_cert_dialog_preT_title">Methu dilysu\u2019r rhwydwaith hon</string>
+    <string name="wifi_ca_cert_dialog_preT_continue_text">Cysylltu beth bynnag</string>
+    <string name="wifi_ca_cert_dialog_preT_abort_text">Peidio â chysylltu</string>
+    <string name="wifi_ca_cert_dialog_preT_message_hint">Mae gan y rhwydwaith <xliff:g id="ssid">%1$s</xliff:g> dystysgrif ar goll.</string>
+    <string name="wifi_ca_cert_dialog_preT_message_link">Dysgu sut i ychwanegu tystysgrifau</string>
+    <string name="wifi_ca_cert_notification_preT_title">Methu dilysu\u2019r rhwydwaith hon</string>
+    <string name="wifi_ca_cert_notification_preT_message">Mae gan y rhwydwaith <xliff:g id="ssid">%1$s</xliff:g> dystysgrif ar goll. Tapi ai ddysgu sut i ychwanegu tystysgrifau.</string>
+    <string name="wifi_ca_cert_notification_preT_continue_text">Cysylltu beth bynnag</string>
+    <string name="wifi_ca_cert_notification_preT_abort_text">Peidio â chysylltu</string>
+    <string name="wifi_enable_request_dialog_title">Caniatáu <xliff:g id="app_name" example="App123">%1$s</xliff:g> i droi Wi\u2011Fi ymlaen?</string>
+    <string name="wifi_enable_request_dialog_message">Gellir troi Wi\u2011Fi i ffwrdd yn Gosodiadau Cyflym</string>
     <string name="wifi_enable_request_dialog_positive_button">Caniatáu</string>
+    <string name="wifi_enable_request_dialog_negative_button">Peidio â chaniatáu</string>
 </resources>
diff --git a/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml b/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
index c3c690c..dc76076 100644
--- a/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
+++ b/overlay/packages/providers/MediaProvider/res/values-cy/strings.xml
@@ -17,16 +17,22 @@
     <string name="uid_label">Cyfryngau</string>
     <string name="storage_description">Storfa leol</string>
     <string name="app_label">Storfa Cyfryngau</string>
+    <string name="picker_app_label">Dewisydd lluniau</string>
     <string name="artist_label">Artist</string>
     <string name="unknown">Anhysybys</string>
     <string name="root_images">Delweddau</string>
     <string name="root_videos">Fideos</string>
     <string name="root_audio">Sain</string>
     <string name="root_documents">Dogfennau</string>
-    <string name="permission_required">Rhaid cael caniatâd i addasu neu ddileu\u2019r eitem hon.</string>
+    <string name="permission_required">Rhaid cael caniatâd i addasu neu dileu\u2019r eitem hon.</string>
     <string name="permission_required_action">Parhau</string>
     <string name="grant_dialog_button_allow">Caniatáu</string>
     <string name="grant_dialog_button_deny">Gwrthod</string>
+    <string name="permission_more_thumb"> {count, plural,
+        =1    {+<xliff:g id="count" example="1">^1</xliff:g>}
+        other {+<xliff:g id="count" example="42">^1</xliff:g>}
+        }
+    </string>
     <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>
@@ -34,7 +40,217 @@
     <string name="allow">Caniatáu</string>
     <string name="deny">Gwrthod</string>
     <string name="add">Ychwanegu</string>
+    <string name="deselect">Dad-ddewis</string>
+    <string name="deselected">Dad-ddewiswyd</string>
+    <string name="select">Dewis</string>
+    <string name="selected">Dewiswyd</string>
+    <string name="select_up_to"> {count, plural,
+        =1 {Dewisa hyd at <xliff:g id="count" example="1">^1</xliff:g> eitem}
+        other {Dewisa hyd at <xliff:g id="count" example="42">^1</xliff:g> eitem}
+        }
+    </string>
+    <string name="recent">Diweddar</string>
+    <string name="picker_photos_empty_message">Dim lluniau na fideos</string>
+    <string name="picker_albums_empty_message">Dim casgliadau</string>
+    <string name="picker_view_selected">Gweld y dewis</string>
+    <string name="picker_photos">Lluniau</string>
+    <string name="picker_albums">Casgliadau</string>
+    <string name="picker_preview">Rhagolwg</string>
+    <string name="picker_work_profile">Newid i waith</string>
+    <string name="picker_personal_profile">Newid i bersonol</string>
+    <string name="picker_profile_admin_title">Rhwystrwyd gan dy weinyddwr</string>
+    <string name="picker_profile_admin_msg_from_personal">Ni chaniateir mynediad at ddata gwaith o ap personol</string>
+    <string name="picker_profile_admin_msg_from_work">Ni chaniateir mynediad at ddata personol o ap gwaith</string>
+    <string name="picker_profile_work_paused_title">Mae apiau gwaith ar saib</string>
+    <string name="picker_profile_work_paused_msg">I agor lluniau gwaith, tro dy apiau gwaith ymlaen a cheisio eto</string>
+    <string name="picker_privacy_message">Gall yr ap hwn ond cael mynediad at y lluniau rwyt yn eu dewis</string>
+    <string name="picker_album_item_count"> {count, plural,
+        zero {<xliff:g id="count" example="1">^1</xliff:g> eitemau}
+        =1    {<xliff:g id="count" example="42">^1</xliff:g> eitem}
+        other {<xliff:g id="count" example="42">^1</xliff:g> eitem}
+        }
+    </string>
+    <string name="picker_add_button_multi_select">Ychwanegu (<xliff:g id="count" example="42">^1</xliff:g>)</string>
+    <string name="picker_category_camera">Camera</string>
+    <string name="picker_category_downloads">Llwythi</string>
+    <string name="picker_category_favorites">Ffefrynnau</string>
+    <string name="picker_category_screenshots">Sgrinluniau</string>
+    <string name="picker_motion_photo_text">Llun Symud</string>
+    <string name="picker_item_content_desc"><xliff:g id="item_name" example="Photo">%1$s</xliff:g> wedi\'i dynnu <xliff:g id="time" example="Jul 7, 2020, 12:00:00 AM">%2$s</xliff:g></string>
+    <string name="picker_video_item_content_desc">Fideo wedi\'i ffilmio <xliff:g id="time" example="Jul 7, 2020, 12:00:00 AM">%1$s</xliff:g> gyda hyd o <xliff:g id="duration" example="00:03">%2$s</xliff:g></string>
+    <string name="picker_photo">Llun</string>
     <string name="picker_gif">GIF</string>
+    <string name="picker_motion_photo">Llun Symud</string>
+    <string name="picker_mute_video">Distewi fideo</string>
+    <string name="picker_unmute_video">Dad-tewi\'r fideo</string>
+    <string name="picker_play_video">Chwarae fideo</string>
+    <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_write_audio"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu\u2019r ffeil sain hon?}
+        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?}
+        }
+    </string>
+    <string name="permission_progress_write_audio"> {count, plural,
+        =1 {Yn addasu ffeil sain…}
+        other {Yn addasu ffeiliau sain…}
+        }
+    </string>
+    <string name="permission_write_video"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu\u2019r fideo hwn?}
+        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?}
+        }
+    </string>
+    <string name="permission_progress_write_video"> {count, plural,
+        =1 {Yn addasu fideo…}
+        other {Yn addasu fideos…}
+        }
+    </string>
+    <string name="permission_write_image"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu\u2019r llun hwn?}
+        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?}
+        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?}
+        }
+    </string>
+    <string name="permission_progress_write_image"> {count, plural,
+        =1 {Yn addasu llun…}
+        other {Yn addasu lluniau…}
+        }
+    </string>
+    <string name="permission_write_generic"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i addasu\u2019r eitem hon?}
+        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?}
+        }
+    </string>
+    <string name="permission_progress_write_generic"> {count, plural,
+        =1 {Yn addasu eitem…}
+        other {Yn addasu eitemau…}
+        }
+    </string>
+    <string name="permission_trash_audio"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud y ffeil sain hon i\u2019r sbwriel?}
+        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\u2019r sbwriel?}
+        }
+    </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_trash_video"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud y fideo hwn i\u2019r sbwriel?}
+        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\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_trash_image"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud y llun hwn i\u2019r sbwriel?}
+        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\u2019r sbwriel?}
+        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\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_trash_generic"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud yr eitem hon i\u2019r sbwriel?}
+        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\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_untrash_audio"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud y ffeil sain hon allan o\u2019r sbwriel?}
+        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\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_untrash_video"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud y fideo hwn allan o\u2019r sbwriel?}
+        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\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_untrash_image"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud y llun hwn allan o\u2019r sbwriel?}
+        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\u2019r sbwriel?}
+        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\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_untrash_generic"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i symud yr eitem hon allan o\u2019r sbwriel?}
+        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\u2019r sbwriel?}
+        }
+    </string>
+    <string name="permission_progress_untrash_generic"> {count, plural,
+        =1 {Yn symud eitem allan o\u2019r sbwriel…}
+        other {Yn symud eitemau allan o\u2019r sbwriel…}
+        }
+    </string>
+    <string name="permission_delete_audio"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu\u2019r ffeil sain hon?}
+        other {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu\u2019r <xliff:g id="count" example="42">^2</xliff:g> ffeil sain hyn?}
+        }
+    </string>
+    <string name="permission_progress_delete_audio"> {count, plural,
+        =1 {Yn dileu ffeil sain…}
+        other {Yn dileu ffeiliau sain…}
+        }
+    </string>
+    <string name="permission_delete_video"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu\u2019r fideo hwn?}
+        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?}
+        }
+    </string>
+    <string name="permission_progress_delete_video"> {count, plural,
+        =1 {Yn dileu fideo…}
+        other {Yn dileu fideos…}
+        }
+    </string>
+    <string name="permission_delete_image"> {count, plural,
+        =1 {Caniatáu &lt;xliff:g id="app_name" example="Gmail"&gt;^1&lt;/xliff:g&gt; i ddileu\u2019r llun hwn?}
+        two {Caniatáu &lt;xliff:g id="app_name" example="Gmail"&gt;^1&lt;/xliff:g&gt; i ddileu&lt;xliff:g id="count" example="42"&gt;^2&lt;/xliff:g&gt; lun?}
+        other {Caniatáu &lt;0"&gt;^1&lt;/xliff:g&gt; i ddileu &lt;1"&gt;^2&lt;/xliff:g&gt; llun?}
+        }
+    </string>
+    <string name="permission_progress_delete_image"> {count, plural,
+        =1 {Yn dileu llun…}
+        other {Yn dileu lluniau…}
+        }
+    </string>
+    <string name="permission_delete_generic"> {count, plural,
+        =1 {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu\u2019r eitem hon?}
+        other {Caniatáu <xliff:g id="app_name" example="Gmail">^1</xliff:g> i ddileu\u2019r <xliff:g id="count" example="42">^2</xliff:g> eitem hyn?}
+        }
+    </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>
diff --git a/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml b/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml
index 4bbf74d..a6b0213 100644
--- a/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml
+++ b/overlay/packages/services/BuiltInPrintService/res/values-cy/strings.xml
@@ -79,6 +79,7 @@
     <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 dyfeisiau gerllaw i ganfod argraffwyr gerllaw.</string>
     <string name="fix">Adolygu caniatâd</string>
     <string name="print">Argraffu</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 5924161..c227684 100644
--- a/overlay/packages/services/Telecomm/res/values-cy/strings.xml
+++ b/overlay/packages/services/Telecomm/res/values-cy/strings.xml
@@ -29,6 +29,9 @@
     <string name="notification_disconnectedCall_generic_body">        Cafodd dy alwad ei datgysylltu am fod galwad brys wedi ei gwneud.
     </string>
     <string name="notification_audioProcessing_title">Galwad yn y cefndir</string>
+    <string name="notification_audioProcessing_body">        Mae <xliff:g id="audio_processing_app_name">%s</xliff:g> yn prosesu galwad yn y cefndir.
+        Gall fod yr ap hwn yn cael at sain ac yn ei chwarae dros yr alwad.
+    </string>
     <string name="notification_incallservice_not_responding_title">        Stopiodd <xliff:g id="in_call_service_app_name">%s</xliff:g> ymateb
     </string>
     <string name="notification_incallservice_not_responding_body">        Defnyddiodd dy alwad yr ap ffôn daeth gyda dy ddyfais
@@ -122,6 +125,8 @@
     <string name="phone_settings_payphone_summary_txt">Rhwystro galwadau o ffonau cyhoeddus</string>
     <string name="phone_settings_unknown_txt">Anhysybys</string>
     <string name="phone_settings_unknown_summary_txt">Rhwystro galwadau gan bobol anhysbys</string>
+    <string name="phone_settings_unavailable_txt">Dim ar gael</string>
+    <string name="phone_settings_unavailable_summary_txt">Rhwystro galwadau pan nad yw\'r rhif ar gael</string>
     <string name="phone_strings_call_blocking_turned_off_notification_title_txt">Rhwystro Galwadau</string>
     <string name="phone_strings_call_blocking_turned_off_notification_text_txt">Analluogwyd Rhwystro Galwadau</string>
     <string name="phone_strings_emergency_call_made_dialog_title_txt">Wedi gwneud galwad brys</string>
diff --git a/overlay/packages/services/Telephony/res/values-cy/strings.xml b/overlay/packages/services/Telephony/res/values-cy/strings.xml
index 9a5c8f1..bcd5272 100644
--- a/overlay/packages/services/Telephony/res/values-cy/strings.xml
+++ b/overlay/packages/services/Telephony/res/values-cy/strings.xml
@@ -536,7 +536,7 @@
     <string name="notification_network_selection_text">Rhwydwaith a ddewiswyd <xliff:g id="operator_name">%s</xliff:g> dim ar gael</string>
     <string name="incall_error_power_off" product="watch">I wneud galwad rhai troi\'r rhwydwaith symudol ymlaen, troi modd awyren i ffwrdd neu droi modd arbed batri i fwrdd.</string>
     <string name="incall_error_power_off" product="default">Rhaid diffodd modd awyren er mwyn gwneud galwad.</string>
-    <string name="incall_error_power_off_wfc">Diffodda modd awyren neu gysylltu â rhwydwaith diwifr i wneud galwad.</string>
+    <string name="incall_error_power_off_wfc">Diffodda modd awyren neu cysylltu â rhwydwaith diwifr i wneud galwad.</string>
     <string name="incall_error_power_off_thermal" product="default"><b>Ffôn rhy boeth</b>\n\nMethu cwblhau\'r alwad hon. Rho gynnig arall arni pan mae tymheredd dy ffôn wedi gostwng.\n\nMae galwadau brys yn bosib o hyd.</string>
     <string name="incall_error_ecm_emergency_only">Rhaid gadael modd Galwad Nôl mewn Argyfwng i wneud galwad na sy\'n argyfyngus.</string>
     <string name="incall_error_emergency_only">Heb gofrestru ar y rhwydwaith.</string>
@@ -684,7 +684,7 @@
     <string name="wifi_calling_settings_key">button_wifi_calling_settings_key</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.
+    <string name="callFailed_cdma_call_limit">Mae gormod o alwadau ar eu canol. Diwedda neu cyfuno rhai o\'r galwadau cyfredol cyn gwneud galwad newydd.
     </string>
     <string name="callFailed_imei_not_accepted">Methu â chysylltu. Rho gerdyn SIM dilys, plîs.    </string>
     <string name="callFailed_wifi_lost">        Collwyd y cysylltiad Wi-Fi. Galwad ar ben.
@@ -825,8 +825,9 @@
     <string name="supp_service_held_call_released">Mae\'r galwad yn aros wedi\'i rhyddhau.</string>
     <string name="callFailed_otasp_provisioning_in_process">Methu â gwneud galwad am fod y ddyfais yn cael ei baratoi gan dy ddarparwr gwasanaeth.</string>
     <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_already_ringing">Methu â gwneud galwad am fod galwad i mewn yn aros i gael ei hateb. Ateba neu gwrthod 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">Ni ellir gwneud galwad am fod dwy alwad eisoes ar y gweill. Rhaid dod ag un alwad i ben neu gyfuno\u2019r ddau 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>
@@ -844,6 +845,7 @@
     <string name="dsds_dialog_message">Mae angen ailgychwyn dy ddyfais i newid yr osodiad hwn.</string>
     <string name="dsds_dialog_confirm">Ailgychwyn</string>
     <string name="dsds_dialog_cancel">Diddymu</string>
+    <string name="removable_esim_string">Gosod eSIM Tynadwy fel Rhagosodiad</string>
     <string name="radio_info_radio_power">Pŵer Radio Symudol</string>
     <string name="radioInfo_menu_viewADN">Gweld Llyfr Gyfeiriadau\'r SIM</string>
     <string name="radioInfo_menu_viewFDN">Gweld Rhifau Deialu Gosodedig (FDN)</string>
@@ -910,6 +912,9 @@
     <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 (NSA):</string>
+    <string name="radio_info_dcnr_restricted">DCNR Wedi\u2019i rwystro (NSA):</string>
+    <string name="radio_info_nr_available">NR Ar gael (NSA):</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>