diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 42b80c1e3..e14d254ec 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="conversation_1_recipients">%1$s</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <string name="abbreviated_seconds_ago">%dসে</string>
     <string name="description_poll">পছন্দগুলি সহ নর্বাচন: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="description_visiblity_direct">সরাসরি</string>
     <string name="description_visiblity_private">অনুগামিবৃন্দ</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a539c505a..3dc6cbcb9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -332,7 +332,7 @@
     <plurals name="favs">
         <item quantity="one"><b>%1$s</b> oblíbení</item>
         <item quantity="few"><b>%1$s</b> oblíbení</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <plurals name="reblogs">
         <item quantity="one"><b>%s</b> boost</item>
@@ -393,9 +393,9 @@
         <item quantity="other">%d dní</item>
     </plurals>
     <plurals name="poll_timespan_hours">
-        <item quantity="one">%d hodina</item>
-        <item quantity="few">%d hodiny</item>
-        <item quantity="other">%d hodin</item>
+        <item quantity="one"></item>
+        <item quantity="few"></item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="poll_timespan_minutes">
         <item quantity="one">%d minuta</item>
@@ -482,9 +482,9 @@
     <string name="action_unmute_desc">Odkrýt %s</string>
     <string name="dialog_mute_warning">Ztišit @%s\?</string>
     <plurals name="poll_info_people">
-        <item quantity="one"></item>
-        <item quantity="few"></item>
-        <item quantity="other"></item>
+        <item quantity="one"/>
+        <item quantity="few"/>
+        <item quantity="other"/>
     </plurals>
     <string name="notification_follow_request_format">%s požádal/a aby vás mohl/a sledovat</string>
     <string name="pref_title_confirm_reblogs">Zobrazit dialogové okno s potvrzením při boostování</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3b21ed174..eeac52262 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="error_generic">Ein Fehler ist aufgetreten.</string>
-    <string name="error_network">Ein Netzwerkfehler ist aufgetreten! Bitte überprüfen deine Internetverbindung und versuche es erneut!</string>
+    <string name="error_network">Ein Netzwerkfehler ist aufgetreten! Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut!</string>
     <string name="error_empty">Dies darf nicht leer sein.</string>
     <string name="error_invalid_domain">Ungültige Domain angegeben</string>
     <string name="error_failed_app_registration">Authentifizieren mit dieser Instanz fehlgeschlagen.</string>
@@ -36,7 +36,7 @@
     <string name="title_blocks">Blockierte Profile</string>
     <string name="title_follow_requests">Folgeanfragen</string>
     <string name="title_edit_profile">Dein Profil bearbeiten</string>
-    <string name="title_saved_toot">Gespeicherte Beiträge</string>
+    <string name="title_saved_toot">Entwürfe</string>
     <string name="title_licenses">Lizenzen</string>
     <string name="status_username_format">\@%s</string>
     <string name="status_boosted_format">%s teilte</string>
@@ -123,7 +123,7 @@
     <string name="send_status_content_to">Beitragsinhalt teilen…</string>
     <string name="send_media_to">Mediendatei teilen…</string>
     <string name="confirmation_reported">Gesendet!</string>
-    <string name="confirmation_unblocked">Entblockt</string>
+    <string name="confirmation_unblocked">entblockt</string>
     <string name="confirmation_unmuted">Stummschaltung aufgehoben</string>
     <string name="status_sent">Gesendet!</string>
     <string name="status_sent_long">Antwort erfolgreich gesendet.</string>
@@ -158,7 +158,7 @@
     <string name="visibility_unlisted">Ungelistet: Nicht in der öffentlichen Timeline sichtbar</string>
     <string name="visibility_private">Nur Folgende: Nur für Folgende sichtbar</string>
     <string name="visibility_direct">Direkt: Nur für Erwähnte sichtbar</string>
-    <string name="pref_title_edit_notification_settings">Benachrichtigungseinstellungen</string>
+    <string name="pref_title_edit_notification_settings">Benachrichtigungen</string>
     <string name="pref_title_notifications_enabled">Benachrichtigungen</string>
     <string name="pref_title_notification_alerts">Benachrichtigungen</string>
     <string name="pref_title_notification_alert_sound">Benachrichtige mit Sound</string>
@@ -359,7 +359,7 @@
     <string name="poll_info_closed">Geschlossen</string>
     <string name="poll_vote">Abstimmen</string>
     <string name="poll_ended_voted">Eine Umfrage in der du abgestimmt hast ist vorbei</string>
-    <string name="poll_ended_created">Eine Umfrage, die du erstellt hast, ist vorbei</string>
+    <string name="poll_ended_created">Eine Umfrage die du erstellt hast ist vorbei</string>
     <plurals name="poll_timespan_days">
         <item quantity="one">%d Tag</item>
         <item quantity="other">%d Tage</item>
@@ -462,7 +462,7 @@
     <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">%dS</string>
+    <string name="abbreviated_seconds_ago">%d Sek.</string>
     <string name="abbreviated_hours_ago">%d St.</string>
     <string name="abbreviated_in_days">in %d T.</string>
     <string name="abbreviated_years_ago">%d J.</string>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index 5ec758f1a..ed594dc7e 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -29,12 +29,12 @@
     <string name="action_send_public">TÚT!</string>
     <string name="action_emoji_keyboard">Meur-chlàr emoji</string>
     <string name="action_unfollow">Sguir a leantainn</string>
-    <string name="action_follow">Leantainn</string>
+    <string name="action_follow">Lean</string>
     <string name="action_more">Tuilleadh</string>
     <string name="action_retry">Ath-ghairm</string>
     <string name="action_close">Dùin</string>
     <string name="action_send">TÙT</string>
-    <string name="action_delete">Sguab às</string>
+    <string name="action_delete">Cuir às</string>
     <string name="action_delete_and_redraft">Cuir às agus ath-sgrìobhadh</string>
     <string name="action_report">Thoir cunntas air</string>
     <string name="action_unblock">Dì-bhac</string>
@@ -50,4 +50,6 @@
     <string name="action_access_saved_toot">Dreachdan</string>
     <string name="action_view_favourites">Prìomhaich</string>
     <string name="pref_title_notifications_enabled">Fiosan</string>
+    <string name="title_notifications">Fiosan</string>
+    <string name="notification_favourite_name">Prìomhaich</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 028f62245..e832afb55 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -401,7 +401,11 @@
         <item quantity="other"><b>%1$s</b> ने पसंद किया</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
-        <item quantity="one">%d मिनट</item>
-        <item quantity="other">%d मिनट</item>
+        <item quantity="one"></item>
+        <item quantity="other"></item>
+    </plurals>
+    <plurals name="poll_timespan_seconds">
+        <item quantity="one">%d सेकेंड</item>
+        <item quantity="other">%d सेकेंड</item>
     </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 0f8199673..72119eef6 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -22,7 +22,7 @@
     <string name="error_authorization_denied">ആധികാരികത ഉറപ്പുവരുത്താനായില്ല.</string>
     <string name="error_retrieving_oauth_token">ഒരു പ്രവേശന ടോക്കൺ ലഭ്യമാക്കുന്നതിൽ പരാജയപ്പെട്ടു.</string>
     <string name="error_compose_character_limit">ഈ സ്റ്റാറ്റസ് വളരെ നീളമേറിയതാണ്!</string>
-    <string name="error_image_upload_size">ഫയൽ 8എംബിയിലും ചെറുതായിരിക്കണം.</string>
+    <string name="error_image_upload_size">ഫയൽ 8 എംബിയേക്കാളും ചെറുതായിരിക്കണം.</string>
     <string name="error_video_upload_size">ചലച്ചിത്ര ഫയലുകൾ 40എംബിയിലും ചെറുതായിരിക്കണം.</string>
     <string name="error_media_upload_type">ഇത്തരം ഫയൽ അപ്‌ലോഡ് ചെയ്യാൻ സാധിക്കില്ല.</string>
     <string name="error_media_upload_opening">ഈ ഫയൽ തുറക്കാനായില്ല.</string>
@@ -44,8 +44,8 @@
     <string name="title_follows">പിന്തുടരലുകൾ</string>
     <string name="title_followers">പിന്തുടരുന്നവർ</string>
     <string name="title_mutes">നിശ്ശബ്ദരാക്കിയ ഉപയോക്താക്കൾ</string>
-    <string name="title_blocks">തടയപ്പെട്ട ഉപയോക്താക്കൾ</string>
-    <string name="title_follow_requests">പിന്തുടാരാനുള്ള അപേക്ഷകൾ</string>
+    <string name="title_blocks">നിരോധിച്ച ഉപയോഗതാക്കൾ</string>
+    <string name="title_follow_requests">പിന്തുടാനുള്ള അപേക്ഷകൾ</string>
     <string name="title_edit_profile">പ്രൊഫൈൽ തിരുത്തുക</string>
     <string name="action_reply">മറുപടി</string>
     <string name="action_reblog">ബൂസ്റ്റ്</string>
@@ -56,7 +56,7 @@
     <string name="action_follow">പിന്തുടരുക</string>
     <string name="action_unfollow">പിന്‍തുടരുന്നത് അവസാനിപ്പിക്കുക</string>
     <string name="action_retry">വീണ്ടും ശ്രമിക്കുക</string>
-    <string name="action_view_follow_requests">പിന്തുടാനുള്ള അപേക്ഷകൾ</string>
+    <string name="action_view_follow_requests">പിന്‍തുടരുവാനുള്ള അഭ്യര്‍ത്ഥനകള്‍</string>
     <string name="title_domain_mutes">മറച്ചുവെച്ച ഡൊമൈനുകൾ</string>
     <string name="description_visiblity_private">പിന്തുടരുന്നവർ</string>
     <string name="footer_empty">പുതിയത് ലഭിക്കാൻ താഴേക്ക് വലിക്കുക</string>
@@ -74,9 +74,9 @@
     <string name="action_reset_schedule">പുനഃക്രമീകരിക്കുക</string>
     <string name="action_open_in_web">ബ്രൗസറിൽ തുറക്കുക</string>
     <string name="action_view_media">മാധ്യമം</string>
-    <string name="action_view_domain_mutes">മറച്ചുവെച്ച ഡൊമൈനുകൾ</string>
-    <string name="action_view_blocks">തടയപ്പെട്ട ഉപയോക്താക്കൾ</string>
-    <string name="action_view_mutes">നിശ്ശബ്ദരാക്കിയ ഉപയോക്താക്കൾ</string>
+    <string name="action_view_domain_mutes">മറയ്ക്കപ്പെട്ട ഡൊമൈനുകൾ</string>
+    <string name="action_view_blocks">നിരോധിച്ച ഉപയോഗതാക്കൾ</string>
+    <string name="action_view_mutes">നിശ്ശബ്ദമാക്കിയ ഉപയോഗതാക്കൾ</string>
     <string name="action_view_bookmarks">ബൂക്കമാർക്ക്</string>
     <string name="action_view_favourites">ഇഷ്ടപ്പെട്ടത്</string>
     <string name="action_view_profile">പ്രൊഫൈൽ</string>
@@ -109,4 +109,6 @@
     <string name="action_access_saved_toot">കരടുകൾ</string>
     <string name="action_edit_own_profile">തിരുത്ത്</string>
     <string name="pref_title_edit_notification_settings">അറിയിപ്പുകൾ</string>
+    <string name="pref_title_status_tabs">ടാബുകൾ</string>
+    <string name="pref_title_notifications_enabled">അറിയിപ്പുകൾ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 470b3b095..c30e5d722 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -396,14 +396,14 @@
     <plurals name="poll_timespan_days">
         <item quantity="one">%d dzień</item>
         <item quantity="few">%d dni</item>
-        <item quantity="many">%d dni</item>
-        <item quantity="other">%d dni</item>
+        <item quantity="many"></item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="poll_timespan_hours">
         <item quantity="one">%d godzina</item>
-        <item quantity="few">%d godziny</item>
-        <item quantity="many">%d godzin</item>
-        <item quantity="other">%d godzin</item>
+        <item quantity="few">%d godzin</item>
+        <item quantity="many"></item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="poll_timespan_minutes">
         <item quantity="one">%d minuta</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 9a60f25dd..dc5659f37 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -437,4 +437,10 @@
     <string name="status_boosted_format">%s spodbudil</string>
     <string name="hashtags">Ključniki</string>
     <string name="notification_follow_request_name">Zahteve za Sledenje</string>
+    <plurals name="favs">
+        <item quantity="one"><b>%1$s</b> Priljubljena</item>
+        <item quantity="two"><b>%1$s</b> Priljubljeni</item>
+        <item quantity="few"><b>%1$s</b> Priljubljene</item>
+        <item quantity="other"><b>%1$s</b> Priljubljenih</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index f53ba26eb..2a5a035ea 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -278,4 +278,5 @@
     <string name="description_visiblity_private">பின்பற்றுபவர்கள்</string>
     <string name="description_visiblity_unlisted">பட்டியலிடப்படாதவர்களுக்கு</string>
     <string name="description_visiblity_public">அனைவருக்கும்</string>
+    <string name="compose_shortcut_short_label">எழுது</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d819665fc..04f0f5deb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -45,7 +45,7 @@
     <string name="hint_search">Пошук…</string>
     <string name="hint_note">Про себе</string>
     <string name="hint_compose">Що відбувається\?</string>
-    <string name="status_sent">Надіслано!</string>
+    <string name="status_sent">Надіслати!</string>
     <string name="confirmation_reported">Надіслано!</string>
     <string name="action_share_as">Поділитися як …</string>
     <string name="action_open_as">Відкрити як %s</string>
@@ -116,4 +116,7 @@
     <string name="title_media">Медіа</string>
     <string name="pref_title_notifications_enabled">Сповіщення</string>
     <string name="pref_title_edit_notification_settings">Сповіщення</string>
+    <string name="title_blocks">Заблоковані користувачі</string>
+    <string name="notification_favourite_name">Вподобане</string>
+    <string name="notification_follow_request_name">Запити на підписку</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 ad226a114..8affa3ce4 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -20,7 +20,7 @@
     <string name="error_media_upload_sending">媒體檔案上傳失敗</string>
     <string name="error_sender_account_gone">嘟文發送時出錯</string>
     <string name="title_home">主頁</string>
-    <string name="title_notifications">通知</string>
+    <string name="title_notifications">通知設定</string>
     <string name="title_public_local">本站時間軸</string>
     <string name="title_public_federated">跨站公開時間軸</string>
     <string name="title_direct_messages">私信</string>
@@ -30,7 +30,7 @@
     <string name="title_statuses_with_replies">嘟文和回覆</string>
     <string name="title_statuses_pinned">已置頂</string>
     <string name="title_follows">正在關注</string>
-    <string name="title_followers">僅關注者</string>
+    <string name="title_followers">關注者</string>
     <string name="title_favourites">我的收藏</string>
     <string name="title_mutes">被靜音的使用者</string>
     <string name="title_blocks">被封鎖的使用者</string>
@@ -61,7 +61,7 @@
     <string name="action_favourite">收藏</string>
     <string name="action_unfavourite">取消收藏</string>
     <string name="action_more">更多</string>
-    <string name="action_compose">新嘟文</string>
+    <string name="action_compose">撰寫嘟文</string>
     <string name="action_login">登入 Mastodon 帳號</string>
     <string name="action_logout">登出</string>
     <string name="action_logout_confirm">確定要登出 %1$s 嗎？</string>
@@ -133,7 +133,7 @@
     <string name="status_sent_long">成功送出回覆</string>
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什麼新鮮事？</string>
-    <string name="hint_content_warning">設定敏感內容警告</string>
+    <string name="hint_content_warning">敏感內容警告</string>
     <string name="hint_display_name">暱稱</string>
     <string name="hint_note">簡介</string>
     <string name="hint_search">搜尋…</string>
@@ -143,7 +143,7 @@
     <string name="label_header">標題</string>
     <string name="link_whats_an_instance">什麼是站點？</string>
     <string name="login_connection">正在連線…</string>
-    <string name="dialog_whats_an_instance">"請輸入你帳號所在的 Mastodon 站點的域名或地址 "</string>
+    <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
@@ -155,7 +155,7 @@
     <string name="visibility_unlisted">不公開：所有人可見，但不會出現在公開時間軸上</string>
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
-    <string name="pref_title_edit_notification_settings">通知設定</string>
+    <string name="pref_title_edit_notification_settings">通知</string>
     <string name="pref_title_notifications_enabled">通知</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知鈴聲</string>
@@ -292,7 +292,7 @@
     <string name="send_toot_notification_channel_name">嘟文發送中</string>
     <string name="send_toot_notification_cancel_title">發送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已儲存為草稿</string>
-    <string name="action_compose_shortcut">撰寫嘟文</string>
+    <string name="action_compose_shortcut">新嘟文</string>
     <string name="error_no_custom_emojis">當前站點 %s 沒有自訂表情符號</string>
     <string name="copy_to_clipboard_success">已複製到剪貼簿</string>
     <string name="emoji_style">表情符號風格</string>
@@ -402,4 +402,5 @@
     <string name="edit_poll">編輯</string>
     <string name="hashtags">話題</string>
     <string name="notification_follow_request_name">關注請求</string>
+    <string name="action_edit">編輯</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index 4fb27d248..151d3edca 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -30,7 +30,7 @@
     <string name="title_statuses_with_replies">嘟文和回覆</string>
     <string name="title_statuses_pinned">已置頂</string>
     <string name="title_follows">正在關注</string>
-    <string name="title_followers">僅關注者</string>
+    <string name="title_followers">關注者</string>
     <string name="title_favourites">我的收藏</string>
     <string name="title_mutes">被靜音的使用者</string>
     <string name="title_blocks">被封鎖的使用者</string>
@@ -61,7 +61,7 @@
     <string name="action_favourite">收藏</string>
     <string name="action_unfavourite">取消收藏</string>
     <string name="action_more">更多</string>
-    <string name="action_compose">發表新嘟文</string>
+    <string name="action_compose">新嘟文</string>
     <string name="action_login">登入 Mastodon 帳號</string>
     <string name="action_logout">登出</string>
     <string name="action_logout_confirm">確定要登出 %1$s 嗎？</string>
@@ -129,7 +129,7 @@
     <string name="confirmation_reported">已發送！</string>
     <string name="confirmation_unblocked">已解除封鎖</string>
     <string name="confirmation_unmuted">已解除靜音</string>
-    <string name="status_sent">已發送！</string>
+    <string name="status_sent">已檢舉！</string>
     <string name="status_sent_long">成功送出回覆</string>
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什麼新鮮事？</string>
@@ -359,7 +359,7 @@
     <string name="description_visiblity_unlisted">
         不公開
     </string>
-    <string name="description_visiblity_private">僅關注者</string>
+    <string name="description_visiblity_private">關注者</string>
     <string name="description_visiblity_direct">
         私信
     </string>
@@ -369,7 +369,7 @@
     <string name="notifications_apply_filter">分類</string>
     <string name="filter_apply">應用</string>
     <string name="compose_shortcut_long_label">發表新嘟文</string>
-    <string name="compose_shortcut_short_label">新嘟文</string>
+    <string name="compose_shortcut_short_label">發表新嘟文</string>
     <string name="pref_title_bot_overlay">顯示機器人標誌</string>
     <string name="notification_clear_text">你確定要永久清空通知列表嗎？</string>
     <string name="poll_info_format">
@@ -400,4 +400,5 @@
     <string name="notification_follow_request_name">關注請求</string>
     <string name="hashtags">話題</string>
     <string name="edit_poll">編輯</string>
+    <string name="action_edit">編輯</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index f65688d26..14ffd697f 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -20,7 +20,7 @@
     <string name="error_media_upload_sending">媒体文件上传失败</string>
     <string name="error_sender_account_gone">嘟文发送时出错</string>
     <string name="title_home">主页</string>
-    <string name="title_notifications">通知设置</string>
+    <string name="title_notifications">通知</string>
     <string name="title_public_local">本站时间轴</string>
     <string name="title_public_federated">跨站公共时间轴</string>
     <string name="title_direct_messages">私信</string>
@@ -129,7 +129,7 @@
     <string name="confirmation_reported">报告已发送！</string>
     <string name="confirmation_unblocked">已解除屏蔽</string>
     <string name="confirmation_unmuted">已取消隐藏</string>
-    <string name="status_sent">报告已发送！</string>
+    <string name="status_sent">已发送！</string>
     <string name="status_sent_long">成功发布回复</string>
     <string name="hint_domain">域名</string>
     <string name="hint_compose">有什么新鲜事？</string>
@@ -159,7 +159,7 @@
     <string name="visibility_private">仅关注者：只有经过你确认后关注你的用户可见</string>
     <string name="visibility_direct">私信：只有被提及的用户可见</string>
     <string name="pref_title_edit_notification_settings">通知设置</string>
-    <string name="pref_title_notifications_enabled">通知设置</string>
+    <string name="pref_title_notifications_enabled">通知</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知铃声</string>
     <string name="pref_title_notification_alert_vibrate">振动</string>
@@ -404,4 +404,5 @@
     <string name="hashtags">话题</string>
     <string name="action_edit">编辑</string>
     <string name="edit_poll">编辑</string>
+    <string name="notification_follow_request_name">关注请求</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a6b68854e..d0224a949 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -30,7 +30,7 @@
     <string name="title_statuses_with_replies">嘟文和回覆</string>
     <string name="title_statuses_pinned">已置頂</string>
     <string name="title_follows">正在關注</string>
-    <string name="title_followers">僅關注者</string>
+    <string name="title_followers">關注者</string>
     <string name="title_favourites">我的收藏</string>
     <string name="title_mutes">被靜音的使用者</string>
     <string name="title_blocks">被封鎖的使用者</string>
@@ -143,7 +143,7 @@
     <string name="label_header">標題</string>
     <string name="link_whats_an_instance">什麼是站點？</string>
     <string name="login_connection">正在連線…</string>
-    <string name="dialog_whats_an_instance">"請輸入你帳號所在的 Mastodon 站點的域名或地址 "</string>
+    <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>
     <string name="dialog_message_uploading_media">正在上傳…</string>
     <string name="dialog_download_image">下載</string>
@@ -156,7 +156,7 @@
     <string name="visibility_private">僅關注者：只有經過你確認後關注你的使用者可見</string>
     <string name="visibility_direct">私信：只有被提及的使用者可見</string>
     <string name="pref_title_edit_notification_settings">通知設定</string>
-    <string name="pref_title_notifications_enabled">通知設定</string>
+    <string name="pref_title_notifications_enabled">通知</string>
     <string name="pref_title_notification_alerts">提醒</string>
     <string name="pref_title_notification_alert_sound">通知鈴聲</string>
     <string name="pref_title_notification_alert_vibrate">振動</string>
@@ -292,7 +292,7 @@
     <string name="send_toot_notification_channel_name">嘟文發送中</string>
     <string name="send_toot_notification_cancel_title">發送已被取消</string>
     <string name="send_toot_notification_saved_content">嘟文已儲存為草稿</string>
-    <string name="action_compose_shortcut">撰寫嘟文</string>
+    <string name="action_compose_shortcut">發表新嘟文</string>
     <string name="error_no_custom_emojis">當前站點 %s 沒有自訂表情符號</string>
     <string name="copy_to_clipboard_success">已複製到剪貼簿</string>
     <string name="emoji_style">表情符號風格</string>
@@ -407,7 +407,7 @@
     <string name="mute_domain_warning_dialog_ok">隱藏整個域名</string>
     <string name="pref_title_animate_gif_avatars">GIF 動畫大頭貼</string>
     <string name="about_tusky_version">Tusky %s</string>
-    <string name="filter_dialog_whole_word">整個文字</string>
+    <string name="filter_dialog_whole_word">整個單詞</string>
     <string name="filter_dialog_whole_word_description">如果關鍵字或短語僅為字母或數字，則只有在匹配整個單詞時才會應用</string>
     <string name="caption_notoemoji">Google 正在使用的 Emoji 符號集</string>
     <string name="description_poll">使用以下選項創建投票：%1$s, %2$s, %3$s, %4$s; %5$s</string>
@@ -426,4 +426,5 @@
     <string name="hashtags">話題</string>
     <string name="notification_follow_request_name">關注請求</string>
     <string name="edit_poll">編輯</string>
+    <string name="action_edit">編輯</string>
 </resources>
\ No newline at end of file