diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0c8a203f1..cc57b58b3 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -509,8 +509,6 @@
     <string name="pref_main_nav_position_option_top">الأعلى</string>
     <string name="action_unmute_domain">إلغاء كتم %s</string>
     <string name="dialog_mute_hide_notifications">أخفِ الإشعارات</string>
-    <string name="action_mute_notifications_desc">اكتم إشعارات %s</string>
-    <string name="action_unmute_notifications_desc">إلغاء كتم إشعارات %s</string>
     <string name="action_unmute_desc">إلغاء كتم %s</string>
     <string name="pref_title_hide_top_toolbar">إخفاء عنوان شريط الأدوات العلوي</string>
     <string name="title_announcements">الاعلانات</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index afda6de0d..8a618521c 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -227,8 +227,6 @@
     <string name="action_mute">Ігнараваць</string>
     <string name="action_unmute">Адмяніць ігнараванне</string>
     <string name="action_unmute_desc">Адмяніць ігнараванне %s</string>
-    <string name="action_unmute_notifications_desc">Атрымліваць паведамленні ад %s</string>
-    <string name="action_mute_notifications_desc">Ігнараваць паведамленні ад %s</string>
     <string name="action_mute_domain">Ігнараваць %s</string>
     <string name="action_unmute_domain">Адмяніць ігнараванне %s</string>
     <string name="action_mute_conversation">Ігнараваць размову</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 99543c3c1..67dde271f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -333,8 +333,6 @@
     <string name="action_mute_conversation">Заглушаване на разговор</string>
     <string name="action_unmute_domain">Раззаглушаване на %s</string>
     <string name="action_mute_domain">Заглушаване на %s</string>
-    <string name="action_mute_notifications_desc">Заглушаване на известия от %s</string>
-    <string name="action_unmute_notifications_desc">Раззаглушаване на известия от %s</string>
     <string name="action_unmute_desc">Раззаглушаване на %s</string>
     <string name="action_unmute">Раззаглушаване</string>
     <string name="action_mute">Заглушаване</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index ff8bdedfc..5a0cd5ea3 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -311,8 +311,6 @@
     <string name="post_boosted_format">%s বুস্টকৃত</string>
     <string name="post_username_format">\@%s</string>
     <string name="dialog_mute_hide_notifications">বিজ্ঞপ্তি লুকাও</string>
-    <string name="action_mute_notifications_desc">\'%s থেকে বিজ্ঞপ্তি বন্ধ করো\'</string>
-    <string name="action_unmute_notifications_desc">\'%s থেকে বিজ্ঞপ্তি বন্ধ করো\'</string>
     <string name="action_unmute_desc">আনমিউট %s</string>
     <string name="action_unmute_domain">আনমিউট %s</string>
     <string name="pref_main_nav_position_option_bottom">সবচেয়ে শেষ</string>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index 521e0d3d1..9598f57c5 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -431,8 +431,6 @@
     <string name="action_unmute_conversation">আলাপ বন্ধ করো</string>
     <string name="action_mute_conversation">আলাপ বন্ধ করো</string>
     <string name="action_unmute_domain">আনমিউট %s</string>
-    <string name="action_mute_notifications_desc">%s থেকে বিজ্ঞপ্তি বন্ধ করো</string>
-    <string name="action_unmute_notifications_desc">%s থেকে বিজ্ঞপ্তি বন্ধ করো</string>
     <string name="action_unmute_desc">আনমিউট %s</string>
     <string name="notification_follow_request_name">অনুরোধ অনুসরণ করুন</string>
     <string name="pref_title_confirm_reblogs">বুস্ট করার আগে নিশ্চিত করো</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0d49849e7..49cf3277f 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -453,8 +453,6 @@
     <string name="pref_title_gradient_for_media">Mostra els degradats de colors per als mitjans ocults</string>
     <string name="dialog_mute_hide_notifications">Amagar notificacions</string>
     <string name="action_unmute_domain">Deixar de silenciar %s</string>
-    <string name="action_mute_notifications_desc">Desactivar les notificacions per %s</string>
-    <string name="action_unmute_notifications_desc">Activar les notificacions per %s</string>
     <string name="action_unmute_desc">Deixar de silenciar %s</string>
     <string name="review_notifications">Revisió d\'avisos</string>
     <string name="account_note_saved">S\'ha desat!</string>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index e428c4593..0fbaf2546 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -48,8 +48,6 @@
     <string name="action_unmute_conversation">گفتوگۆی لاببە</string>
     <string name="action_unmute_domain">نابێدەنگ کردن %s</string>
     <string name="action_mute_domain">بێدەنگکردن %s</string>
-    <string name="action_mute_notifications_desc">بێدەنگکردنی ئاگانامەکان لە %s</string>
-    <string name="action_unmute_notifications_desc">ئاگانامەکانی لاببە لە %s</string>
     <string name="action_unmute_desc">نابێدەنگ %s</string>
     <string name="action_unmute">بێدەنگی لابردن</string>
     <string name="action_mute">بێدەنگ</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 581628e57..1ff6ca41b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -354,7 +354,7 @@
     <plurals name="max_tab_number_reached">
         <item quantity="one">bylo dosaženo maxima %1$d panelu</item>
         <item quantity="few">bylo dosaženo maxima %1$d panelů</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="description_post_media">Média %s</string>
     <string name="description_post_cw">Varování o obsahu: %s</string>
@@ -475,8 +475,6 @@
     <string name="dialog_block_warning">Zablokovat @%s\?</string>
     <string name="pref_main_nav_position_option_top">Nahoře</string>
     <string name="action_unmute_domain">Zrušit skrytí domény %s</string>
-    <string name="action_mute_notifications_desc">Skrýt oznámení od %s</string>
-    <string name="action_unmute_notifications_desc">Zrušit skrytí oznámení od %s</string>
     <string name="action_unmute_desc">Zrušit skrytí %s</string>
     <string name="dialog_mute_warning">Skrýt @%s\?</string>
     <string name="notification_follow_request_format">%s požádal/a aby vás mohl/a sledovat</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 36c95294f..b09aaf14a 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -1,82 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="error_generic">Bu gwall.</string>
-    <string name="error_empty">Gall hwn ddim a bod yn wag.</string>
+    <string name="error_empty">Ni all hwn fod yn wag.</string>
     <string name="error_invalid_domain">Rhoddwyd parth annilys</string>
-    <string name="error_failed_app_registration">Methu awdurdodi gyda\'r enghraifft hwnnw.</string>
+    <string name="error_failed_app_registration">Methu awdurdodi gyda\'r gweinydd hwnnw.</string>
     <string name="error_no_web_browser_found">Methu dod o hyd i borwr gwe i\'w ddefnyddio.</string>
     <string name="error_authorization_unknown">Bu 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_media_upload_type">Nid oes modd i chi lwytho\'r math hwnnw o ffeil.</string>
+    <string name="error_compose_character_limit">Mae\'ch neges yn rhy hir!</string>
+    <string name="error_media_upload_type">Ni allwch lwytho\'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 y cyfrwng hwn.</string>
     <string name="error_media_download_permission">Rhaid cael caniatâd i gadw\'r cyfrwng hwn.</string>
-    <string name="error_media_upload_image_or_video">Nid oes modd atodi delweddau a fideos i\'r un neges.</string>
-    <string name="error_media_upload_sending">Methodd y llwytho.</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">Methodd yr uwchlwytho.</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">Ffedereiddiwyd</string>
     <string name="title_view_thread">Trywydd</string>
-    <string name="title_posts">Postiadau</string>
-    <string name="title_posts_with_replies">Gydag atebion</string>
+    <string name="title_posts">Negeseuon</string>
+    <string name="title_posts_with_replies">Gydag ymatebion</string>
     <string name="title_follows">Yn dilyn</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 rhwystro</string>
-    <string name="title_follow_requests">Ceisiadau Dilyn</string>
-    <string name="title_edit_profile">Golygwch eich proffil</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">Wedi\'i hybu gan %s</string>
     <string name="post_sensitive_media_title">Cynnwys sensitif</string>
     <string name="post_media_hidden_title">Cyfryngau wedi\'u cuddio</string>
     <string name="post_sensitive_media_directions">Cliciwch i weld</string>
-    <string name="post_content_warning_show_more">Dangos Mwy</string>
-    <string name="post_content_warning_show_less">Dangos Llai</string>
+    <string name="post_content_warning_show_more">Dangos mwy</string>
+    <string name="post_content_warning_show_less">Dangos llai</string>
     <string name="post_content_show_more">Chwyddo</string>
     <string name="post_content_show_less">Lleihau</string>
     <string name="footer_empty">Dim byd yma. Tynnwch lawr i adnewyddu!</string>
-    <string name="notification_reblog_format">Mae %s wedi hybu\'ch post</string>
-    <string name="notification_favourite_format">Mae %s wedi ffefrynu\'ch post</string>
+    <string name="notification_reblog_format">Mae %s wedi hybu\'ch neges</string>
+    <string name="notification_favourite_format">Mae %s wedi hoffi\'ch neges</string>
     <string name="notification_follow_format">Mae %s wedi\'ch dilyn chi</string>
-    <string name="report_username_format">Adrodd ar @%s</string>
+    <string name="report_username_format">Adrodd @%s</string>
     <string name="report_comment_hint">Sylwadau ychwanegol?</string>
-    <string name="action_quick_reply">Ateb Cyflym</string>
-    <string name="action_reply">Ateb</string>
+    <string name="action_quick_reply">Ymateb yn gyflym</string>
+    <string name="action_reply">Ymateb</string>
     <string name="action_reblog">Hybu</string>
     <string name="action_favourite">Ffefryn</string>
     <string name="action_more">Mwy</string>
     <string name="action_compose">Creu</string>
-    <string name="action_login">Mewngofnodi gyda Mastodon</string>
+    <string name="action_login">Mewngofnodi â Mastodon</string>
     <string name="action_logout">Allgofnodi</string>
     <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">Rhwystro</string>
     <string name="action_unblock">Dadrwystro</string>
-    <string name="action_hide_reblogs">Cuddio hybu</string>
-    <string name="action_show_reblogs">Dangos hybu</string>
-    <string name="action_report">Adrodd ar</string>
+    <string name="action_hide_reblogs">Cuddio hybiadau</string>
+    <string name="action_show_reblogs">Dangos hybiadau</string>
+    <string name="action_report">Adrodd</string>
     <string name="action_delete">Dileu</string>
     <string name="action_send">TŴTIO</string>
     <string name="action_send_public">TŴTIO!</string>
-    <string name="action_retry">Ceisiwch eto</string>
+    <string name="action_retry">Ceisio eto</string>
     <string name="action_close">Cau</string>
     <string name="action_view_profile">Proffil</string>
     <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 rhwystro</string>
-    <string name="action_view_follow_requests">Ceisiadau i\'ch Dilyn</string>
+    <string name="action_view_follow_requests">Ceisiadau i\'ch dilyn</string>
     <string name="action_view_media">Cyfryngau</string>
     <string name="action_open_in_web">Agor mewn porwr</string>
     <string name="action_add_media">Ychwanegu cyfryngau</string>
-    <string name="action_photo_take">Tynnu ffotograff</string>
+    <string name="action_photo_take">Tynnu llun</string>
     <string name="action_share">Rhannu</string>
     <string name="action_mute">Tewi</string>
     <string name="action_unmute">Dad-dewi</string>
@@ -84,37 +84,37 @@
     <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_undo">Dadwneud</string>
     <string name="action_accept">Derbyn</string>
     <string name="action_reject">Gwrthod</string>
     <string name="action_search">Chwilio</string>
     <string name="action_access_drafts">Drafftiau</string>
-    <string name="action_toggle_visibility">Gwelededd pyst</string>
+    <string name="action_toggle_visibility">Gwelededd y neges</string>
     <string name="action_content_warning">Rhybudd cynnwys</string>
     <string name="action_emoji_keyboard">Bysellfwrdd emoji</string>
-    <string name="download_image">Llwytho %1$s</string>
+    <string name="download_image">Lawrlwytho %1$s</string>
     <string name="action_copy_link">Copïo\'r ddolen</string>
-    <string name="send_post_link_to">Rhannu URL post i…</string>
-    <string name="send_post_content_to">Rhannu post i…</string>
-    <string name="send_media_to">Rhannu cyfryngau i…</string>
+    <string name="send_post_link_to">Rhannu URL y neges â…</string>
+    <string name="send_post_content_to">Rhannu\'r neges â…</string>
+    <string name="send_media_to">Rhannu\'r cyfryngau â…</string>
     <string name="confirmation_reported">Anfonwyd!</string>
     <string name="confirmation_unblocked">Dadrwystrwyd y defnyddiwr</string>
     <string name="confirmation_unmuted">Dad-dawyd defnyddiwr</string>
     <string name="post_sent">Anfonwyd!</string>
-    <string name="post_sent_long">Anfonwyd yr ateb yn llwyddiannus.</string>
-    <string name="hint_domain">Pa enghraifft\?</string>
+    <string name="post_sent_long">Anfonwyd yr ymateb yn llwyddiannus.</string>
+    <string name="hint_domain">Pa weinydd\?</string>
     <string name="hint_compose">Beth sy\'n digwydd?</string>
     <string name="hint_content_warning">Rhybudd cynnwys</string>
     <string name="hint_display_name">Enw dangos</string>
-    <string name="hint_note">Amdanaf i</string>
+    <string name="hint_note">Amdanaf</string>
     <string name="hint_search">Chwilio…</string>
     <string name="search_no_results">Dim canlyniadau</string>
-    <string name="label_quick_reply">Ateb…</string>
+    <string name="label_quick_reply">Ymateb…</string>
     <string name="label_avatar">Llun proffil</string>
     <string name="label_header">Pennyn</string>
-    <string name="link_whats_an_instance">Beth yw enghraifft\?</string>
+    <string name="link_whats_an_instance">Beth yw gweinydd\?</string>
     <string name="login_connection">Yn cysylltu…</string>
     <string name="dialog_whats_an_instance">Gallwch roi cyfeiriad neu barth unrhyw enghraifft yma, fel mastodon.social, twt.cymru, social.tchncs.de, a <a href="https://instances.social">mwy!</a>
 \n
@@ -123,29 +123,29 @@
 \nEnghraifft yw\'r man y mae\'ch cyfrif wedi\'i gynnal, ond gallwch yn hawdd gyfathrebu â phobl a\'u dilyn ar enghreifftiau eraill fel petai chi yn yr unfan.
 \n
 \nRhagor o wybodaeth yn <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
-    <string name="dialog_title_finishing_media_upload">Yn Gorffen Llwytho\'r Cyfryngau</string>
-    <string name="dialog_message_uploading_media">Yn llwytho…</string>
-    <string name="dialog_download_image">Llwytho i lawr</string>
+    <string name="dialog_title_finishing_media_upload">Yn gorffen uwchlwytho\'r cyfryngau</string>
+    <string name="dialog_message_uploading_media">Yn uwchlwytho…</string>
+    <string name="dialog_download_image">Lawrlwytho</string>
     <string name="dialog_message_cancel_follow_request">Tynnu\'r cais i ddilyn yn ôl?</string>
     <string name="dialog_unfollow_warning">Dad-ddilyn y cyfrif hwn?</string>
-    <string name="dialog_delete_post_warning">Dileu\'r post hwn\?</string>
+    <string name="dialog_delete_post_warning">Dileu\'r neges hon\?</string>
     <string name="visibility_public">Cyhoeddus: Postio i ffrydiau cyhoeddus</string>
     <string name="visibility_unlisted">Heb restru: Peidio â dangos ar ffrydiau cyhoeddus</string>
-    <string name="visibility_private">Dilynwyr yn Unig: Dim ond postio i ddilynwyr</string>
-    <string name="visibility_direct">Uniongyrchol: Dim ond postio i ddefnyddwyr crybwyllwyd amdanynt</string>
+    <string name="visibility_private">Dilynwyr yn unig: Postio i ddilynwyr yn unig</string>
+    <string name="visibility_direct">Uniongyrchol: Postio i ddefnyddwyr a grybwyllwyd yn unig</string>
     <string name="pref_title_edit_notification_settings">Hysbysiadau</string>
     <string name="pref_title_notifications_enabled">Hysbysiadau</string>
     <string name="pref_title_notification_alerts">Rhybuddion</string>
-    <string name="pref_title_notification_alert_sound">Hysbysiad sain</string>
-    <string name="pref_title_notification_alert_vibrate">Hysbysiad crynu</string>
-    <string name="pref_title_notification_alert_light">Hysbysiad golau</string>
+    <string name="pref_title_notification_alert_sound">Hysbysu â sain</string>
+    <string name="pref_title_notification_alert_vibrate">Hysbysiad drwy grynu</string>
+    <string name="pref_title_notification_alert_light">Hysbysu â golau</string>
     <string name="pref_title_notification_filters">Hysbyswch fi pan</string>
     <string name="pref_title_notification_filter_mentions">crybwyllwyd</string>
     <string name="pref_title_notification_filter_follows">dilynodd</string>
     <string name="pref_title_notification_filter_reblogs">mae fy mhyst yn cael eu hybu</string>
     <string name="pref_title_notification_filter_favourites">mae fy mhyst yn cael eu ffefrynnu</string>
     <string name="pref_title_appearance_settings">Gwedd</string>
-    <string name="pref_title_app_theme">Thema Ap</string>
+    <string name="pref_title_app_theme">Thema\'r ap</string>
     <string name="app_them_dark">Tywyll</string>
     <string name="app_theme_light">Golau</string>
     <string name="app_theme_black">Du</string>
@@ -153,22 +153,22 @@
     <string name="pref_title_browser_settings">Porwr</string>
     <string name="pref_title_custom_tabs">Defnyddio Tabiau Cyfaddas Chrome</string>
     <string name="pref_title_hide_follow_button">Cuddio\'r botwm creu wrth sgrolio </string>
-    <string name="pref_title_post_filter">Hidlo ffrwd</string>
+    <string name="pref_title_post_filter">Hidlo ffrydiau</string>
     <string name="pref_title_post_tabs">Tabiau</string>
     <string name="pref_title_show_boosts">Dangos hybiau</string>
-    <string name="pref_title_show_replies">Dangos atebion</string>
+    <string name="pref_title_show_replies">Dangos ymatebion</string>
     <string name="pref_title_show_media_preview">Dangos rhagolwg cyfryngau</string>
     <string name="pref_title_proxy_settings">Dirprwy</string>
     <string name="pref_title_http_proxy_settings">Dirprwy HTTP</string>
     <string name="pref_title_http_proxy_enable">Galluogi dirprwy HTTP</string>
     <string name="pref_title_http_proxy_server">Gweinydd dirprwy HTTP</string>
-    <string name="pref_title_http_proxy_port">Porth dirprwy iHTTP</string>
-    <string name="pref_default_post_privacy">Preifatrwydd pyst rhagosodedig</string>
+    <string name="pref_title_http_proxy_port">Porth y dirprwy HTTP</string>
+    <string name="pref_default_post_privacy">Preifatrwydd rhagosodedig negeseuon</string>
     <string name="pref_publishing">Yn cyhoeddi (cydweddu gyda gweinydd)</string>
     <string name="post_privacy_public">Cyhoeddus</string>
     <string name="post_privacy_unlisted">Heb ei restru</string>
     <string name="post_privacy_followers_only">Dilynwyr yn unig</string>
-    <string name="pref_post_text_size">Maint testun post</string>
+    <string name="pref_post_text_size">Maint testun negeseuon</string>
     <string name="post_text_size_smallest">Lleiaf</string>
     <string name="post_text_size_small">Bach</string>
     <string name="post_text_size_medium">Canolig</string>
@@ -178,10 +178,10 @@
     <string name="notification_mention_descriptions">Hysbysiadau am grybwylliadau 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">Hybiau</string>
-    <string name="notification_boost_description">Hysbysiadau pan fydd eich pyst yn cael eu hybu</string>
+    <string name="notification_boost_name">Hybiadau</string>
+    <string name="notification_boost_description">Hysbysiadau pan gaiff eich negeseuon eu hybu</string>
     <string name="notification_favourite_name">Ffefrynnau</string>
-    <string name="notification_favourite_description">Hysbysiadau pan fydd eich pyst yn cael eu marcio fel ffefryn</string>
+    <string name="notification_favourite_description">Hysbysiadau pan gaiff eich negeseuon eu marcio fel ffefryn</string>
     <string name="notification_mention_format">Crybwyllodd %s chi</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s a %4$d eraill</string>
     <string name="notification_summary_medium">%1$s, %2$s, a %3$s</string>
@@ -194,7 +194,7 @@
         <item quantity="many">%d rhyngweithiad newydd</item>
         <item quantity="other">%d rhyngweithiad newydd</item>
     </plurals>
-    <string name="description_account_locked">Cyfrif wedi\'i Gloi</string>
+    <string name="description_account_locked">Cyfrif wedi\'i gloi</string>
     <string name="about_title_activity">Ynghylch</string>
     <string name="about_tusky_license">Mae Tusky yn feddalwedd cod agored rhydd. Mae\'n cael ei drwyddedu o dan Drwydded Cyhoeddus Cyffredinol GNU Fersiwn 3. Gallwch weld y drwydded yma: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <!-- note to translators:
@@ -208,8 +208,8 @@
     <string name="about_bug_feature_request_site">Adrodd ar wallau a cheisiadau nodweddion:
 \n https://github.com/tuskyapp/Tusky/issues</string>
     <string name="about_tusky_account">Proffil Tusky</string>
-    <string name="post_share_content">Rhannu cynnwys y post</string>
-    <string name="post_share_link">Rhannu dolen i\'r post</string>
+    <string name="post_share_content">Rhannu cynnwys y neges</string>
+    <string name="post_share_link">Rhannu dolen i\'r neges</string>
     <string name="post_media_images">Delweddau</string>
     <string name="post_media_video">Fideo</string>
     <string name="state_follow_requested">Cais i ddilyn</string>
@@ -227,7 +227,7 @@
     <string name="follows_you">Yn eich dilyn chi</string>
     <string name="pref_title_alway_show_sensitive_media">Dangos cynnwys sensitif bob tro</string>
     <string name="title_media">Cyfryngau</string>
-    <string name="replying_to">Yn ateb @%s</string>
+    <string name="replying_to">Yn ymateb i @%s</string>
     <string name="load_more_placeholder_text">llwytho rhagor</string>
     <string name="add_account_name">Ychwanegu Cyfrif</string>
     <string name="add_account_description">Ychwanegu Cyfrif Mastodon newydd</string>
@@ -240,19 +240,19 @@
     <string name="lock_account_label">Cloi cyfrif</string>
     <string name="lock_account_label_description">Bydd angen cymeradwyo eich dilynwyr eich hun</string>
     <string name="compose_save_draft">Cadw drafft?</string>
-    <string name="send_post_notification_title">Yn anfon post…</string>
-    <string name="send_post_notification_error_title">Gwall wrth anfon post</string>
+    <string name="send_post_notification_title">Yn anfon y neges…</string>
+    <string name="send_post_notification_error_title">Gwall wrth anfon y neges</string>
     <string name="send_post_notification_channel_name">Yn anfon Pyst</string>
     <string name="send_post_notification_cancel_title">Diddymwyd anfon</string>
-    <string name="send_post_notification_saved_content">Cadwyd copi o\'r post i\'ch drafftiau</string>
+    <string name="send_post_notification_saved_content">Cadwyd copi o\'r neges i\'ch drafftiau</string>
     <string name="action_compose_shortcut">Creu</string>
     <string name="error_no_custom_emojis">Nid oes gan eich enghraifft %s emoji personol</string>
     <string name="emoji_style">Arddull emoji</string>
     <string name="system_default">Rhagosodiad system</string>
     <string name="download_fonts">Bydd angen i chi lwytho\'r setiau emoji hyn i lawr yn gyntaf</string>
     <string name="performing_lookup_title">Wrthi\'n chwilio…</string>
-    <string name="expand_collapse_all_posts">Chwyddo/Lleihau pob post</string>
-    <string name="action_open_post">Agor post</string>
+    <string name="expand_collapse_all_posts">Chwyddo/lleihau pob neges</string>
+    <string name="action_open_post">Agor y neges</string>
     <string name="restart_required">Angen ailddechrau\'r ap</string>
     <string name="restart_emoji">Bydd angen ailddechrau Tusky i roi\'r newidiadau ar waith</string>
     <string name="later">Hwyrach</string>
@@ -272,23 +272,23 @@
     <string name="pref_title_absolute_time">Defnyddio amser absoliwt</string>
     <string name="post_username_format">\@%s</string>
     <string name="error_network">Digwyddodd gwall rhwydwaith! Gwiriwch eich cysylltiad a cheisiwch eto!</string>
-    <string name="title_direct_messages">Negeseuon Uniongyrchol</string>
+    <string name="title_direct_messages">Negeseuon uniongyrchol</string>
     <string name="title_tab_preferences">Tabiau</string>
     <string name="title_posts_pinned">Wedi\'i binio</string>
     <string name="title_domain_mutes">Parthau cudd</string>
     <string name="message_empty">Dim byd yma.</string>
     <string name="action_unreblog">Dileu hwb</string>
     <string name="action_unfavourite">Dileu ffefryn</string>
-    <string name="action_delete_and_redraft">Dileu ac ail-ddrafftio</string>
-    <string name="action_view_account_preferences">Dewisiadau Cyfrif</string>
+    <string name="action_delete_and_redraft">Dileu ac ailddrafftio</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>
+    <string name="action_add_tab">Ychwanegu tab</string>
     <string name="action_links">Dolenni</string>
     <string name="title_links_dialog">Dolenni</string>
-    <string name="action_open_reblogged_by">Dangos hybiau</string>
-    <string name="notification_follow_request_name">Ceisiadau Dilyn</string>
-    <string name="action_bookmark">Nod tudalen</string>
+    <string name="action_open_reblogged_by">Dangos hybiadau</string>
+    <string name="notification_follow_request_name">Ceisiadau i\'ch dilyn</string>
+    <string name="action_bookmark">Ychwanegu i\'ch nodau tudalen</string>
     <string name="action_edit">Golygu</string>
     <string name="edit_poll">Golygu</string>
     <string name="compose_shortcut_short_label">Creu</string>
@@ -297,26 +297,25 @@
     <string name="conversation_2_recipients">%1$s a %2$s</string>
     <string name="filter_dialog_remove_button">Dileu</string>
     <string name="description_visibility_public">Cyhoeddus</string>
-    <string name="action_unmute_conversation">Dad-dewi sgwrs</string>
+    <string name="action_unmute_conversation">Dad-dewi\'r sgwrs</string>
     <string name="pref_title_thread_filter_keywords">Sgyrsiau</string>
-    <string name="mute_domain_warning_dialog_ok">Cuddio parth yn llwyr</string>
-    <string name="action_mute_conversation">Tewi sgwrs</string>
+    <string name="mute_domain_warning_dialog_ok">Cuddio parth i gyd</string>
+    <string name="action_mute_conversation">Tewi\'r sgwrs</string>
     <string name="notifications_apply_filter">Hidlo</string>
     <string name="notification_poll_description">Hysbysiadau am bolau sydd wedi eu cwblhau</string>
-    <string name="account_date_joined">Wedi ymuno â %1$s</string>
+    <string name="account_date_joined">Ymunodd %1$s</string>
     <string name="no_scheduled_posts">Does gennych ddim negeseuon amserlenwyd.</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\'n barhaol\?</string>
-    <string name="error_multimedia_size_limit">Nid oes modd i ffeiliau fideo a sain i fod yn fwy na %s MB.</string>
+    <string name="error_multimedia_size_limit">Ni all ffeiliau fideo a sain fod yn fwy na %s MB.</string>
     <string name="url_domain_notifier">%s (🔗 %s)</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>
-    <string name="action_unmute_notifications_desc">Dad-dewi hysbysiadau o %s</string>
     <string name="notification_subscription_format">Mae %s newydd bostio</string>
-    <string name="action_delete_conversation">Dileu sgwrs</string>
-    <string name="action_view_bookmarks">Nodau Tudalen</string>
+    <string name="action_delete_conversation">Dileu\'r sgwrs</string>
+    <string name="action_view_bookmarks">Nodau tudalen</string>
     <string name="action_add_poll">Ychwanegu pôl</string>
     <string name="confirmation_domain_unmuted">%s wedi ei amlygu</string>
     <string name="action_access_scheduled_posts">Negeseuon amserlenwyd</string>
@@ -327,7 +326,7 @@
     <string name="pref_title_notification_filter_sign_ups">mae rhywun wedi cofrestru</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_subscription_name">Negeseuon newydd</string>
     <string name="notification_update_name">Golygiadau pyst</string>
     <string name="notification_poll_name">Polau</string>
     <string name="notification_sign_up_name">Cofrestriadau</string>
@@ -336,10 +335,9 @@
     <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 rwy wedi rhyngweithio ag ef</string>
-    <string name="notification_update_format">Golygodd %s ei bost</string>
-    <string name="filter_apply">Gosod</string>
+    <string name="notification_update_format">Golygodd %s ei neges</string>
+    <string name="filter_apply">Hidlo</string>
     <string name="pref_title_notification_filter_follow_requests">cais i ddilyn</string>
-    <string name="action_mute_notifications_desc">Tewi hysbysiadau o %s</string>
     <string name="notifications_clear">Clirio</string>
     <string name="pref_title_notification_filter_poll">polau wedi dod i ben</string>
     <string name="pref_title_notification_filter_subscriptions">mae rhywun rwy\'n tanysgrifio iddi/o wedi cyhoeddi post newydd</string>
@@ -347,11 +345,11 @@
     <string name="filter_add_description">Ymadrodd i\'w hidlo</string>
     <string name="action_open_as">Agor fel %s</string>
     <string name="action_reset_schedule">Ailosod</string>
-    <string name="title_bookmarks">Nodau Tudalen</string>
-    <string name="notification_follow_request_format">Gofynodd %s i\'ch dilyn chi</string>
+    <string name="title_bookmarks">Nodau tudalen</string>
+    <string name="notification_follow_request_format">Gofynnodd %s i\'ch dilyn chi</string>
     <string name="title_login">Mewngofnodi</string>
     <string name="notification_sign_up_format">Cofrestrodd %s</string>
-    <string name="action_unbookmark">Tynnu nod tudalen</string>
+    <string name="action_unbookmark">Tynnu\'r nod tudalen</string>
     <string name="action_unmute_desc">Dad-dewi %s</string>
     <string name="title_migration_relogin">Mewngofnodwch eto i gael hysbysiadau gwthio</string>
     <string name="title_announcements">Cyhoeddiadau</string>
@@ -364,14 +362,14 @@
     <string name="description_post_favourited">Ffefrynnwyd</string>
     <string name="saving_draft">Yn cadw drafft…</string>
     <string name="action_hashtags">Hashnodau</string>
-    <string name="action_dismiss">Gwrthod</string>
+    <string name="action_dismiss">Diystyru</string>
     <string name="action_details">Manylion</string>
     <string name="title_mentions_dialog">Crybwylliadau</string>
     <string name="action_open_media_n">Agor cyfryngau #%d</string>
     <string name="action_share_as">Rhannu fel …</string>
     <string name="downloading_media">Yn llwytho cyfryngau</string>
     <string name="download_media">Llwytho cyfryngau</string>
-    <string name="dialog_redraft_post_warning">Dileu ac ail-ddrafftio\'r post hwn\?</string>
+    <string name="dialog_redraft_post_warning">Dileu ac ailddrafftio\'r neges hon\?</string>
     <string name="dialog_delete_conversation_warning">Dileu\'r sgwrs hon\?</string>
     <string name="pref_title_language">Iaith</string>
     <string name="pref_title_bot_overlay">Dangos dangosydd botiau</string>
@@ -391,9 +389,9 @@
     <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">1 awr</string>
+    <string name="duration_1_hour">Awr</string>
     <string name="duration_6_hours">6 awr</string>
-    <string name="duration_1_day">1 diwrnod</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>
@@ -408,21 +406,21 @@
     <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">30 munud</string>
-    <string name="duration_3_days">3 diwrnod</string>
-    <string name="duration_7_days">7 diwrnod</string>
-    <string name="duration_14_days">14 diwrnod</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">356 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">Dewis lluosog</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>
@@ -436,20 +434,20 @@
     <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 post rydych wedi drafftio ymateb iddo wedi cael ei dileu</string>
-    <string name="description_post_language">Iaith y pyst</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 rydych wedi pleidleisio ynddo wedi dod i ben</string>
-    <string name="poll_ended_created">Mae pôl rydych wedi ei greu wedi dod i ben</string>
+    <string name="poll_ended_created">Mae pôl a greoch wedi dod i ben</string>
     <string name="button_continue">Parhau</string>
     <string name="button_back">Nôl</string>
     <string name="hint_additional_info">Sylwadau ychwanegol</string>
-    <string name="app_theme_system">Defnyddio Arddull y System</string>
+    <string name="app_theme_system">Defnyddio arddull y system</string>
     <string name="pref_main_nav_position">Prif lleoliad y panel llywio</string>
-    <string name="pref_title_animate_gif_avatars">Animeiddio afatarau GIF</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">Pŵer Tusky</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>
@@ -457,9 +455,9 @@
     <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 post</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 Post</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 sy\'n cael ei roi i Tusky. Bydd defnyddio\'r opsiwn ailfewngofnodi yma neu yn \'Dewisiadau Cyfrif\' yn cadw\'ch holl ddrafftiau a\'ch storfa leol.</string>
     <string name="mute_domain_warning">Ydych chi\'n siŵr yr hoffech chi rwystro %s gyfan\? Fyddwch chi ddim yn gweld dim cynnwys o\'r parth hwnnw mewn unrhyw ffrwd gyhoeddus na chwaith yn eich hysbysiadau. Bydd eich dilynwyr o\'r parth hwnnw yn cael eu dileu.</string>
@@ -484,15 +482,15 @@
     <string name="hint_media_description_missing">Dylai fod gan y cyfryngau ddisgrifiad.</string>
     <string name="description_post_cw">Rhybudd cynnwys: %s</string>
     <string name="pref_title_confirm_reblogs">Dangos deialog cadarnhau cyn rhoi hwb</string>
-    <string name="review_notifications">Adolygu Hysbysiadau</string>
+    <string name="review_notifications">Adolygu hysbysiadau</string>
     <string name="notification_report_format">Adroddiad newydd ar %s</string>
-    <string name="notification_header_report_format">Adroddodd %s ar %s</string>
+    <string name="notification_header_report_format">Adroddodd %s %s</string>
     <string name="notification_summary_report_format">%s · %d post wedi\'u hatodi</string>
-    <string name="pref_title_notification_filter_reports">mae\'n yna adroddiad newydd</string>
+    <string name="pref_title_notification_filter_reports">mae yna adroddiad newydd</string>
     <string name="report_category_violation">Torri rheolau</string>
     <string name="report_category_spam">Sbam</string>
-    <string name="failed_to_pin">Wedi methu Pinio</string>
-    <string name="failed_to_unpin">Wedi methu â Dad-binio</string>
+    <string name="failed_to_pin">Wedi methu pinio</string>
+    <string name="failed_to_unpin">Wedi methu dadbinio</string>
     <string name="pref_title_http_proxy_port_message">Dylai\'r porth fod rhwng %d a %d</string>
     <string name="error_rename_list">Methu ailenwi\'r rhestr</string>
     <string name="pref_default_post_language">Iaith bostio ragosodedig</string>
@@ -501,18 +499,18 @@
     <string name="button_done">Wedi gorffen</string>
     <string name="report_sent_success">Wedi adrodd ar @%s yn llwyddiannus</string>
     <string name="limit_notifications">Cyfyngu ar hysbysiadau ffrydiau</string>
-    <string name="post_lookup_error_format">Gwall wrth chwilio am byst %s</string>
+    <string name="post_lookup_error_format">Gwall wrth chwilio am y neges %s</string>
     <string name="pref_title_show_self_username">Dangos enw defnyddiwr mewn bariau offer</string>
     <string name="pref_title_confirm_favourites">Dangos deilaog cadarnhau cyn ffefrynnu</string>
     <string name="pref_title_hide_top_toolbar">Cuddio teitl y bar offer uchaf</string>
     <string name="instance_rule_title">Rheolau %s</string>
     <string name="language_display_name_format">%s (%s)</string>
-    <string name="error_following_hashtags_unsupported">Nid yw\'r enghraifft hon yn cefnogi\'r hashnodau canlynol.</string>
+    <string name="error_following_hashtags_unsupported">Nid yw\'r gweinydd hwn yn cefnogi\'r hashnodau canlynol.</string>
     <string name="poll_info_closed">wedi cau</string>
-    <string name="failed_fetch_posts">Wedi methu â nôl pyst</string>
+    <string name="failed_fetch_posts">Wedi methu nôl negeseuon</string>
     <string name="error_muting_hashtag_format">Gwall wrth dewi #%s</string>
     <string name="error_unmuting_hashtag_format">Gwall wrth ddad-dewi #%s</string>
-    <string name="title_followed_hashtags">Hashnodau\'n cael eu Dilyn</string>
+    <string name="title_followed_hashtags">Hashnodau a ddilynir</string>
     <string name="notification_report_name">Adroddiadau</string>
     <string name="label_remote_account">Gall y wybodaeth isod adlewyrchu proffil y defnyddiwr yn anghyflawn. Pwyswch i agor proffil llawn yn y porwr.</string>
     <plurals name="reblogs">
@@ -535,10 +533,10 @@
     </plurals>
     <string name="pref_show_self_username_disambiguate">Pan fydd cyfrifon lluosog wedi\'u mewngofnodi</string>
     <string name="drafts_failed_loading_reply">Wedi methu llwytho gwybodaeth Ateb</string>
-    <string name="pref_title_alway_open_spoiler">Dangos pyst wedi\'u marcio â rhybudd cynnwys bob tro</string>
+    <string name="pref_title_alway_open_spoiler">Agor negeseuon wedi\'u marcio â rhybudd cynnwys bob tro</string>
     <string name="profile_metadata_label_label">Label</string>
     <string name="post_edited">Wedi golygu %s</string>
-    <string name="confirmation_hashtag_unfollowed">#%s yn eu dad-ddilyn</string>
+    <string name="confirmation_hashtag_unfollowed">#%s wedi ei ddad-ddilyn</string>
     <string name="pref_title_animate_custom_emojis">Animeiddio emojis cyfaddas</string>
     <string name="notification_subscription_description">Hysbysiadau pan fydd rhywun rydych wedi tanysgrifio iddyn nhw\'n cyhoeddi post newydd</string>
     <string name="notification_sign_up_description">Hysbysiadau am ddefnyddwyr newydd</string>
@@ -551,7 +549,7 @@
     <string name="error_failed_set_focus">Wedi methu gosod pwynt ffocws</string>
     <string name="action_set_focus">Gosod pwynt ffocws</string>
     <string name="status_created_at_now">nawr</string>
-    <string name="error_delete_list">Methu dileu rhestr</string>
+    <string name="error_delete_list">Methu dileu\'r rhestr</string>
     <string name="action_add_to_list">Ychwanegwch gyfrif at y rhestr</string>
     <string name="action_remove_from_list">Tynnu cyfrif o\'r rhestr</string>
     <string name="action_add_reaction">ychwanegu ymateb</string>
@@ -589,7 +587,7 @@
     <string name="failed_report">Wedi methu ag adrodd</string>
     <string name="compose_preview_image_description">Gweithredoedd ar gyfer delwedd %s</string>
     <string name="action_open_reblogger">Agor awdur hybu</string>
-    <string name="notification_follow_request_description">Hysbysiadau am geisiadau dilyn</string>
+    <string name="notification_follow_request_description">Hysbysiadau am geisiadau i\'ch dilyn</string>
     <string name="caption_notoemoji">Gosodwyd emoji cyfredol Google</string>
     <plurals name="poll_timespan_seconds">
         <item quantity="zero">%d eiliadau ar ôl</item>
@@ -645,4 +643,5 @@
         <item quantity="other">Disgrifiwch ar gyfer pobl â nam ar eu golwg 
 \n(terfyn nodau o %d)</item>
     </plurals>
+    <string name="action_continue_edit">Parhau i olygu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bfe543c3e..4ecc97fee 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -466,8 +466,6 @@
     </plurals>
     <string name="pref_main_nav_position">Hauptnavigations-Position</string>
     <string name="dialog_mute_hide_notifications">Benachrichtigungen ausblenden</string>
-    <string name="action_mute_notifications_desc">Benachrichtigungen stummschalten von %s</string>
-    <string name="action_unmute_notifications_desc">Benachrichtigungs-Ton einschalten von %s</string>
     <string name="action_unmute_desc">%s nicht mehr verstecken</string>
     <string name="abbreviated_seconds_ago">%d Sek.</string>
     <string name="abbreviated_hours_ago">%d St.</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 27df785a1..ab0887c0b 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -282,7 +282,7 @@
     <string name="compose_active_account_description">Afiŝi per konto %1$s</string>
     <string name="error_failed_set_caption">Redakto de apudskribo malsukcesis</string>
     <plurals name="hint_describe_for_visually_impaired">
-        <item quantity="one"></item>
+        <item quantity="one"/>
         <item quantity="other">Priskribi por vide handikapitaj homoj
 \n(%d signoj maksimume)</item>
     </plurals>
@@ -454,8 +454,6 @@
     <string name="action_unmute_conversation">Malsilentigi la konversacion</string>
     <string name="action_mute_conversation">Silentigi la konversacion</string>
     <string name="action_unmute_domain">Malsilentigi %s</string>
-    <string name="action_mute_notifications_desc">Silentigi sciigojn de %s</string>
-    <string name="action_unmute_notifications_desc">Malsilentigi sciigojn de %s</string>
     <string name="action_unmute_desc">Malsilentigi %s</string>
     <string name="notification_follow_request_format">%s petis sekvi vin</string>
     <string name="title_announcements">Anoncoj</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8a0cd1f52..c5e382f79 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -491,8 +491,6 @@
     <string name="action_unmute_domain">Dejar de silenciar a %s</string>
     <string name="action_unmute_desc">Dejar de silenciar a %s</string>
     <string name="dialog_mute_hide_notifications">Ocultar notificaciones</string>
-    <string name="action_mute_notifications_desc">Silenciar notificaciones desde %s</string>
-    <string name="action_unmute_notifications_desc">Dejar de silenciar notificaciones desde %s</string>
     <string name="pref_title_hide_top_toolbar">Ocultar el título de la barra de herramientas superior</string>
     <string name="account_note_saved">¡Guardado!</string>
     <string name="account_note_hint">Tu nota privada acerca de esta cuenta</string>
@@ -613,4 +611,7 @@
     <string name="error_status_source_load">Fallo al cargar el estado desde el servidor.</string>
     <string name="confirmation_hashtag_unfollowed">Dejaste de seguir a #%s</string>
     <string name="pref_title_notification_filter_reports">Hay una nueva denuncia</string>
+    <string name="action_discard">Descartar cambios</string>
+    <string name="action_continue_edit">Continuar editando</string>
+    <string name="compose_unsaved_changes">Tienes cambios sin guardar.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index eaf42b38a..41d27b8fb 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -469,8 +469,6 @@
     <string name="pref_title_notification_filter_follow_requests">jarraipen-eskaera</string>
     <string name="action_unmute_conversation">Desmututu elkarrizketa</string>
     <string name="action_unmute_domain">Desmututu %s</string>
-    <string name="action_mute_notifications_desc">Mututu %s(r)en jakinarazpenak</string>
-    <string name="action_unmute_notifications_desc">Desmututu %s(r)en jakinarazpenak</string>
     <string name="review_notifications">Jakinarazpenak berrikusi</string>
     <string name="pref_title_confirm_favourites">Erakutsi baieztapen elkarrizketa-koadroa gogokoenetara gehitu aurretik</string>
     <string name="follow_requests_info">Zure kontua blokeatuta ez badago ere, %1$s-ko langileek kontu hauetako eskaerak eskuz berrikusi nahi dituzula pentsatu dute.</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index c1dab0c9a..0c5cdb359 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -465,8 +465,6 @@
     <string name="pref_title_gradient_for_media">نمایش گرادیان‌های رنگی برای رسانه‌های نهفته</string>
     <string name="dialog_mute_hide_notifications">نهفتن آگاهی‌ها</string>
     <string name="action_unmute_domain">ناخموشی %s</string>
-    <string name="action_mute_notifications_desc">خموشی آگاهی‌ها از %s</string>
-    <string name="action_unmute_notifications_desc">ناخموشی آگاهی‌ها از %s</string>
     <string name="action_unmute_desc">ناخموشی %s</string>
     <plurals name="poll_info_votes">
         <item quantity="one">%s رأی</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index a9d21407b..34ebc19c5 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -196,7 +196,6 @@
     <string name="action_more">Enemmän</string>
     <string name="notification_mention_format">%s on maininnut sinut</string>
     <string name="error_media_upload_opening">Tiedoston lataaminen epäonnistui.</string>
-    <string name="action_unmute_notifications_desc">Poista ilmoitusten mykistys tililtä %s</string>
     <string name="notification_reblog_format">%s jakoi julkaisusi</string>
     <string name="error_compose_character_limit">Julkaisusi on liian pitkä!</string>
     <string name="action_unmute_conversation">Poista keskustelun mykistys</string>
@@ -265,7 +264,6 @@
     <string name="notification_update_format">%s muokkasi julkaisua</string>
     <string name="notification_update_name">Julkaisujen muokkaukset</string>
     <string name="title_migration_relogin">Kirjaudu uudestaan sisään ottaaksesi vastaan push-ilmoituksia</string>
-    <string name="action_mute_notifications_desc">Mykistä ilmoitukset tililtä %s</string>
     <string name="action_details">Yksityiskohdat</string>
     <string name="error_image_edit_failed">Kuvaa ei voitu muokata.</string>
     <string name="description_visibility_unlisted">Listaamaton</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 774a37a8d..23b6a5910 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -473,8 +473,6 @@
     <string name="pref_main_nav_position">Position de navigation principale</string>
     <string name="action_unmute_domain">Ne plus masquer %s</string>
     <string name="dialog_mute_hide_notifications">Cacher les notifications</string>
-    <string name="action_mute_notifications_desc">Masquer les notifications de %s</string>
-    <string name="action_unmute_notifications_desc">Ne plus masquer les notifications de %s</string>
     <string name="action_unmute_desc">Ne plus masquer %s</string>
     <plurals name="poll_info_people">
         <item quantity="one">%s personne</item>
diff --git a/app/src/main/res/values-fy/strings.xml b/app/src/main/res/values-fy/strings.xml
index cce1246d0..bd1c73b53 100644
--- a/app/src/main/res/values-fy/strings.xml
+++ b/app/src/main/res/values-fy/strings.xml
@@ -156,8 +156,6 @@
     <string name="action_mute_conversation">Petear negearre</string>
     <string name="action_unmute_domain">%s net mear negearre</string>
     <string name="action_mute_domain">%s negearre</string>
-    <string name="action_mute_notifications_desc">Notifikaasjes fan %s negearre</string>
-    <string name="action_unmute_notifications_desc">Notifikaasjes fan %s net mear negearre</string>
     <string name="action_unmute_desc">%s net mear negearre</string>
     <string name="action_unmute">Net mear negearre</string>
     <string name="action_mute">Negearre</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index 09deea906..d3c048654 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -118,8 +118,6 @@
     <string name="action_open_drawer">Tarraiceán a oscailt</string>
     <string name="action_hide_media">Folaigh na meáin</string>
     <string name="action_mention">Luaigh</string>
-    <string name="action_mute_notifications_desc">Fógraí tost ó %s</string>
-    <string name="action_unmute_notifications_desc">Fógraí neamhshábháilteachta ó %s</string>
     <string name="action_unmute">Unmute</string>
     <string name="action_mute">Balbhaigh</string>
     <string name="action_share">Comhroinn</string>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index 2c2727a8e..dee5b4e0e 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -99,8 +99,6 @@
     <string name="account_note_hint">Nòta prìobhaideach agad mun chunntas seo</string>
     <string name="pref_title_hide_top_toolbar">Falaich tiotal a’ bhàir-inneal aig a’ bhàrr</string>
     <string name="dialog_mute_hide_notifications">Falaich na brathan</string>
-    <string name="action_mute_notifications_desc">Mùch na brathan o %s</string>
-    <string name="action_unmute_notifications_desc">Dì-mhùch na brathan o %s</string>
     <string name="pref_title_confirm_reblogs">Seall còmhradh dearbhaidh mus dèan thu brosnachadh</string>
     <string name="pref_title_show_cards_in_timelines">Seall ro-sheallaidhean air ceanglaichean sna loidhnichean-ama</string>
     <string name="warning_scheduling_interval">Feumaidh co-dhiù 5 mionaidean a bhith eadar postaichean sgeidealaichte air Mastodon.</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 40b239440..e5106d4e1 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -18,8 +18,6 @@
     <string name="action_mute_conversation">Acalar conversa</string>
     <string name="action_unmute_domain">Reactivar %s</string>
     <string name="action_mute_domain">Acalar %s</string>
-    <string name="action_mute_notifications_desc">Acalar as notificacións de %s</string>
-    <string name="action_unmute_notifications_desc">Reactivar as notificacións de %s</string>
     <string name="action_unmute_desc">Reactivar %s</string>
     <string name="action_unmute">Desacalar</string>
     <string name="action_mute">Acalar</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 972a57451..58c04146c 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -369,8 +369,6 @@
     <string name="action_open_as">%s के रूप में खोलें</string>
     <string name="download_image">%1$s डाउनलोड हो रहा है</string>
     <string name="action_links">लिंक</string>
-    <string name="action_mute_notifications_desc">%s से सूचनाएं म्यूट करें</string>
-    <string name="action_unmute_notifications_desc">%s से सूचनाएं अनम्यूट करें</string>
     <string name="action_unmute_desc">अनम्यूट %s</string>
     <string name="action_view_domain_mutes">छिपे हुए डोमेन</string>
     <string name="action_view_blocks">रोके गए उपयोगकर्ता</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 71783c383..23cb5067a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -471,9 +471,7 @@
     <string name="action_unmute_conversation">Beszélgetés némításának feloldása</string>
     <string name="action_mute_conversation">Beszélgetés némítása</string>
     <string name="action_unmute_domain">%s némításának feloldása</string>
-    <string name="action_mute_notifications_desc">Értesítések némítása tőle %s</string>
     <string name="action_unmute_desc">%s némításának feloldása</string>
-    <string name="action_unmute_notifications_desc">Értesítések némításának feloldása tőle %s</string>
     <string name="notification_follow_request_format">%s kéri, hogy követhessen</string>
     <string name="pref_title_hide_top_toolbar">Felső eszköztár címének elrejtése</string>
     <string name="account_note_saved">Elmentve!</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index ea4b938dd..187665e45 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -67,8 +67,6 @@
     <string name="action_share">Bagikan</string>
     <string name="action_mute">Bisukan</string>
     <string name="action_unmute_desc">Jangan bisukan %s</string>
-    <string name="action_unmute_notifications_desc">Jangan bisukan notifikasi dari %s</string>
-    <string name="action_mute_notifications_desc">Bisukan notifikasi dari %s</string>
     <string name="action_mute_domain">Bisukan %s</string>
     <string name="action_unmute_domain">Jangan bisukan %s</string>
     <string name="action_unmute_conversation">Jangan bisukan percakapan</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 638f7aeb9..231f23263 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -467,8 +467,6 @@
     <string name="action_unmute_conversation">Hætta að þagga niður í samtali</string>
     <string name="action_mute_conversation">Þagga niður í samtali</string>
     <string name="action_unmute_domain">Afþagga %s</string>
-    <string name="action_mute_notifications_desc">Þagga tilkynningar frá %s</string>
-    <string name="action_unmute_notifications_desc">Afþagga tilkynningar frá %s</string>
     <string name="action_unmute_desc">Afþagga %s</string>
     <string name="notification_follow_request_format">%s bað um að fylgjast með þér</string>
     <string name="title_announcements">Tilkynningar</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f97a4c2ed..cbb995a5d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -67,8 +67,8 @@
     <string name="action_unfollow">Smetti di seguire</string>
     <string name="action_block">Blocca</string>
     <string name="action_unblock">Sblocca</string>
-    <string name="action_hide_reblogs">Nascondi condivisioni</string>
-    <string name="action_show_reblogs">Mostra condivisioni</string>
+    <string name="action_hide_reblogs">Nascondi boost</string>
+    <string name="action_show_reblogs">Mostra boost</string>
     <string name="action_report">Segnala</string>
     <string name="action_delete">Elimina</string>
     <string name="action_send">TOOT</string>
@@ -108,7 +108,7 @@
     <string name="action_mentions">Menzioni</string>
     <string name="action_hashtags">Hashtag</string>
     <string name="action_open_reblogger">Vai all\'autore della condivisione</string>
-    <string name="action_open_reblogged_by">Mostra condivisioni</string>
+    <string name="action_open_reblogged_by">Mostra boost</string>
     <string name="action_open_faved_by">Mostra preferiti</string>
     <string name="title_hashtags_dialog">Hashtag</string>
     <string name="title_mentions_dialog">Menzioni</string>
@@ -181,7 +181,7 @@
     <string name="pref_title_language">Lingua</string>
     <string name="pref_title_post_filter">Filtraggio della timeline</string>
     <string name="pref_title_post_tabs">Schede</string>
-    <string name="pref_title_show_boosts">Mostra condivisioni</string>
+    <string name="pref_title_show_boosts">Mostra boost</string>
     <string name="pref_title_show_replies">Mostra risposte</string>
     <string name="pref_title_show_media_preview">Mostra anteprime media</string>
     <string name="pref_title_proxy_settings">Proxy</string>
@@ -206,7 +206,7 @@
     <string name="notification_mention_descriptions">Notifiche di quando vieni menzionato da qualcuno</string>
     <string name="notification_follow_name">Nuovi seguaci</string>
     <string name="notification_follow_description">Notifiche su nuovi seguaci</string>
-    <string name="notification_boost_name">Condivisioni</string>
+    <string name="notification_boost_name">Boost</string>
     <string name="notification_boost_description">Notifiche sui tuoi messaggi che vengono condivisi</string>
     <string name="notification_favourite_name">Preferiti</string>
     <string name="notification_favourite_description">Notifiche sui tuoi messaggi che vengono segnati come preferiti</string>
@@ -336,9 +336,9 @@
         <item quantity="other"><b>%1$s</b> Preferiti</item>
     </plurals>
     <plurals name="reblogs">
-        <item quantity="one"><b>%s</b> Condivisione</item>
-        <item quantity="many"><b>%s</b> Condivisioni</item>
-        <item quantity="other"><b>%s</b> Condivisioni</item>
+        <item quantity="one"><b>%s</b> boost</item>
+        <item quantity="many"><b>%s</b> boost</item>
+        <item quantity="other"><b>%s</b> boost</item>
     </plurals>
     <string name="title_reblogged_by">Condiviso da</string>
     <string name="title_favourited_by">Aggiunto ai preferiti da</string>
@@ -491,8 +491,6 @@
     <string name="pref_main_nav_position">Posizione barra di navigazione principale</string>
     <string name="pref_title_gradient_for_media">Mostra gradienti colorati per i media nascosti</string>
     <string name="dialog_mute_hide_notifications">Nascondi notifiche</string>
-    <string name="action_mute_notifications_desc">Disattiva le notifiche da %s</string>
-    <string name="action_unmute_notifications_desc">Riattiva le notifiche da %s</string>
     <string name="title_announcements">Annunci</string>
     <string name="pref_title_notification_filter_follow_requests">mi viene richiesto di seguirmi</string>
     <string name="wellbeing_hide_stats_profile">Nascondi statistiche quantitative sui profili</string>
@@ -525,8 +523,8 @@
     <string name="action_delete_conversation">Elimina conversazione</string>
     <string name="wellbeing_mode_notice">Alcune informazioni che potrebbero influenzare il tuo benessere mentale saranno nascoste. Questo include:
 \n
-\n - Notifiche riguardo a Preferiti/Condivisioni/Following
-\n - Conteggio dei Preferiti/Condivisioni nei post
+\n - Notifiche riguardo a Preferiti/Boost/Following
+\n - Conteggio dei Preferiti/Boost nei post
 \n - Statistiche riguardo a Preferiti/Post nei profili
 \n
 \n Le notifiche push non saranno influenzate, ma puoi modificare le tue impostazioni delle notifiche manualmente.</string>
@@ -579,4 +577,43 @@
     <string name="duration_no_change">(nessuna modifica)</string>
     <string name="pref_title_show_self_username">Mostra nome utente nelle barre strumenti</string>
     <string name="url_domain_notifier">%s (🔗 %s)</string>
+    <string name="action_add_or_remove_from_list">Aggiunti o rimuovi dalla lista</string>
+    <string name="failed_to_add_to_list">Aggiunta dell\'account alla lista fallita</string>
+    <string name="failed_to_remove_from_list">Rimozione dell\'account dalla lista fallita</string>
+    <string name="compose_save_draft_loses_media">Salvare bozza\? (gli allegati verranno ricaricati quando ripristini la bozza.)</string>
+    <string name="failed_to_pin">Fissaggio fallito</string>
+    <string name="hint_media_description_missing">I media dovrebbero avere una descrizione.</string>
+    <string name="no_lists">Non hai alcuna lista.</string>
+    <string name="language_display_name_format">%s (%s)</string>
+    <string name="pref_default_post_language">Lingua predefinita per i post creati</string>
+    <string name="notification_report_description">Notifiche sulle segnalazioni da moderare</string>
+    <string name="failed_to_unpin">Rimozione del fissaggio fallita</string>
+    <string name="pref_title_http_proxy_port_message">Il port dovrebbe essere tra %d e %d</string>
+    <string name="report_category_violation">Violazione di una regola</string>
+    <string name="status_created_at_now">adesso</string>
+    <string name="post_media_alt">ALT</string>
+    <string name="pref_title_notification_filter_reports">c\'è una nuova segnalazione</string>
+    <string name="notification_report_name">Segnalazioni</string>
+    <string name="error_muting_hashtag_format">Errore nel silenziamento di #%s</string>
+    <string name="error_unmuting_hashtag_format">Errore nella rimozione del silenziamento di #%s</string>
+    <string name="title_followed_hashtags">Hashtag seguiti</string>
+    <string name="description_post_edited">Modificato</string>
+    <string name="error_following_hashtags_unsupported">Questa istanza non permette di seguire gli hashtag.</string>
+    <string name="action_discard">Scarta modifiche</string>
+    <string name="action_continue_edit">Continua a modificare</string>
+    <string name="notification_report_format">Nuova segnalazione su %s</string>
+    <string name="notification_header_report_format">%s ha segnalato %s</string>
+    <string name="notification_summary_report_format">%s · %d post allegati</string>
+    <string name="action_add_reaction">aggiungi reazione</string>
+    <string name="compose_unsaved_changes">Hai delle modifiche non salvate.</string>
+    <string name="confirmation_hashtag_unfollowed">Non segui più #%s</string>
+    <string name="error_status_source_load">Caricamento dello status della sorgente dal server fallito.</string>
+    <string name="post_edited">Modificato %s</string>
+    <string name="mute_notifications_switch">Silenzia notifiche</string>
+    <string name="title_edits">Modifiche</string>
+    <string name="report_category_spam">Spam</string>
+    <string name="status_edit_info">%1$s ha modificato %2$s</string>
+    <string name="status_created_info">%1$s ha creato %2$s</string>
+    <string name="report_category_other">Altro</string>
+    <string name="action_unfollow_hashtag_format">Smettere di seguire #%s\?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9dd271b93..573be30a3 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -442,8 +442,6 @@
     <string name="action_unmute_conversation">会話のミュートを解除</string>
     <string name="action_mute_conversation">会話をミュート</string>
     <string name="action_unmute_domain">%sのミュートを解除</string>
-    <string name="action_mute_notifications_desc">%sさんからの通知をミュート</string>
-    <string name="action_unmute_notifications_desc">%sさんからの通知のミュートを解除</string>
     <string name="pref_title_enable_swipe_for_tabs">タブ間の切り替えにスワイプのジェスチャーを有効化</string>
     <string name="pref_title_show_cards_in_timelines">リンクのプレビューをタイムラインに表示</string>
     <string name="pref_title_confirm_reblogs">ブーストする前に確認ダイアログを表示</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index f7fc5a844..9ff00ddd9 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -464,8 +464,6 @@
     <string name="pref_main_nav_position">Plassering av hovednavigasjon</string>
     <string name="action_unmute_domain">Fjern demping av %s</string>
     <string name="dialog_mute_hide_notifications">Skjul varsler</string>
-    <string name="action_mute_notifications_desc">Demp varsler fra %s</string>
-    <string name="action_unmute_notifications_desc">Fjern demping av varsler fra %s</string>
     <string name="action_unmute_desc">Fjern demping av %s</string>
     <string name="pref_title_hide_top_toolbar">Skjul tittelen på den øverste verktøylinjen</string>
     <string name="account_note_saved">Lagret!</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8f32b7b71..1329c22fb 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -495,8 +495,6 @@
     <string name="action_unmute_conversation">Gesprek niet meer negeren</string>
     <string name="action_mute_conversation">Gesprek negeren</string>
     <string name="action_unmute_domain">%s niet meer negeren</string>
-    <string name="action_mute_notifications_desc">Meldingen van %s negeren</string>
-    <string name="action_unmute_notifications_desc">Meldingen van %s niet meer negeren</string>
     <string name="action_unmute_desc">%s niet meer negeren</string>
     <string name="notification_subscription_format">%s heeft zojuist een bericht geplaatst</string>
     <string name="notification_follow_request_format">%s verzoekt u te volgen</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index a61dbda8a..ab88cf0cf 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -452,8 +452,6 @@
     <string name="warning_scheduling_interval">L’interval minimum de planificacion sus Mastodon e de 5 minutas.</string>
     <string name="notification_follow_request_name">Demandas d’abonament</string>
     <string name="hashtags">Etiquetas</string>
-    <string name="action_mute_notifications_desc">Desactivar las notificacions per %s</string>
-    <string name="action_unmute_notifications_desc">Activar las notificacions per %s</string>
     <string name="action_unmute_desc">Amagar pas mai a %s</string>
     <string name="notification_follow_request_format">%s a demandat a vos seguir</string>
     <string name="pref_title_show_cards_in_timelines">Mostrar los apercebuts dels ligams</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7f9116798..45176d2a0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -489,7 +489,6 @@
     <string name="pref_title_gradient_for_media">Pokazuj kolorowe gradienty dla ukrytej zawartości multimedialnej</string>
     <string name="dialog_mute_hide_notifications">Ukryj powiadomienia</string>
     <string name="action_unmute_domain">Cofnij wyciszenie %s</string>
-    <string name="action_mute_notifications_desc">Wycisz powiadomienia od %s</string>
     <string name="action_unmute_desc">Cofnij wyciszenie %s</string>
     <string name="pref_title_hide_top_toolbar">Ukryj tytuł górnego paska narzędzi</string>
     <string name="pref_main_nav_position_option_bottom">Dół</string>
@@ -537,7 +536,6 @@
     <string name="pref_main_nav_position">Pozycja głównego paska nawigacji</string>
     <string name="pref_title_animate_custom_emojis">Animuj niestandardowe emoji</string>
     <string name="dialog_delete_conversation_warning">Usunąć tą konwersację\?</string>
-    <string name="action_unmute_notifications_desc">Wyłącz wyciszenie powiadomień od %s</string>
     <string name="action_delete_conversation">Usuń konwersację</string>
     <string name="notification_subscription_format">%s opublikował/a post</string>
     <string name="notification_follow_request_format">%s poprosił/a o możliwość obserwowania Cię</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1a22d8563..4e6f49868 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -470,8 +470,6 @@
     <string name="dialog_mute_hide_notifications">Ocultar notificações</string>
     <string name="action_unmute_domain">Desbloquear %s</string>
     <string name="action_unmute_desc">Dessilenciar %s</string>
-    <string name="action_mute_notifications_desc">Silencie notificações de %s</string>
-    <string name="action_unmute_notifications_desc">Dessilencie notificações de %s</string>
     <string name="pref_title_hide_top_toolbar">Ocultar o título da barra superior de tarefas</string>
     <string name="notification_subscription_description">Notificar sobre toots de quem me interessa</string>
     <string name="pref_title_notification_filter_subscriptions">quem me interessa tootar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 7e1012da1..f7ff47005 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -121,8 +121,6 @@
     <string name="action_mute">Silenciar</string>
     <string name="action_unmute">Remover silêncio</string>
     <string name="action_unmute_desc">Remover %s do silêncio</string>
-    <string name="action_unmute_notifications_desc">Remover notificações de %s do silêncio</string>
-    <string name="action_mute_notifications_desc">Silencie notificações de %s</string>
     <string name="action_mute_domain">Silenciar %s</string>
     <string name="action_unmute_domain">Remover %s do silêncio</string>
     <string name="action_mute_conversation">Silenciar conversa</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4b0a5db38..749c3aabf 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -493,8 +493,6 @@
     <string name="pref_main_nav_position">Расположение панели навигации</string>
     <string name="action_unmute_domain">Отменить глушение %s</string>
     <string name="dialog_mute_hide_notifications">Скрыть уведомления</string>
-    <string name="action_mute_notifications_desc">Заглушить уведомления от %s</string>
-    <string name="action_unmute_notifications_desc">Получать уведомления от %s</string>
     <string name="action_unmute_desc">Разблокировать %s</string>
     <string name="account_note_saved">Сохранено!</string>
     <string name="account_note_hint">Ваша личная заметка об этой учётной записи</string>
diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml
index 7382d82fa..700804517 100644
--- a/app/src/main/res/values-sa/strings.xml
+++ b/app/src/main/res/values-sa/strings.xml
@@ -94,8 +94,6 @@
     <string name="action_view_profile">व्यक्तिविवरणम्</string>
     <string name="action_close">पिधीयताम्</string>
     <string name="action_retry">पुनः यत्यताम्</string>
-    <string name="action_mute_notifications_desc">%s मित्रविषये मा सूच्यताम्</string>
-    <string name="action_unmute_notifications_desc">%s मित्रविषये सूच्यताम्</string>
     <string name="action_unmute_desc">%s सशब्दं क्रियताम्</string>
     <string name="action_unmute">सशब्दम्</string>
     <string name="action_mute">निःशब्दम्</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 14086536c..3c08528dd 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -52,7 +52,6 @@
     <string name="abbreviated_days_ago">දව. %d</string>
     <string name="action_logout">නික්මෙන්න</string>
     <string name="filter_edit_dialog_title">පෙරහන සංස්කරණය</string>
-    <string name="action_mute_notifications_desc">%s වෙතින් දැනුම්දීම් නිහඬ කරන්න</string>
     <string name="notification_summary_medium">%1$s, %2$s, සහ %3$s</string>
     <string name="caption_twemoji">මාස්ටඩන් හි සම්මත ඉමෝජි කට්ටලය</string>
     <string name="poll_info_format"> <!-- 15 votes • 1 hour left --> %1$s • %2$s</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 524a7ecd9..066048fb8 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -482,8 +482,6 @@
     <string name="action_unmute_desc">Ta bort tystad %s</string>
     <string name="pref_title_hide_top_toolbar">Dölj titeln i övre verktygsfältet</string>
     <string name="dialog_mute_hide_notifications">Dölj aviseringar</string>
-    <string name="action_mute_notifications_desc">Tysta aviseringar från %s</string>
-    <string name="action_unmute_notifications_desc">Aktivera aviseringar från %s</string>
     <string name="account_note_saved">Sparat!</string>
     <string name="account_note_hint">Din privata notering om detta kontot</string>
     <string name="no_announcements">Det finns inga meddelanden.</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index f587d2799..dd541a848 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -452,9 +452,7 @@
     <string name="pref_title_gradient_for_media">แสดงการไล่ระดับสีสันสำหรับสื่อที่ถูกซ่อนไว้</string>
     <string name="action_unmute_domain">เลิกปิดเสียง %s</string>
     <string name="action_unmute_desc">เลิกปิดเสียง %s</string>
-    <string name="action_unmute_notifications_desc">เลิกปิดเสียงการแจ้งเตือนจาก %s</string>
     <string name="dialog_mute_hide_notifications">ซ่อนการแจ้งเตือน</string>
-    <string name="action_mute_notifications_desc">ปิดเสียงการแจ้งเตือนจาก %s</string>
     <string name="pref_title_hide_top_toolbar">ซ่อนหัวข้อของแถบเครื่องมือด้านบน</string>
     <string name="drafts_post_failed_to_send">ล้มเหลวในการส่งโพสต์นี้!</string>
     <string name="wellbeing_mode_notice">ข้อมูลบางอย่างที่อาจส่งผลต่อสุขภาพจิตของคุณจะถูกซ่อนไว้ซึ่งรวมถึง:
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a0b0076c5..d73fb68d9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -463,8 +463,6 @@
     <string name="dialog_mute_warning">\@%s sessize al\?</string>
     <string name="dialog_block_warning">\@%s engellensin mi\?</string>
     <string name="action_unmute_domain">%s alan adının sesini aç</string>
-    <string name="action_mute_notifications_desc">%s gelen bildirimleri yoksay</string>
-    <string name="action_unmute_notifications_desc">%s kullanıcısından gelen bildirimleri göster</string>
     <string name="action_unmute_desc">%s sesini aç</string>
     <string name="notification_follow_request_format">%s seni takip etmek istiyor</string>
     <string name="action_unmute_conversation">Sohbetin sesini aç</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8d079230f..c669c2494 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -167,8 +167,6 @@
     <string name="notification_favourite_description">Сповіщати про вподобання кимось дописів</string>
     <string name="pref_title_notification_filter_favourites">мої дописи вподобано</string>
     <string name="action_hide_media">Сховати медіа</string>
-    <string name="action_mute_notifications_desc">Приховати сповіщення від %s</string>
-    <string name="action_unmute_notifications_desc">Не приховувати сповіщення від %s</string>
     <string name="notification_subscription_format">%s щойно опубліковано</string>
     <string name="title_announcements">Оголошення</string>
     <string name="action_open_drawer">Відкрити меню</string>
@@ -613,4 +611,7 @@
     <string name="pref_title_http_proxy_port_message">Порт повинен бути між %d і %d</string>
     <string name="error_status_source_load">Не вдалося завантажити джерело стану з сервера.</string>
     <string name="post_media_alt">ALT</string>
+    <string name="action_discard">Відкинути зміни</string>
+    <string name="compose_unsaved_changes">У вас є незбережені зміни.</string>
+    <string name="action_continue_edit">Продовжити редагування</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 22d425a79..02d706708 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -51,12 +51,12 @@
     <string name="action_view_preferences">Cài đặt</string>
     <string name="action_logout">Đăng xuất</string>
     <string name="button_done">Xong</string>
-    <string name="action_send_public">TÚT!</string>
+    <string name="action_send_public">ĐĂNG</string>
     <string name="button_back">Quay lại</string>
     <string name="button_continue">Tiếp tục</string>
     <string name="filter_dialog_update_button">Cập nhật</string>
     <string name="filter_dialog_remove_button">Xóa</string>
-    <string name="action_send">TÚT</string>
+    <string name="action_send">ĐĂNG</string>
     <string name="action_login">Đăng nhập Mastodon</string>
     <string name="dialog_redraft_post_warning">Xóa và viết lại tút này\?</string>
     <string name="dialog_delete_post_warning">Xóa tút này\?</string>
@@ -435,7 +435,7 @@
     <string name="action_set_caption">Mô tả</string>
     <plurals name="hint_describe_for_visually_impaired">
         <item quantity="other">Mô tả dành cho người khiếm thị
-\n(Max %d ký tự)</item>
+\n(Tối đa %d ký tự)</item>
     </plurals>
     <string name="compose_active_account_description">Đăng với tư cách %1$s</string>
     <string name="action_add_to_list">Thêm người này vào danh sách</string>
@@ -451,8 +451,6 @@
     <string name="filter_dialog_whole_word_description">Chỉ có tác dụng nếu cụm từ là chữ-số trùng khớp, viết liền không dấu cách</string>
     <string name="description_post_media">Media: %s</string>
     <string name="dialog_mute_hide_notifications">Ẩn thông báo</string>
-    <string name="action_mute_notifications_desc">Ẩn thông báo từ %s</string>
-    <string name="action_unmute_notifications_desc">Bỏ ẩn thông báo từ %s</string>
     <string name="action_unmute_desc">Bỏ ẩn %s</string>
     <string name="action_unmute_domain">Bỏ ẩn %s</string>
     <string name="pref_title_hide_top_toolbar">Ẩn tiêu đề tab</string>
@@ -526,8 +524,8 @@
     <string name="error_image_edit_failed">Hình ảnh này không thể sửa.</string>
     <string name="error_loading_account_details">Không thể tải thông tin tài khoản</string>
     <string name="error_multimedia_size_limit">Video và audio không thể quá %s MB.</string>
-    <string name="error_following_hashtag_format">Lỗi khi quan tâm #%s</string>
-    <string name="error_unfollowing_hashtag_format">Lỗi khi bỏ quan tâm #%s</string>
+    <string name="error_following_hashtag_format">Lỗi khi theo dõi #%s</string>
+    <string name="error_unfollowing_hashtag_format">Lỗi khi ngưng theo dõi #%s</string>
     <string name="filter_expiration_format">%s (%s)</string>
     <string name="duration_no_change">(Không đổi)</string>
     <string name="description_post_language">Ngôn ngữ đăng</string>
@@ -540,8 +538,8 @@
     <string name="pref_show_self_username_disambiguate">Khi đăng nhập nhiều tài khoản</string>
     <string name="pref_show_self_username_never">Không hiện</string>
     <string name="delete_scheduled_post_warning">Bạn có chắc muốn xóa tút đã lên lịch\?</string>
-    <string name="instance_rule_info">Đăng nhập nghĩa là bạn đồng ý với quy tắc của %s.</string>
-    <string name="instance_rule_title">Quy tắc của %s</string>
+    <string name="instance_rule_info">Đăng nhập nghĩa là bạn đồng ý với nội quy của %s.</string>
+    <string name="instance_rule_title">Nội quy của %s</string>
     <string name="compose_save_draft_loses_media">Lưu bản nháp\? (Bạn sẽ cần tải lên lại file đính kèm)</string>
     <string name="failed_to_unpin">Không thể bỏ ghim</string>
     <string name="failed_to_pin">Không thể ghim</string>
@@ -550,20 +548,20 @@
     <string name="action_add_or_remove_from_list">Thêm hoặc xoá khỏi danh sách</string>
     <string name="failed_to_add_to_list">Không thể thêm người vào danh sách</string>
     <string name="failed_to_remove_from_list">Không thể xoá người khỏi danh sách</string>
-    <string name="action_unfollow_hashtag_format">Bỏ quan tâm #%s\?</string>
+    <string name="action_unfollow_hashtag_format">Ngưng theo dõi #%s\?</string>
     <string name="status_created_at_now">vừa xong</string>
     <string name="notification_report_format">Báo cáo mới trên %s</string>
     <string name="notification_header_report_format">%s báo cáo %s</string>
     <string name="notification_summary_report_format">%s trước · %d tút</string>
-    <string name="confirmation_hashtag_unfollowed">#%s đã bị bỏ quan tâm</string>
+    <string name="confirmation_hashtag_unfollowed">Đã ngưng theo dõi #%s</string>
     <string name="pref_title_notification_filter_reports">có một báo cáo mới</string>
     <string name="notification_report_name">Báo cáo</string>
     <string name="no_lists">Chưa có danh sách nào.</string>
-    <string name="report_category_violation">Vi phạm quy tắc máy chủ</string>
+    <string name="report_category_violation">Vi phạm nội quy máy chủ</string>
     <string name="report_category_spam">Spam</string>
     <string name="report_category_other">Khác</string>
-    <string name="error_following_hashtags_unsupported">Máy chủ này không hỗ trợ quan tâm hashtag.</string>
-    <string name="title_followed_hashtags">Những hashtag quan tâm</string>
+    <string name="error_following_hashtags_unsupported">Máy chủ này không hỗ trợ theo dõi hashtag.</string>
+    <string name="title_followed_hashtags">Những hashtag theo dõi</string>
     <string name="post_edited">Sửa %s</string>
     <string name="description_post_edited">Đã sửa</string>
     <string name="pref_default_post_language">Ngôn ngữ đăng mặc định</string>
@@ -573,5 +571,8 @@
     <string name="hint_media_description_missing">Hình ảnh phải có mô tả.</string>
     <string name="error_status_source_load">Không xác định được trạng thái máy chủ.</string>
     <string name="pref_title_http_proxy_port_message">Cổng nên là khoảng giữa %d đến %d</string>
-    <string name="post_media_alt">MT</string>
+    <string name="post_media_alt">❦</string>
+    <string name="action_discard">Hủy bỏ thay đổi</string>
+    <string name="action_continue_edit">Tiếp tục sửa</string>
+    <string name="compose_unsaved_changes">Thay đổi chưa được lưu.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 23d1e45f5..b21d10230 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -466,8 +466,6 @@
     <string name="action_mute_conversation">隐藏会话</string>
     <string name="action_unmute_domain">取消隐藏 %s</string>
     <string name="action_mute_domain">隐藏 %s</string>
-    <string name="action_mute_notifications_desc">隐藏来自 %s 的通知</string>
-    <string name="action_unmute_notifications_desc">取消隐藏来自 %s 的通知</string>
     <string name="action_unmute_desc">取消隐藏 %s</string>
     <string name="notification_follow_request_format">%s 请求关注你</string>
     <string name="pref_main_nav_position">导航栏位置</string>
@@ -593,4 +591,7 @@
     <string name="pref_title_http_proxy_port_message">端口应在 %d 和 %d 之间</string>
     <string name="error_status_source_load">从服务器加载状态源失败。</string>
     <string name="post_media_alt">ALT</string>
+    <string name="action_discard">放弃更改</string>
+    <string name="action_continue_edit">继续编辑</string>
+    <string name="compose_unsaved_changes">你有未保存的更改。</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 180842d2f..7d9824f83 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -428,8 +428,6 @@
     <string name="action_mute_conversation">靜音對話</string>
     <string name="action_unmute_domain">取消靜音 %s</string>
     <string name="action_mute_domain">靜音 %s</string>
-    <string name="action_mute_notifications_desc">靜音來自 %s 的通知</string>
-    <string name="action_unmute_notifications_desc">取消靜音來自 %s 的通知</string>
     <string name="action_unmute_desc">取消靜音 %s</string>
     <string name="action_add_poll">新增投票</string>
     <string name="action_view_domain_mutes">被隱藏的網域</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9e1a63185..28d3ae22e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -480,8 +480,6 @@
     <string name="account_note_hint">你對此帳號的個人註記</string>
     <string name="pref_title_hide_top_toolbar">隱藏頂端工具列的標題</string>
     <string name="dialog_mute_hide_notifications">隱藏通知</string>
-    <string name="action_mute_notifications_desc">靜音來自 %s 的通知</string>
-    <string name="action_unmute_notifications_desc">取消靜音來自 %s 的通知</string>
     <string name="action_unmute_desc">取消靜音 %s</string>
     <string name="action_unmute_domain">取消靜音 %s</string>
     <string name="pref_main_nav_position_option_bottom">底端</string>