diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 1e3fcd0e4..78771d1f8 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -8,28 +8,28 @@
     <string name="error_authorization_unknown">Roedd gwall awdurdodi anhysbys.</string>
     <string name="error_authorization_denied">Gwrthodwyd awdurdodi.</string>
     <string name="error_retrieving_oauth_token">Methu cael tocyn mewngofnodi.</string>
-    <string name="error_compose_character_limit">Mae\'r post yn rhy hir!</string>
+    <string name="error_compose_character_limit">Mae\'ch neges yn rhy hir!</string>
     <string name="error_media_upload_type">Ni allwch uwchlwytho\'r math hwnnw o ffeil.</string>
     <string name="error_media_upload_opening">Nid oedd modd agor y ffeil honno.</string>
     <string name="error_media_upload_permission">Rhaid cael caniatâd i ddarllen hwn.</string>
     <string name="error_media_download_permission">Rhaid cael caniatâd i gadw hwn.</string>
-    <string name="error_media_upload_image_or_video">Ni allwch atodi delweddau a fideos i\'r un post.</string>
+    <string name="error_media_upload_image_or_video">Ni allwch atodi delweddau a fideos i\'r un neges.</string>
     <string name="error_media_upload_sending">Methu uwchlwytho.</string>
-    <string name="error_sender_account_gone">Methu wrth anfon post.</string>
+    <string name="error_sender_account_gone">Bu gwall wrth anfon y neges.</string>
     <string name="title_home">Hafan</string>
     <string name="title_notifications">Hysbysiadau</string>
     <string name="title_public_local">Lleol</string>
     <string name="title_public_federated">Ffedereiddwyd</string>
     <string name="title_view_thread">Edau</string>
-    <string name="title_posts">Pyst</string>
+    <string name="title_posts">Negeseuon</string>
     <string name="title_posts_with_replies">Gydag ymatebion</string>
     <string name="title_follows">Dilyniadau</string>
     <string name="title_followers">Dilynwyr</string>
     <string name="title_favourites">Ffefrynnau</string>
     <string name="title_mutes">Defnyddwyr wedi\'u tewi</string>
-    <string name="title_blocks">Defnyddwyr wedi\'u blocio</string>
-    <string name="title_follow_requests">Dilyn ceisiadau</string>
-    <string name="title_edit_profile">Golygu\'ch Proffil</string>
+    <string name="title_blocks">Defnyddwyr wedi\'u rhwystro</string>
+    <string name="title_follow_requests">Ceisiadau i\'ch dilyn</string>
+    <string name="title_edit_profile">Golygu\'ch proffil</string>
     <string name="title_drafts">Drafftiau</string>
     <string name="title_licenses">Trwyddedau</string>
     <string name="post_boosted_format">%s wedi\'u hybu</string>
@@ -57,8 +57,8 @@
     <string name="action_logout_confirm">Ydych chi\'n siŵr eich bod am allgofnodi o\'r cyfrif %1$s?</string>
     <string name="action_follow">Dilyn</string>
     <string name="action_unfollow">Dad-ddilyn</string>
-    <string name="action_block">Blocio</string>
-    <string name="action_unblock">Dad-flocio</string>
+    <string name="action_block">Rhwystro</string>
+    <string name="action_unblock">Dadrwystro</string>
     <string name="action_hide_reblogs">Cuddio hybiadau</string>
     <string name="action_show_reblogs">Dangos hybiadau</string>
     <string name="action_report">Adrodd</string>
@@ -71,7 +71,7 @@
     <string name="action_view_preferences">Dewisiadau</string>
     <string name="action_view_favourites">Ffefrynnau</string>
     <string name="action_view_mutes">Defnyddwyr wedi\'u tewi</string>
-    <string name="action_view_blocks">Defnyddwyr wedi\'u blocio</string>
+    <string name="action_view_blocks">Defnyddwyr wedi\'u rhwystro</string>
     <string name="action_view_follow_requests">Dilyn ceisiadau</string>
     <string name="action_view_media">Cyfryngau</string>
     <string name="action_open_in_web">Agor mewn porwr</string>
@@ -84,7 +84,7 @@
     <string name="action_hide_media">Cuddio cyfrwng</string>
     <string name="action_open_drawer">Agor drôr</string>
     <string name="action_save">Cadw</string>
-    <string name="action_edit_profile">Golygu Proffil</string>
+    <string name="action_edit_profile">Golygu\'ch proffil</string>
     <string name="action_edit_own_profile">Golygu</string>
     <string name="action_undo">Dad-wneud</string>
     <string name="action_accept">Derbyn</string>
@@ -100,7 +100,7 @@
     <string name="send_post_content_to">Rhannu post i…</string>
     <string name="send_media_to">Rhannu cyfryngau i…</string>
     <string name="confirmation_reported">Anfonwyd!</string>
-    <string name="confirmation_unblocked">Dad-flociwyd y defnyddiwr</string>
+    <string name="confirmation_unblocked">Dadrwystrwyd y defnyddiwr</string>
     <string name="confirmation_unmuted">Defnyddiwr heb eu tewi</string>
     <string name="post_sent">Anfonwyd!</string>
     <string name="post_sent_long">Anfonwyd yr ateb yn llwyddiannus.</string>
@@ -112,7 +112,7 @@
     <string name="hint_search">Chwilio…</string>
     <string name="search_no_results">Dim canlyniadau</string>
     <string name="label_quick_reply">Ateb…</string>
-    <string name="label_avatar">Rhithffurf</string>
+    <string name="label_avatar">Llun proffil</string>
     <string name="label_header">Pennawd</string>
     <string name="link_whats_an_instance">Beth yw achos?</string>
     <string name="login_connection">Yn cysylltu…</string>
@@ -180,7 +180,7 @@
     <string name="notification_mention_descriptions">Hysbysiadau sôn amdanoch o\'r newydd</string>
     <string name="notification_follow_name">Dilynwyr Newydd</string>
     <string name="notification_follow_description">Hysbysiadau am ddilynwyr newydd </string>
-    <string name="notification_boost_name">Hybiadau</string>
+    <string name="notification_boost_name">Hybiau</string>
     <string name="notification_boost_description">Hysbysiadau pan gaiff eich pyst eu hybu</string>
     <string name="notification_favourite_name">Ffefrynnau</string>
     <string name="notification_favourite_description">Hysbysiadau pan fo\'r pyst wedi\'u marcio fel ffefryn</string>
@@ -197,7 +197,7 @@
         <item quantity="other">%d rhyngweithiad newydd</item>
     </plurals>
     <string name="description_account_locked">Cyfrif wedi\'i gloi </string>
-    <string name="about_title_activity">Amdano</string>
+    <string name="about_title_activity">Ynghylch</string>
     <string name="about_tusky_license">Mae Tusky yn feddalwedd ffynhonnell agored barn rydd.
         Fe\'i trwyddedir dan Drwydded Gyhoeddus Gyffredinol GNU Fersiwn 3.
         Gallwch weld y drwydded yma: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
@@ -272,7 +272,7 @@
     <string name="unreblog_private">Dad-hybu</string>
     <string name="license_description">Mae gan Tusky god ac asedau o\'r prosiectau ffynhonnell agored canlynol:</string>
     <string name="license_apache_2">Trwyddedir dan Drwydded Apache (copi isod)</string>
-    <string name="profile_metadata_label">Metaddata proffil</string>
+    <string name="profile_metadata_label">Metaddata\'r proffil</string>
     <string name="profile_metadata_add">ychwanegu data</string>
     <string name="profile_metadata_content_label">Cynnwys</string>
     <string name="pref_title_absolute_time">Defnyddio amser absoliwt</string>
@@ -286,7 +286,7 @@
     <string name="action_unreblog">Dileu hwb</string>
     <string name="action_unfavourite">Dileu hoff</string>
     <string name="action_delete_and_redraft">Dileu ac ail-ddrafftio</string>
-    <string name="action_view_account_preferences">Dewisiadau Cyfrif</string>
+    <string name="action_view_account_preferences">Dewisiadau\'ch cyfrif</string>
     <string name="action_view_domain_mutes">Parthau cudd</string>
     <string name="action_mute_domain">Tewi %s</string>
     <string name="action_add_tab">Ychwanegu Tab</string>
@@ -310,12 +310,12 @@
     <string name="notifications_apply_filter">Hidlo</string>
     <string name="notification_poll_description">Hysbysiadau am bolau sydd wedi cwblhau</string>
     <string name="account_date_joined">Ymunwyd %1$s</string>
-    <string name="no_scheduled_posts">Nid oes gennych unrhyw byst wedi\'u hamserlennu.</string>
+    <string name="no_scheduled_posts">Does gennych ddim negeseuon arfaethedig.</string>
     <string name="filter_expiration_format">%s (%s)</string>
     <string name="notification_clear_text">Ydych chi\'n siŵr eich bod chi am glirio\'ch holl hysbysiadau yn barhaol\?</string>
     <string name="error_multimedia_size_limit">Ni all feiliau fideo a sail i fod yn fwy na %s MB mewn maint.</string>
     <string name="url_domain_notifier">%s (🔗 %s)</string>
-    <string name="pref_title_show_notifications_filter">Dangos hidlen Hysbysiadau</string>
+    <string name="pref_title_show_notifications_filter">Dangos yr hidlydd hysbysiadau</string>
     <string name="error_following_hashtag_format">Gwall wrth ddilyn #%s</string>
     <string name="error_unfollowing_hashtag_format">Gwall wrth ddad-ddilyn #%s</string>
     <string name="action_unmute_domain">Dad-dewi %s</string>
@@ -325,25 +325,25 @@
     <string name="action_view_bookmarks">Llyfrnodau</string>
     <string name="action_add_poll">Ychwanegu pôl</string>
     <string name="confirmation_domain_unmuted">%s heb eu cuddio</string>
-    <string name="action_access_scheduled_posts">Pyst wedi\'u amserlennu</string>
+    <string name="action_access_scheduled_posts">Negeseuon arfaethedig</string>
     <string name="action_schedule_post">Amserlennu post</string>
     <string name="action_mentions">Crybwylliadau</string>
     <string name="dialog_mute_warning">Tewi @%s\?</string>
     <string name="dialog_mute_hide_notifications">Cuddio hysbysiadau</string>
     <string name="pref_title_notification_filter_sign_ups">rhywun wedi cofrestru</string>
-    <string name="pref_title_timeline_filters">Hidlenni</string>
-    <string name="dialog_block_warning">Blocio @%s\?</string>
+    <string name="pref_title_timeline_filters">Hidlyddion</string>
+    <string name="dialog_block_warning">Rhwystro @%s\?</string>
     <string name="notification_subscription_name">Pyst newydd</string>
     <string name="notification_update_name">Golygiadau i byst</string>
     <string name="notification_poll_name">Polau</string>
     <string name="notification_sign_up_name">Cofrestriadau</string>
     <string name="pref_title_public_filter_keywords">Ffrydiau cyhoeddus</string>
-    <string name="filter_addition_dialog_title">Ychwanegu hidlen</string>
-    <string name="filter_edit_dialog_title">Golygu hidlen</string>
+    <string name="filter_addition_dialog_title">Ychwanegu hidlydd</string>
+    <string name="filter_edit_dialog_title">Golygu hidlydd</string>
     <string name="filter_dialog_update_button">Diweddaru</string>
     <string name="pref_title_notification_filter_updates">golygwyd post rydw i wedi rhyngweithio â</string>
     <string name="notification_update_format">Golygodd %s eu post</string>
-    <string name="filter_apply">Cymhwyso</string>
+    <string name="filter_apply">Hidlo</string>
     <string name="pref_title_notification_filter_follow_requests">dilyniad wedi\'u ofyn</string>
     <string name="action_mute_notifications_desc">Tewi hysbysiadau o %s</string>
     <string name="notifications_clear">Clirio</string>
@@ -362,7 +362,7 @@
     <string name="title_migration_relogin">Mewngofnodwch eto i gael hysbysiadau gwthio</string>
     <string name="title_announcements">Cyhoeddiadau</string>
     <string name="error_could_not_load_login_page">Methu llwytho\'r dudalen mewngofnodi.</string>
-    <string name="title_scheduled_posts">Pyst wedi\'u amserlennu</string>
+    <string name="title_scheduled_posts">Negeseuon arfaethedig</string>
     <string name="error_loading_account_details">Wedi methu llwytho manylion cyfrif</string>
     <string name="pref_title_timelines">Ffrydiau</string>
     <string name="title_favourited_by">Wedi\'u hoffi gan</string>
@@ -388,4 +388,85 @@
     <string name="title_hashtags_dialog">Hashnodau</string>
     <string name="pref_main_nav_position_option_bottom">Gwaelod</string>
     <string name="action_open_faved_by">Dangos ffefrynnau</string>
+    <string name="report_description_1">Caiff yr adroddiad ei anfon at reolwr eich gweinydd. Gallwch esbonio pam rydych chi\'n adrodd y cyfrif hwn isod:</string>
+    <string name="warning_scheduling_interval">Mae gan Mastodon egwyl amserlennu o leiaf 5 munud.</string>
+    <string name="follow_requests_info">Er nad ydych wedi cloi\'ch cyfrif, roedd tîm %1$s yn meddwl efallai yr hoffech adolygu\'r ceisiadau i\'ch dilyn o\'r cyfrifon hyn â llaw.</string>
+    <string name="delete_scheduled_post_warning">Hoffech chi ddileu\'r neges arfaethedig hon\?</string>
+    <string name="description_post_media_no_description_placeholder">Dim disgrifiad</string>
+    <string name="hint_list_name">Enw\'r rhestr</string>
+    <string name="edit_hashtag_hint">Hashnod heb #</string>
+    <string name="report_remote_instance">Anfon ymlaen at %s</string>
+    <string name="report_description_remote_instance">Daw\'r cyfrif o weinydd arall. Hoffech chi anfon copi dienw o\'r adroddiad i\'r gweinydd hwnnw hefyd\?</string>
+    <string name="duration_1_hour">Awr</string>
+    <string name="duration_6_hours">6 awr</string>
+    <string name="duration_1_day">Diwrnod</string>
+    <string name="unpin_action">Dadbinio</string>
+    <string name="pref_show_self_username_never">Byth</string>
+    <string name="pref_show_self_username_always">Bob tro</string>
+    <string name="post_media_attachments">Atodiadau</string>
+    <string name="action_create_list">Creu rhestr</string>
+    <string name="action_rename_list">Ailenwi\'r rhestr</string>
+    <string name="action_edit_list">Golygu\'r rhestr</string>
+    <string name="hint_search_people_list">Chwilio am bobl rydych chi\'n eu dilyn</string>
+    <string name="profile_badge_bot_text">Bot</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+    <string name="action_edit_image">Golygu\'r llun</string>
+    <string name="title_reblogged_by">Hybwyd gan</string>
+    <string name="label_duration">Hyd</string>
+    <string name="duration_5_min">5 munud</string>
+    <string name="duration_30_min">Hanner awr</string>
+    <string name="duration_3_days">Tridiau</string>
+    <string name="duration_7_days">Wythnos</string>
+    <string name="duration_14_days">Pythefnos</string>
+    <string name="duration_30_days">30 diwrnod</string>
+    <string name="duration_60_days">60 diwrnod</string>
+    <string name="duration_90_days">90 diwrnod</string>
+    <string name="duration_180_days">180 diwrnod</string>
+    <string name="duration_365_days">Blwyddyn</string>
+    <string name="add_poll_choice">Ychwanegu dewis</string>
+    <string name="pin_action">Pinio</string>
+    <string name="conversation_more_recipients">%1$s, %2$s a %3$d eraill</string>
+    <string name="poll_info_time_absolute">yn dod i ben am %s</string>
+    <string name="duration_no_change">(Dim newid)</string>
+    <string name="poll_allow_multiple_choices">Amlddewis</string>
+    <string name="poll_new_choice_hint">Dewis %d</string>
+    <string name="no_announcements">Does dim cyhoeddiadau.</string>
+    <string name="account_note_hint">Eich nodyn preifat ynghylch y cyfrif hwn</string>
+    <string name="account_note_saved">Wedi\'i gadw!</string>
+    <string name="action_subscribe_account">Tanysgrifio</string>
+    <string name="action_unsubscribe_account">Dad-danysgrifo</string>
+    <string name="dialog_delete_list_warning">Ydych chi\'n sicr yr hoffech chi ddileu\'r rhestr %s\?</string>
+    <string name="no_drafts">Does gennych chi ddim drafftiau.</string>
+    <string name="pref_title_show_cards_in_timelines">Dangos rhagolygon o ddolenni</string>
+    <string name="pref_title_wellbeing_mode">Llesiant</string>
+    <string name="wellbeing_hide_stats_posts">Cuddio ystadegau meintiol negeseuon</string>
+    <string name="wellbeing_hide_stats_profile">Cuddio ystadegau meintiol proffiliau</string>
+    <string name="draft_deleted">Drafft wedi\'i ddileu</string>
+    <string name="drafts_post_reply_removed">Mae\'r neges y drafftioch ymateb iddi wedi cael ei dileu</string>
+    <string name="description_post_language">Iaith y neges</string>
+    <string name="hashtags">Hashnodau</string>
+    <string name="poll_vote">Pleidleisio</string>
+    <string name="poll_ended_voted">Mae pôl y pleidleisioch ynddo wedi dod i ben</string>
+    <string name="poll_ended_created">Mae pôl y creoch wedi dod i ben</string>
+    <string name="button_continue">Parhau</string>
+    <string name="button_back">Yn ôl</string>
+    <string name="hint_additional_info">Sylwadau ychwanegol</string>
+    <string name="app_theme_system">Defnyddio arddull y system</string>
+    <string name="pref_main_nav_position">Lleoliad y panel llywio</string>
+    <string name="pref_title_animate_gif_avatars">Animeiddio lluniau proffil GIF</string>
+    <string name="pref_default_media_sensitivity">Nodi cyfryngau yn sensitif bob tro</string>
+    <string name="about_powered_by_tusky">Pwerir gan Tusky</string>
+    <string name="title_accounts">Cyfrifon</string>
+    <string name="create_poll_title">Pôl</string>
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="action_delete_list">Dileu\'r rhestr</string>
+    <string name="add_hashtag_title">Ychwanegu hashnod</string>
+    <string name="status_count_one_plus">1+</string>
+    <string name="post_media_audio">Sain</string>
+    <string name="compose_shortcut_long_label">Ysgrifennu neges</string>
+    <string name="drafts_post_failed_to_send">Methodd anfon y neges hon!</string>
+    <string name="tusky_compose_post_quicksetting_label">Ysgrifennu neges</string>
+    <string name="tips_push_notification_migration">Ailfewngofnodwch i\'ch cyfrifon er mwyn galluogi hysbysiadau i\'ch ffôn.</string>
+    <string name="dialog_push_notification_migration">Er mwyn derbyn hysbysiadau i\'ch ffôn drwy UnifiedPush, mae angen caniatâd ar Tusky i danysgrifio i hysbysiadau ar eich gweinydd Mastodon. Bydd rhaid i chi fewngofnodi eto i newid y sgôp OAuth a roddir i Tusky. Bydd defnyddio\'r opsiwn ailfewngofnodi yma neu yn \'Dewisiadau\'ch cyfrif\' yn cadw\'ch holl ddrafftiau a\'ch storfa leol.</string>
+    <string name="mute_domain_warning">Ydych chi\'n sicr yr hoffech chi rwystro %s i gyd\? Welwch chi ddim cynnwys o\'r parth hwnnw mewn unrhyw llinellau amser cyhoeddus nac ychwaith yn eich hysbysiadau. Ceir gwared ar eich dilynwyr o\'r parth hwnnw.</string>
 </resources>
\ No newline at end of file