diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5331df2b9..4089804b2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,7 +10,7 @@
     <string name="error_authorization_denied">Autorisierung fehlgeschlagen.</string>
     <string name="error_retrieving_oauth_token">Es konnte kein Login-Token abgerufen werden.</string>
     <string name="error_compose_character_limit">Der Beitrag ist zu lang!</string>
-    <string name="error_image_upload_size">Die Datei muss kleiner als 8 MB sein.</string>
+    <string name="error_image_upload_size">Die Datei muss kleiner als 8MB sein.</string>
     <string name="error_video_upload_size">Videodateien müssen kleiner als 40 MB sein.</string>
     <string name="error_media_upload_type">Dieser Dateityp darf nicht hochgeladen werden.</string>
     <string name="error_media_upload_opening">Die Datei konnte nicht geöffnet werden.</string>
@@ -18,7 +18,7 @@
     <string name="error_media_download_permission">Eine Berechtigung wird zum Speichern des Mediums benötigt.</string>
     <string name="error_media_upload_image_or_video">Bilder und Videos können nicht beide gleichzeitig an einen Beitrag angehängt werden.</string>
     <string name="error_media_upload_sending">Die Mediendatei konnte nicht hochgeladen werden.</string>
-    <string name="error_sender_account_gone">Fehler beim Senden des Beitrags.</string>
+    <string name="error_sender_account_gone">Fehler beim Senden des Status</string>
     <string name="title_home">Start</string>
     <string name="title_notifications">Benachrichtigungseinstellungen</string>
     <string name="title_public_local">Lokal</string>
@@ -61,10 +61,10 @@
     <string name="action_favourite">Favorisieren</string>
     <string name="action_unfavourite">Favoriten entfernen</string>
     <string name="action_more">Mehr</string>
-    <string name="action_compose">Schreiben</string>
+    <string name="action_compose">Beitrag erstellen</string>
     <string name="action_login">Anmelden mit Mastodon</string>
-    <string name="action_logout">Abmelden</string>
-    <string name="action_logout_confirm">Bist du sicher, dass du dich aus dem Konto %1$s abmelden möchtest\?</string>
+    <string name="action_logout">Ausloggen</string>
+    <string name="action_logout_confirm">Bist du sicher, dass du dich aus dem Konto %1$s ausloggen möchtest\?</string>
     <string name="action_follow">Folgen</string>
     <string name="action_unfollow">Entfolgen</string>
     <string name="action_block">Blockieren</string>
@@ -83,7 +83,7 @@
     <string name="action_view_favourites">Favoriten</string>
     <string name="action_view_mutes">Stummgeschaltete Profile</string>
     <string name="action_view_blocks">Blockierte Profile</string>
-    <string name="action_view_follow_requests">Folgeanfrage</string>
+    <string name="action_view_follow_requests">Folgeanfragen</string>
     <string name="action_view_media">Medien</string>
     <string name="action_open_in_web">Im Browser öffnen</string>
     <string name="action_add_media">Füge Medien hinzu</string>
@@ -92,7 +92,7 @@
     <string name="action_mute">Stummschalten</string>
     <string name="action_unmute">Lautschalten</string>
     <string name="action_mention">Erwähnen</string>
-    <string name="action_hide_media">Medien verstecken</string>
+    <string name="action_hide_media">Verstecke Medien</string>
     <string name="action_open_drawer">Drawer öffnen</string>
     <string name="action_save">Speichern</string>
     <string name="action_edit_profile">Profil bearbeiten</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>
@@ -149,7 +149,7 @@
         \n\nWeitere Informationen gibt es auf <a href="https://joinmastodon.org">joinmastodon.org</a>.
     </string>
     <string name="dialog_title_finishing_media_upload">Stelle Medienupload fertig</string>
-    <string name="dialog_message_uploading_media">Lade hoch …</string>
+    <string name="dialog_message_uploading_media">Lade hoch…</string>
     <string name="dialog_download_image">Herunterladen</string>
     <string name="dialog_message_cancel_follow_request">Folgeanfrage zurückziehen?</string>
     <string name="dialog_unfollow_warning">Willst du diesem Profil wirklich nicht mehr folgen?</string>
@@ -158,8 +158,8 @@
     <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_notifications_enabled">Benachrichtigungen</string>
+    <string name="pref_title_edit_notification_settings">Benachrichtigungen</string>
+    <string name="pref_title_notifications_enabled">Benachrichtigungseinstellungen</string>
     <string name="pref_title_notification_alerts">Benachrichtigungen</string>
     <string name="pref_title_notification_alert_sound">Benachrichtige mit Sound</string>
     <string name="pref_title_notification_alert_vibrate">Benachrichtige mit Vibration</string>
@@ -208,10 +208,10 @@
     <string name="notification_mention_name">Neue Erwähnungen</string>
     <string name="notification_mention_descriptions">Benachrichtigungen über neue Erwähnungen</string>
     <string name="notification_follow_name">Neue Folgende</string>
-    <string name="notification_follow_description">Benachrichtigunen über neue Folgende</string>
+    <string name="notification_follow_description">Benachrichtigungen über neue Folgende</string>
     <string name="notification_boost_name">Geteilte Beiträge</string>
     <string name="notification_boost_description">Benachrichtigungen wenn deine Beiträge geteilt werden</string>
-    <string name="notification_favourite_name">Favorisierte Beiträge</string>
+    <string name="notification_favourite_name">Favoriten</string>
     <string name="notification_favourite_description">Benachrichtigungen wenn deine Beiträge favorisiert werden</string>
     <string name="notification_mention_format">%s hat dich erwähnt</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s und %4$d andere</string>
@@ -263,12 +263,12 @@
     <string name="error_failed_set_caption">Fehler beim Speichern der Beschreibung</string>
     <string name="hint_describe_for_visually_impaired">Für Menschen mit Sehbehinderung beschreiben\n(%d Zeichen)</string>
     <string name="action_set_caption">Beschreibung eingeben</string>
-    <string name="action_remove">entfernen</string>
+    <string name="action_remove">Entfernen</string>
     <string name="lock_account_label">Gesperrtes Profil</string>
     <string name="lock_account_label_description">Wer dir folgen möchte, muss um deine Erlaubnis bitten</string>
     <string name="compose_save_draft">Entwurf speichern?</string>
     <string name="send_toot_notification_title">Beitrag senden…</string>
-    <string name="send_toot_notification_error_title">Fehler beim senden</string>
+    <string name="send_toot_notification_error_title">Fehler beim Senden</string>
     <string name="send_toot_notification_channel_name">Beiträge senden</string>
     <string name="send_toot_notification_cancel_title">Senden abgebrochen</string>
     <string name="send_toot_notification_saved_content">Eine Kopie des Beitrags wurde in deine Entwürfe gespeichert</string>
@@ -314,7 +314,7 @@
     <string name="description_status_media_no_description_placeholder">        Keine Beschreibung    </string>
     <string name="description_status_favourited">Favorisiert    </string>
     <string name="description_visiblity_public">Öffentlich    </string>
-    <string name="description_visiblity_private">Follower</string>
+    <string name="description_visiblity_private">Folgende</string>
     <string name="description_visiblity_direct">Direkt    </string>
     <string name="hint_list_name">Name auflisten</string>
     <string name="download_media">Medien herunterladen</string>
@@ -338,7 +338,7 @@
     <string name="description_status_reblogged">Geteilt</string>
     <string name="description_visiblity_unlisted">Ungelistet</string>
     <string name="action_delete_and_redraft">Löschen und neu erstellen</string>
-    <string name="dialog_redraft_toot_warning">Bist du dir sicher, dass du diesen Beitrag löschen und neu machen möchtest\?</string>
+    <string name="dialog_redraft_toot_warning">Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest\?</string>
     <string name="pref_title_notification_filter_poll">Umfragen beendet sind</string>
     <string name="notification_poll_name">Umfragen</string>
     <string name="notification_poll_description">Benachrichtigungen über beendete Umfragen</string>
@@ -349,7 +349,7 @@
     <string name="compose_shortcut_short_label">Beitrag erstellen</string>
     <string name="pref_title_bot_overlay">Bot-Hinweis anzeigen</string>
     <string name="notification_clear_text">Bist du dir sicher, dass du alle deine Benachrichtigungen dauerhaft löschen möchtest\?</string>
-    <string name="poll_info_format"> <!-- 15 votes • 1 hour left --> %1$s • %2$s</string>
+    <string name="poll_info_format">" %1$s • %2$s"</string>
     <plurals name="poll_info_votes">
         <item quantity="one">%s Stimme</item>
         <item quantity="other">%s Stimmen</item>
@@ -404,7 +404,7 @@
     <string name="poll_duration_3_days">3 Tage</string>
     <string name="poll_duration_7_days">7 Tage</string>
     <string name="edit_poll">Editieren</string>
-    <string name="about_tusky_version">test %s</string>
+    <string name="about_tusky_version">Tusky %s</string>
     <string name="action_add_poll">Umfrage hinzufügen</string>
     <string name="pref_title_alway_open_spoiler">Beiträge mit Inhaltswarnungen immer ausklappen</string>
     <string name="description_poll">Umfrage mit den Möglichkeiten: %1$s, %2$s, %3$s, %4$s; %5$s</string>
@@ -420,7 +420,7 @@
     <string name="action_access_scheduled_toot">Geplante Beiträge</string>
     <string name="action_schedule_toot">Plane Beitrag</string>
     <string name="action_reset_schedule">Zurücksetzen</string>
-    <string name="error_audio_upload_size">Audiodateien müssen kleiner als 40 MB sein.</string>
+    <string name="error_audio_upload_size">Audiodateien müssen kleiner als 40MB sein.</string>
     <string name="title_bookmarks">Lesezeichen</string>
     <string name="action_bookmark">Lesezeichen</string>
     <string name="action_view_bookmarks">Lesezeichen</string>
@@ -434,7 +434,7 @@
     <string name="warning_scheduling_interval">Das Datum des geplanten Toots muss mindestens 5 Minuten in der Zukunft liegen.</string>
     <string name="notification_follow_request_description">Benachrichtigungen über neue Folgeanfragen</string>
     <string name="pref_title_notification_filter_follow_requests">Neue Folgeanfragen</string>
-    <string name="notification_follow_request_name">Folgeanfrage</string>
+    <string name="notification_follow_request_name">Folgeanfragen</string>
     <string name="dialog_mute_warning">Bist du dir sicher, dass du @%s stummschalten möchtest\?</string>
     <string name="dialog_block_warning">Bist du dir sicher, dass du @%s blockieren möchtest\?</string>
     <string name="action_unmute_conversation">Stummschaltung der Konversation aufheben</string>
@@ -453,8 +453,8 @@
     <string name="abbreviated_seconds_ago">%dS</string>
     <string name="abbreviated_hours_ago">%dS</string>
     <string name="abbreviated_years_ago">%dJ</string>
-    <string name="abbreviated_in_days">in %d T.</string>
-    <string name="abbreviated_in_years">in %d J.</string>
+    <string name="abbreviated_in_days">in %d T.</string>
+    <string name="abbreviated_in_years">in %d J.</string>
     <string name="abbreviated_minutes_ago">%d Min.</string>
     <string name="abbreviated_days_ago">%d T.</string>
     <string name="abbreviated_in_seconds">in %d Sek.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1a3a62669..1f9aefdaf 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -347,8 +347,8 @@
     </plurals>
     <string name="poll_info_format"> <!-- 15 votos • queda 1 hora --> %1$s • %2$s</string>
     <plurals name="poll_info_votes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%s voto</item>
+        <item quantity="other">%s votos</item>
     </plurals>
     <string name="poll_info_closed">cerrada</string>
     <string name="action_delete_and_redraft">Eliminar y editar</string>
@@ -439,9 +439,9 @@
     <string name="action_reset_schedule">Reiniciar</string>
     <string name="post_lookup_error_format">Error al buscar el post %s</string>
     <string name="about_powered_by_tusky">Potenciado por Tusky</string>
-    <string name="title_bookmarks">Favoritos</string>
+    <string name="title_bookmarks">Marcadores</string>
     <string name="action_bookmark">Marcador</string>
-    <string name="action_view_bookmarks">Favoritos</string>
+    <string name="action_view_bookmarks">Marcadores</string>
     <string name="description_status_bookmarked">Marcado como favorito</string>
     <string name="select_list_title">Seleccionar lista</string>
     <string name="list">Lista</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 739194982..e59da2513 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -400,8 +400,8 @@
         <item quantity="other">%d ordu</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">Minutu %d</item>
+        <item quantity="other">%d minutu</item>
     </plurals>
     <plurals name="poll_timespan_seconds">
         <item quantity="one">Segundu %d</item>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index d7436adf8..0089cf98f 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -373,7 +373,7 @@
     <string name="compose_preview_image_description">کنش‌ها برای تصاویر</string>
     <plurals name="poll_info_votes">
         <item quantity="one">%s رای</item>
-        <item quantity="other">%s رای</item>
+        <item quantity="other"></item>
     </plurals>
     <string name="poll_info_time_relative">%s باقی مانده</string>
     <string name="poll_info_time_absolute">پایان یافته در %s</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5046aa330..fd0d6f6db 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -373,8 +373,8 @@
     <string name="action_delete_and_redraft">Effacer et ré-écrire</string>
     <string name="dialog_redraft_toot_warning">Effacer et ré-écrire ce pouet \?</string>
     <plurals name="poll_info_votes">
-        <item quantity="one">%s vote</item>
-        <item quantity="other">%s votes</item>
+        <item quantity="one"/>
+        <item quantity="other"/>
     </plurals>
     <string name="poll_info_time_relative">%s restant</string>
     <string name="poll_info_time_absolute">Termina à %s</string>
@@ -385,12 +385,12 @@
     <string name="notification_poll_description">Notifications pour les sondages terminés</string>
     <string name="poll_ended_created">Un sondage que vous avez créé est terminé</string>
     <plurals name="poll_timespan_days">
-        <item quantity="one">%s jour</item>
-        <item quantity="other">%s jours</item>
+        <item quantity="one">%d jour</item>
+        <item quantity="other">%d jours</item>
     </plurals>
     <plurals name="poll_timespan_hours">
-        <item quantity="one">%s heure</item>
-        <item quantity="other">%s heures</item>
+        <item quantity="one">%d heure</item>
+        <item quantity="other">%d heures</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
         <item quantity="one">%d minute</item>
@@ -464,8 +464,8 @@
     <string name="pref_title_show_cards_in_timelines">Afficher des aperçus des liens dans les fils</string>
     <string name="notification_follow_request_format">%s a demandé à vous suivre</string>
     <plurals name="poll_info_people">
-        <item quantity="one">%s personne</item>
-        <item quantity="other">%s personnes</item>
+        <item quantity="one"/>
+        <item quantity="other"/>
     </plurals>
     <string name="notification_follow_request_description">Notifications à propos des demandes d’abonnement</string>
     <string name="pref_title_notification_filter_follow_requests">Demande d’abonnement</string>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index 4b8e53634..4f38430ec 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -49,4 +49,6 @@
     <string name="pref_title_show_boosts">Seall boosts</string>
     <string name="action_open_reblogged_by">Seall boosts</string>
     <string name="action_access_saved_toot">Dreachdan</string>
+    <string name="action_view_favourites">Prìomhaich</string>
+    <string name="pref_title_notifications_enabled">Fiosan</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 2238747eb..20536a03c 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -432,8 +432,8 @@
     <string name="notification_follow_request_name">Fylgjendabeiðnir</string>
     <string name="hashtags">Myllumerki</string>
     <plurals name="favs">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
+        <item quantity="one"><b>%1$s</b> Eftirlæti</item>
+        <item quantity="other"><b>%1$s</b> Eftirlæti</item>
     </plurals>
     <plurals name="reblogs">
         <item quantity="one"><b>%s</b> Endurbirting</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 94d1cd122..6a881e0b1 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -368,8 +368,8 @@
     <string name="action_delete_and_redraft">Cancella e riscrivi</string>
     <string name="dialog_redraft_toot_warning">Cancellare e riscrivere questo toot\?</string>
     <plurals name="poll_info_votes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%s voto</item>
+        <item quantity="other">%s voti</item>
     </plurals>
     <string name="poll_info_time_relative">%s rimasti</string>
     <string name="poll_info_time_absolute">termina alle %s</string>
@@ -464,4 +464,5 @@
     <string name="notification_follow_request_format">%s ha chiesto di seguirti</string>
     <string name="error_audio_upload_size">La dimensione dei file audio deve essere inferiore a 40 MB.</string>
     <string name="action_unmute_desc">Smetti di silenziare %s</string>
+    <string name="notification_follow_request_name">Richieste di seguirti</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 225156000..d4bac917e 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -274,4 +274,5 @@
     <string name="title_scheduled_toot">Tijewwiqin yettwasɣawsen</string>
     <string name="pref_title_show_boosts">Sken-d beṭuyat</string>
     <string name="hashtags">Ihacṭagen</string>
+    <string name="notification_follow_request_name">Isuturen n teḍfeṛt</string>
 </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 926eaf9ec..4e5f45aad 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="action_login">മസ്റ്റഡോൺ വഴി പ്രവേശിക്കുക</string>
     <string name="link_whats_an_instance">എന്താണ് ഒരു ഇൻസ്റ്റൻസ്\?</string>
-    <string name="title_favourites">ഇഷ്ടപ്പെട്ടത്</string>
+    <string name="title_favourites">പ്രിയപ്പെട്ടവ</string>
     <string name="title_saved_toot">കരടുകൾ</string>
     <string name="action_logout">പുറത്തിറങ്ങുക</string>
     <string name="action_view_preferences">മുൻഗണനകൾ</string>
@@ -22,8 +22,8 @@
     <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_video_upload_size">ചലച്ചിത്ര ഫയലുകൾ 40 എംബിയേക്കാളും ചെറുതായിരിക്കണം.</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>
     <string name="error_media_upload_permission">മീഡിയ വായിക്കുവാനുള്ള അനുമതി ആവശ്യമാണ്.</string>
@@ -45,7 +45,7 @@
     <string name="title_followers">പിന്തുടരുന്നവർ</string>
     <string name="title_mutes">നിശ്ശബ്ദരാക്കിയ ഉപയോക്താക്കൾ</string>
     <string name="title_blocks">തടയപ്പെട്ട ഉപയോക്താക്കൾ</string>
-    <string name="title_follow_requests">പിന്തുടാനുള്ള അപേക്ഷകൾ</string>
+    <string name="title_follow_requests">പിന്തുടാരാനുള്ള അപേക്ഷകൾ</string>
     <string name="title_edit_profile">പ്രൊഫൈൽ തിരുത്തുക</string>
     <string name="action_reply">മറുപടി</string>
     <string name="action_reblog">ബൂസ്റ്റ്</string>
@@ -70,7 +70,7 @@
     <string name="status_sensitive_media_title">സെൻസിറ്റീവ് ഉള്ളടക്കം</string>
     <string name="title_licenses">അനുവാദം</string>
     <string name="title_scheduled_toot">മുന്‍നിശ്ചയിച്ച ടൂറ്റ്‌സ്</string>
-    <string name="title_bookmarks">ബൂക്കമാർക്ക്</string>
+    <string name="title_bookmarks">ബുക് മാർക്ക്</string>
     <string name="action_reset_schedule">പുനഃക്രമീകരിക്കുക</string>
     <string name="action_open_in_web">ബ്രൗസറിൽ തുറക്കുക</string>
     <string name="action_view_media">മാധ്യമം</string>
@@ -97,7 +97,15 @@
     <string name="report_comment_hint">കൂടുതൽ പറയാൻ ഉണ്ടോ\?</string>
     <string name="report_username_format">അറിയിക്കുക @%s</string>
     <string name="notification_follow_format">%s നിങ്ങളെ പിന്തുടരുന്നു</string>
-    <string name="notification_favourite_name">ഇഷ്ടപ്പെട്ടത്</string>
+    <string name="notification_favourite_name">പ്രിയപ്പെട്ടവ</string>
     <string name="title_media">മാധ്യമം</string>
     <string name="action_open_reblogged_by">ബൂട്ട്‌സ് കാണിക്കുക</string>
+    <string name="edit_poll">തിരുത്ത്</string>
+    <string name="compose_shortcut_short_label">എഴുതുക</string>
+    <string name="action_compose_shortcut">എഴുതുക</string>
+    <string name="notification_follow_request_name">പിന്തുടാനുള്ള അപേക്ഷകൾ</string>
+    <string name="pref_title_show_boosts">ബൂട്ട്‌സ് കാണിക്കുക</string>
+    <string name="action_access_scheduled_toot">മുന്‍നിശ്ചയിച്ച ടൂറ്റ്‌സ്</string>
+    <string name="action_access_saved_toot">കരടുകൾ</string>
+    <string name="action_edit_own_profile">തിരുത്ത്</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index edaa942c6..3b0898f26 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -391,16 +391,16 @@
     <string name="description_poll">Poll met keuzes: %s, %s, %s, %s; %s</string>
     <string name="compose_preview_image_description">Acties voor afbeelding %s</string>
     <plurals name="poll_timespan_days">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d dag</item>
+        <item quantity="other">%d dagen</item>
     </plurals>
     <plurals name="poll_timespan_hours">
         <item quantity="one">%d uur</item>
         <item quantity="other">%d uur</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d minuut</item>
+        <item quantity="other">%d minuten</item>
     </plurals>
     <plurals name="poll_timespan_seconds">
         <item quantity="one"/>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index da3269ce2..c52203f3f 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -377,16 +377,16 @@
     <string name="poll_ended_voted">Un sondatge ont avètz votat es acabat</string>
     <string name="poll_ended_created">Un sondatge qu’avètz creat es acabat</string>
     <plurals name="poll_timespan_days">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d jorn</item>
+        <item quantity="other">%d jorns</item>
     </plurals>
     <plurals name="poll_timespan_hours">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d ora</item>
+        <item quantity="other">%d oras</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d minuta</item>
+        <item quantity="other">%d minutas</item>
     </plurals>
     <plurals name="poll_timespan_seconds">
         <item quantity="one"/>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8d37c16e7..8303a4869 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="error_generic">Wystąpił błąd.</string>
     <string name="error_empty">To nie może pozostać puste.</string>
-    <string name="error_invalid_domain">Wprowadzono nieprawidłową domenę.</string>
+    <string name="error_invalid_domain">Wprowadzono nieprawidłową domenę</string>
     <string name="error_failed_app_registration">Nie udało się uwierzytelnić z tą instancją.</string>
     <string name="error_no_web_browser_found">Nie znaleziono przeglądarki internetowej.</string>
     <string name="error_authorization_unknown">Wystąpił nieokreślony błąd podczas próby autoryzacji.</string>
@@ -34,7 +34,7 @@
     <string name="title_saved_toot">Szkice</string>
     <string name="title_licenses">Licencje</string>
     <string name="status_boosted_format">%s podbił</string>
-    <string name="status_sensitive_media_title"><b>Wrażliwe treści</b>\nDotknij, aby wyświetlić</string>
+    <string name="status_sensitive_media_title">Wrażliwe treści</string>
     <string name="status_media_hidden_title">Ukryto zawartość multimedialną</string>
     <string name="status_sensitive_media_directions">Naciśnij, aby wyświetlić</string>
     <string name="status_content_warning_show_more">Pokaż więcej</string>
@@ -114,15 +114,13 @@
     <string name="label_header">Nagłówek</string>
     <string name="link_whats_an_instance">Czym jest instancja?</string>
     <string name="login_connection">Łączenie…</string>
-    <string name="dialog_whats_an_instance">Tutaj można wprowadzić domenę lub adres instancji,
-        np. mastodon.social, icosahedron.website, social.tchncs.de, i
-        <a href="https://instances.social">wiele więcej!</a>
-        \n\nJeżeli nie posiadasz jeszcze konta, wprowadź tu nazwę instancji, na której chcesz się zarejestrować.
-        Instancja jest miejscem, na którym znajduje się twoje konto,
-        lecz komunikując się z innymi serwerami, działa tak,
-        jakby były jednym portalem.
-        Więcej informacji można znaleźć na <a href="https://joinmastodon.org">joinmastodon.org</a>.
-    </string>
+    <string name="dialog_whats_an_instance">Tutaj można wprowadzić domenę lub adres instancji, np. mastodon.social, icosahedron.website, social.tchncs.de, i <a href="https://instances.social">wiele więcej!</a> 
+\n
+\nJeżeli nie posiadasz jeszcze konta, wprowadź tu nazwę instancji, na której chcesz się zarejestrować.
+\n
+\nInstancja jest miejscem, na którym znajduje się twoje konto, lecz komunikując się z innymi serwerami, działa tak, jakby były jednym portalem.
+\n
+\nWięcej informacji można znaleźć na <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
     <string name="dialog_title_finishing_media_upload">Kończenie wysyłania treści</string>
     <string name="dialog_message_uploading_media">Wysyłanie…</string>
     <string name="dialog_download_image">Pobierz</string>
@@ -265,7 +263,7 @@
     <string name="profile_metadata_add">dodaj dane</string>
     <string name="profile_metadata_label_label">Nazwa</string>
     <string name="profile_metadata_content_label">Zawartość</string>
-    <string name="error_network">Problem z łącznością. Sprawdź swoje połączenie internetowe i spróbuj ponownie.</string>
+    <string name="error_network">Wystąpił problem z łącznością! Sprawdź swoje połączenie internetowe i spróbuj ponownie!</string>
     <string name="error_video_upload_size">Pliki wideo muszą być mniejsze niż 40MB.</string>
     <string name="title_direct_messages">Wiadomości bezpośrednie</string>
     <string name="title_statuses_pinned">Przypięte</string>
@@ -316,7 +314,7 @@
     <string name="notification_poll_name">Ankiety</string>
     <string name="notification_poll_description">Powiadomienia o głosowaniach, które zostały zakończone</string>
     <string name="about_tusky_version">Tusky %s</string>
-    <string name="pref_title_alway_open_spoiler">Nie ukrywaj zawartości multimedialnej oznaczonej jako wrażliwa</string>
+    <string name="pref_title_alway_open_spoiler">Zawsze rozwijaj wpisy z ostrzeżeniami o zawartości</string>
     <string name="pref_title_public_filter_keywords">Publiczne osi czasu</string>
     <string name="pref_title_thread_filter_keywords">Konwersacje</string>
     <string name="filter_addition_dialog_title">Dodaj filtr</string>
@@ -347,10 +345,10 @@
     <string name="unpin_action">Odepnij z profilu</string>
     <string name="pin_action">Przypnij do profilu</string>
     <plurals name="favs">
-        <item quantity="one"/>
-        <item quantity="few"/>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="one"><b>%1$s</b> polubienie</item>
+        <item quantity="few"><b>%1$s</b> polubienia</item>
+        <item quantity="many"><b>%1$s</b> polubień</item>
+        <item quantity="other"><b>%1$s</b> polubień</item>
     </plurals>
     <plurals name="reblogs">
         <item quantity="one">&lt;b&gt;%s&lt;/b&gt; podbicie</item>
@@ -385,9 +383,9 @@
     <string name="poll_info_format"> <!-- 15 votes • 1 hour left --> %1$s • %2$s</string>
     <plurals name="poll_info_votes">
         <item quantity="one">%s głos</item>
-        <item quantity="few">%s głos</item>
-        <item quantity="many">%s głos</item>
-        <item quantity="other">%s głos</item>
+        <item quantity="few">%s głosy</item>
+        <item quantity="many">%s głosów</item>
+        <item quantity="other">%s głosów</item>
     </plurals>
     <string name="poll_info_time_relative">Zostało %s</string>
     <string name="poll_info_time_absolute">kończy się %s</string>
@@ -397,21 +395,21 @@
     <string name="poll_ended_created">Ankieta, którą stworzyłeś(aś), zakończyła się</string>
     <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>
-    </plurals>
-    <plurals name="poll_timespan_hours">
-        <item quantity="one">%d godzina</item>
         <item quantity="few"></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>
+    </plurals>
     <plurals name="poll_timespan_minutes">
         <item quantity="one">%d minuta</item>
-        <item quantity="few">%d minuty</item>
-        <item quantity="many">%d minuty</item>
-        <item quantity="other">%d minuty</item>
+        <item quantity="few"></item>
+        <item quantity="many"></item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="poll_timespan_seconds">
         <item quantity="one">%d sekunda</item>
@@ -475,4 +473,13 @@
         <item quantity="other">%s osób</item>
     </plurals>
     <string name="hashtags">Hashtagi</string>
+    <string name="pref_title_show_cards_in_timelines">Pokazuj podglądy linków na osiach czasu</string>
+    <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>
+    <string name="pref_main_nav_position_option_top">Góra</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 65bf36eae..68c278706 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -122,4 +122,14 @@
     <string name="post_privacy_public">Verejný</string>
     <string name="action_view_bookmarks">Záložky</string>
     <string name="notification_summary_small">%1$s a %2$s</string>
+    <string name="edit_poll">Upraviť</string>
+    <string name="hashtags">Hashtagy</string>
+    <string name="action_access_saved_toot">Koncepty</string>
+    <string name="action_edit_own_profile">Upraviť</string>
+    <string name="pref_title_notifications_enabled">Oznámenia</string>
+    <string name="pref_title_edit_notification_settings">Oznámenia</string>
+    <string name="action_view_favourites">Obľúbené</string>
+    <string name="filter_dialog_remove_button">Odstrániť</string>
+    <string name="notification_favourite_name">Obľúbené</string>
+    <string name="pref_title_status_tabs">Panely</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index f7fe6114b..7676f18c2 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -441,4 +441,6 @@
         <item quantity="few"/>
         <item quantity="other"/>
     </plurals>
+    <string name="hashtags">Ključniki</string>
+    <string name="notification_follow_request_name">Zahteve za Sledenje</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 eb1b9ed1f..b3242252e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -45,8 +45,8 @@
     <string name="hint_search">Пошук…</string>
     <string name="hint_note">Про себе</string>
     <string name="hint_compose">Що відбувається\?</string>
-    <string name="status_sent">Надіслано!</string>
-    <string name="confirmation_reported">Надіслати!</string>
+    <string name="status_sent">Надіслати!</string>
+    <string name="confirmation_reported">Надіслано!</string>
     <string name="action_share_as">Поділитися як …</string>
     <string name="action_open_as">Відкрити як %s</string>
     <string name="action_copy_link">Копіювати посилання</string>
@@ -62,7 +62,7 @@
     <string name="action_reject">Відмовити</string>
     <string name="action_accept">Прийняти</string>
     <string name="action_undo">Скасувати</string>
-    <string name="action_edit_own_profile">Редагувати</string>
+    <string name="action_edit_own_profile">Змінити</string>
     <string name="action_save">Зберегти</string>
     <string name="action_mention">Згадати</string>
     <string name="action_mute_domain">Заглушити %s</string>
@@ -110,4 +110,10 @@
     <string name="compose_shortcut_short_label">Написати</string>
     <string name="action_unmute_conversation">Скасувати приглушення бесіди</string>
     <string name="action_mute_conversation">Приглушити бесіду</string>
+    <string name="title_scheduled_toot">Заплановані пости</string>
+    <string name="description_visiblity_private">Підписники</string>
+    <string name="action_compose_shortcut">Написати</string>
+    <string name="title_media">Медіа</string>
+    <string name="pref_title_notifications_enabled">Сповіщення</string>
+    <string name="pref_title_edit_notification_settings">Сповіщення</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 db6a5b942..debf3f22b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="error_generic">应用程序出现异常。</string>
-    <string name="error_network">网络请求出错，请检查互联网连接并重试!</string>
+    <string name="error_network">网络请求出错，请检查互联网连接并重试！</string>
     <string name="error_empty">内容不能为空。</string>
     <string name="error_invalid_domain">该域名无效</string>
     <string name="error_failed_app_registration">无法连接此服务器。</string>
@@ -31,8 +31,8 @@
     <string name="title_statuses_pinned">已置顶</string>
     <string name="title_follows">正在关注</string>
     <string name="title_followers">关注者</string>
-    <string name="title_favourites">我的收藏</string>
-    <string name="title_mutes">被屏蔽的用户</string>
+    <string name="title_favourites">收藏</string>
+    <string name="title_mutes">被隐藏的用户</string>
     <string name="title_blocks">被屏蔽的用户</string>
     <string name="title_follow_requests">关注请求</string>
     <string name="title_edit_profile">编辑个人资料</string>
@@ -47,7 +47,7 @@
     <string name="status_content_warning_show_less">折叠内容</string>
     <string name="status_content_show_more">展开</string>
     <string name="status_content_show_less">折叠</string>
-    <string name="message_empty">还没有内容</string>
+    <string name="message_empty">还没有内容。</string>
     <string name="footer_empty">还没有内容，向下拉动即可刷新！</string>
     <string name="notification_reblog_format">%s 转嘟了你的嘟文</string>
     <string name="notification_favourite_format">%s 收藏了你的嘟文</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>
@@ -104,7 +104,7 @@
     <string name="action_search">搜索</string>
     <string name="action_access_saved_toot">草稿</string>
     <string name="action_toggle_visibility">设置嘟文可见范围</string>
-    <string name="action_content_warning">内容提醒</string>
+    <string name="action_content_warning">设置内容提醒</string>
     <string name="action_emoji_keyboard">插入表情符号</string>
     <string name="action_add_tab">添加标签页</string>
     <string name="action_links">链接</string>
@@ -126,7 +126,7 @@
     <string name="send_status_link_to">分享链接到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒体到…</string>
-    <string name="confirmation_reported">报告已发送！</string>
+    <string name="confirmation_reported">已发送！</string>
     <string name="confirmation_unblocked">已解除屏蔽</string>
     <string name="confirmation_unmuted">已取消隐藏</string>
     <string name="status_sent">已发送！</string>
@@ -299,7 +299,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>
@@ -366,9 +366,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>
@@ -378,7 +376,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">
@@ -417,7 +415,7 @@
     <string name="action_view_domain_mutes">隐藏域名</string>
     <string name="action_add_poll">新增意见调查</string>
     <string name="action_access_scheduled_toot">定时嘟文</string>
-    <string name="action_schedule_toot">定时嘟文</string>
+    <string name="action_schedule_toot">预订嘟文</string>
     <string name="confirmation_domain_unmuted">%s 已解除静音</string>
     <string name="mute_domain_warning_dialog_ok">隐藏整个域</string>
     <string name="pref_title_animate_gif_avatars">动画GIF头像</string>
@@ -457,8 +455,8 @@
     <string name="edit_poll">编辑</string>
     <string name="post_lookup_error_format">查找帖子时出错 %s</string>
     <string name="no_saved_status">您没有草稿。</string>
-    <string name="no_scheduled_status">您没有任何预定状态。</string>
-    <string name="warning_scheduling_interval">Mastodon的最小预定时间为5分钟。</string>
+    <string name="no_scheduled_status">您没有任何定时嘟文。</string>
+    <string name="warning_scheduling_interval">Mastodon的最小预订时间为5分钟。</string>
     <string name="notification_follow_request_name">关注请求</string>
     <string name="hashtags">话题</string>
     <string name="pref_title_confirm_reblogs">转嘟前提示确认</string>
@@ -478,7 +476,7 @@
     <string name="dialog_mute_hide_notifications">隐藏通知</string>
     <string name="dialog_mute_warning">确定隐藏 @%s？</string>
     <string name="dialog_block_warning">确定屏蔽 @%s？</string>
-    <string name="mute_domain_warning">确定要完全屏蔽 %s 吗？您将不能在公共时间轴和通知内看见来自此域名的内容。您在此域名上的关注者将会被移除。</string>
+    <string name="mute_domain_warning">确定要完全屏蔽 %s 吗？您将不能在公共时间轴和通知内看见来自此域名的内容，且您在此域名上的关注者将会被移除。</string>
     <string name="action_unmute_conversation">取消隐藏本会话的通知</string>
     <string name="action_mute_conversation">隐藏本会话的通知</string>
     <string name="action_unmute_domain">取消隐藏 %s</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index a6d37ca0f..ad226a114 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/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>
@@ -399,4 +399,7 @@
     <plurals name="poll_timespan_seconds">
         <item quantity="other">%d 秒</item>
     </plurals>
+    <string name="edit_poll">編輯</string>
+    <string name="hashtags">話題</string>
+    <string name="notification_follow_request_name">關注請求</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 947fc1c0e..4fb27d248 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -104,7 +104,7 @@
     <string name="action_search">搜尋</string>
     <string name="action_access_saved_toot">草稿</string>
     <string name="action_toggle_visibility">設定嘟文可見範圍</string>
-    <string name="action_content_warning">設定敏感內容警告</string>
+    <string name="action_content_warning">敏感內容警告</string>
     <string name="action_emoji_keyboard">插入表情符號</string>
     <string name="action_add_tab">新增標籤頁</string>
     <string name="action_links">連結</string>
@@ -126,7 +126,7 @@
     <string name="send_status_link_to">分享連結到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒體到…</string>
-    <string name="confirmation_reported">已檢舉！</string>
+    <string name="confirmation_reported">已發送！</string>
     <string name="confirmation_unblocked">已解除封鎖</string>
     <string name="confirmation_unmuted">已解除靜音</string>
     <string name="status_sent">已發送！</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>
@@ -399,4 +399,5 @@
     </plurals>
     <string name="notification_follow_request_name">關注請求</string>
     <string name="hashtags">話題</string>
+    <string name="edit_poll">編輯</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 90be377b7..31ff31a88 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>
@@ -31,7 +31,7 @@
     <string name="title_statuses_pinned">已置顶</string>
     <string name="title_follows">正在关注</string>
     <string name="title_followers">关注者</string>
-    <string name="title_favourites">我的收藏</string>
+    <string name="title_favourites">收藏</string>
     <string name="title_mutes">被隐藏的用户</string>
     <string name="title_blocks">被屏蔽的用户</string>
     <string name="title_follow_requests">关注请求</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>
@@ -81,7 +81,7 @@
     <string name="action_view_profile">个人资料</string>
     <string name="action_view_preferences">设置</string>
     <string name="action_view_account_preferences">帐户设置</string>
-    <string name="action_view_favourites">我的收藏</string>
+    <string name="action_view_favourites">收藏</string>
     <string name="action_view_mutes">被隐藏的用户</string>
     <string name="action_view_blocks">被屏蔽的用户</string>
     <string name="action_view_follow_requests">关注请求</string>
@@ -104,7 +104,7 @@
     <string name="action_search">搜索</string>
     <string name="action_access_saved_toot">草稿</string>
     <string name="action_toggle_visibility">设置嘟文可见范围</string>
-    <string name="action_content_warning">内容提醒</string>
+    <string name="action_content_warning">设置内容提醒信息</string>
     <string name="action_emoji_keyboard">插入表情符号</string>
     <string name="action_add_tab">添加标签页</string>
     <string name="action_links">链接</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>
@@ -296,7 +296,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>
@@ -363,9 +363,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>
@@ -404,4 +402,6 @@
         <item quantity="other">%d 秒</item>
     </plurals>
     <string name="hashtags">话题</string>
+    <string name="action_edit">编辑</string>
+    <string name="edit_poll">编辑</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 8d489dda1..a6b68854e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/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>
@@ -126,7 +126,7 @@
     <string name="send_status_link_to">分享連結到…</string>
     <string name="send_status_content_to">分享嘟文到…</string>
     <string name="send_media_to">分享媒體到…</string>
-    <string name="confirmation_reported">已檢舉！</string>
+    <string name="confirmation_reported">已發送！</string>
     <string name="confirmation_unblocked">已解除封鎖</string>
     <string name="confirmation_unmuted">已解除靜音</string>
     <string name="status_sent">已發送！</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>
@@ -425,4 +425,5 @@
     <string name="pref_title_show_notifications_filter">顯示通知過濾器</string>
     <string name="hashtags">話題</string>
     <string name="notification_follow_request_name">關注請求</string>
+    <string name="edit_poll">編輯</string>
 </resources>
\ No newline at end of file