diff --git a/app/src/main/res/values-ber/strings.xml b/app/src/main/res/values-ber/strings.xml
index b2992ab3f..35106996b 100644
--- a/app/src/main/res/values-ber/strings.xml
+++ b/app/src/main/res/values-ber/strings.xml
@@ -8,9 +8,9 @@
     <string name="action_view_favourites">ⵉⵙⵎⴻⵏⵢⵉⴼⴻⵏ</string>
     <string name="action_view_profile">ⴰⵎⴻⵖⵏⵓ</string>
     <string name="action_close">ⵎⴷⴻⵍ</string>
-    <string name="error_generic">ⵝⴻⵍⵍⴰ ⴷ ⵝⵓⵛⴹⴰ.</string>
+    <string name="error_generic">ⵝⴻⵍⵍⴰ ⴷ ⵝⵓⵛⴹⴰ</string>
     <string name="title_lists">ⵝⴰⴲⴸⴰⵔⵉⵏ</string>
-    <string name="action_lists">ⵝⴰⴲⴸⴰⵔⵉⵏ</string>
+    <string name="action_lists">ⵝⵉⴲⴸⴰⵔⵉⵏ</string>
     <string name="about_title_activity">ⵖⴻⴼ</string>
     <string name="action_reset_schedule">ⵡⴻⵏⵏⴻⵣ ⵝⵉⴽⴻⵍⵜ ⵏⵏⵉⴸⴻⵏ</string>
     <string name="action_search">ⵏⴰⴸⵉ</string>
@@ -30,4 +30,5 @@
     <string name="action_remove">ⴽⴽⴻⵙ</string>
     <string name="action_access_saved_toot">ⵉⵔⴻⵡⵡⴰⵢⴻⵏ</string>
     <string name="title_blocks">ⵉⵎⵙⴻⵇⴷⴰⵛⴻⵏ ⵜⵙⵡⴰⵃⵍⴻⵎ</string>
+    <string name="pref_title_status_tabs">ⵉⵛⵛⴰⵔⴻⵏ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index e95715c18..11d7f5d4e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -330,12 +330,12 @@
     <string name="pref_title_absolute_time">Utilitzar el temps absolut</string>
     <string name="label_remote_account">La informació de sota pot mostrar el perfil incomplert de l\'usuari. Clica per obrir el perfil complert al navegador.</string>
     <plurals name="favs">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
+        <item quantity="one"><b>%1$s</b> Favorit</item>
+        <item quantity="other"><b>%1$s</b> Favorits</item>
     </plurals>
     <plurals name="reblogs">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
+        <item quantity="one"/>
+        <item quantity="other"/>
     </plurals>
     <string name="title_reblogged_by">Impulsat per</string>
     <string name="title_favourited_by">Marcat favorit per</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8a2a2e817..a539c505a 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"><b>%1$s</b> oblíbení</item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="reblogs">
         <item quantity="one"><b>%s</b> boost</item>
@@ -388,24 +388,24 @@
     <string name="poll_ended_voted">Anketa, ve které jste hlasoval/a, skončila</string>
     <string name="poll_ended_created">Anketa, kterou jste vytvořil/a, skončila</string>
     <plurals name="poll_timespan_days">
-        <item quantity="one"/>
-        <item quantity="few"/>
-        <item quantity="other"/>
+        <item quantity="one">%d den</item>
+        <item quantity="few">%d dny</item>
+        <item quantity="other">%d dní</item>
     </plurals>
     <plurals name="poll_timespan_hours">
-        <item quantity="one"/>
-        <item quantity="few"/>
-        <item quantity="other"/>
+        <item quantity="one">%d hodina</item>
+        <item quantity="few">%d hodiny</item>
+        <item quantity="other">%d hodin</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
         <item quantity="one">%d minuta</item>
-        <item quantity="few">%d minut</item>
-        <item quantity="other"/>
+        <item quantity="few">%d minuty</item>
+        <item quantity="other">%d minut</item>
     </plurals>
     <plurals name="poll_timespan_seconds">
-        <item quantity="one"/>
-        <item quantity="few"/>
-        <item quantity="other"/>
+        <item quantity="one">%d sekunda</item>
+        <item quantity="few">%d sekundy</item>
+        <item quantity="other">%d sekund</item>
     </plurals>
     <string name="pref_title_animate_gif_avatars">Animovat avatary GIF</string>
     <string name="description_poll">Anketa s volbami: %1$s, %2$s, %3$s, %4$s; %5$s</string>
@@ -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">%s osoba</item>
-        <item quantity="few">%s osoby</item>
-        <item quantity="other">%s osob</item>
+        <item quantity="one"></item>
+        <item quantity="few"></item>
+        <item quantity="other"></item>
     </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 666396ea4..3b21ed174 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 8MB sein.</string>
+    <string name="error_image_upload_size">Die Datei muss kleiner als 8 MB 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 Status</string>
+    <string name="error_sender_account_gone">Fehler beim Senden des Beitrags.</string>
     <string name="title_home">Start</string>
     <string name="title_notifications">Benachrichtigungen</string>
     <string name="title_public_local">Lokal</string>
@@ -59,7 +59,7 @@
     <string name="action_reblog">Teilen</string>
     <string name="action_unreblog">Boost entfernen</string>
     <string name="action_favourite">Favorisieren</string>
-    <string name="action_unfavourite">Favoriten entfernen</string>
+    <string name="action_unfavourite">Favorisierung entfernen</string>
     <string name="action_more">Mehr</string>
     <string name="action_compose">Beitrag erstellen</string>
     <string name="action_login">Anmelden mit Mastodon</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">Verstecke Medien</string>
+    <string name="action_hide_media">Medien verstecken</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">Benachrichtigungen</string>
-    <string name="pref_title_notifications_enabled">Benachrichtigungseinstellungen</string>
+    <string name="pref_title_edit_notification_settings">Benachrichtigungseinstellungen</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>
     <string name="pref_title_notification_alert_vibrate">Benachrichtige mit Vibration</string>
@@ -197,7 +197,7 @@
     <string name="pref_publishing">Beiträge</string>
     <string name="pref_failed_to_sync">Fehler beim Synchronisieren</string>
     <string name="post_privacy_public">Öffentlich</string>
-    <string name="post_privacy_unlisted">Ungelistet</string>
+    <string name="post_privacy_unlisted">Nicht gelistet</string>
     <string name="post_privacy_followers_only">Nur Folgende</string>
     <string name="pref_status_text_size">Schriftgröße</string>
     <string name="status_text_size_smallest">Kleiner</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">Benachrichtigungen über neue Folgende</string>
+    <string name="notification_follow_description">Benachrichtigunen ü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">Favoriten</string>
+    <string name="notification_favourite_name">Favorisierte Beiträge</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>
@@ -227,7 +227,7 @@
            to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
          * the url can be changed to link to the localized version of the license.
     -->
-    <string name="about_project_site">Webseite des Projekts:
+    <string name="about_project_site">Website des Projekts: 
 \n https://tusky.app</string>
     <string name="about_bug_feature_request_site">        Fehlermeldungen &amp; Verbesserungsvorschläge:\n
         https://github.com/tuskyapp/Tusky/issues
@@ -286,10 +286,10 @@
     <string name="later">Später</string>
     <string name="restart">Neustarten</string>
     <string name="caption_systememoji">Die Standard-Emojis deines Geräts</string>
-    <string name="caption_blobmoji">Die Blob-Emojis aus Android 4.4-7.1</string>
+    <string name="caption_blobmoji">Die Blob–Emojis aus Android 4.4–7.1</string>
     <string name="caption_twemoji">Die Standard-Emojis von Mastodon</string>
     <string name="caption_notoemoji">Die aktuellen Emojis von Google</string>
-    <string name="download_failed">Download fehlgeschlagen</string>
+    <string name="download_failed">Download fehlgeschlagen.</string>
     <string name="profile_badge_bot_text">Bot</string>
     <string name="account_moved_description">%1$s ist umgezogen auf:</string>
     <string name="reblog_private">An ursprüngliches Publikum teilen</string>
@@ -381,7 +381,7 @@
     <string name="action_mute_domain">%s verstecken</string>
     <string name="confirmation_domain_unmuted">%s nicht mehr versteckt</string>
     <string name="mute_domain_warning">Bist du dir sicher, dass du die Domain %s blockieren willst\? Nach der Blockierung wirst du nichts mehr von dieser Domain in öffentlichen Zeitleisten oder Benachrichtigungen sehen. Deine Follower von dieser Domain werden entfernt.</string>
-    <string name="mute_domain_warning_dialog_ok">ganze Domain verbergen</string>
+    <string name="mute_domain_warning_dialog_ok">Ganze Domain verbergen</string>
     <string name="pref_title_animate_gif_avatars">GIF-Avatare animieren</string>
     <string name="filter_dialog_whole_word">Ganzes Wort</string>
     <string name="filter_dialog_whole_word_description">Wenn das Schlagwort nur aus Buchstaben und Zahlen besteht, wird es nur angewendet, wenn es dem ganzen Wort entspricht</string>
@@ -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">Tusky %s</string>
+    <string name="about_tusky_version">test %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 40MB sein.</string>
+    <string name="error_audio_upload_size">Audiodateien müssen kleiner als 40 MB sein.</string>
     <string name="title_bookmarks">Lesezeichen</string>
     <string name="action_bookmark">Lesezeichen</string>
     <string name="action_view_bookmarks">Lesezeichen</string>
@@ -452,7 +452,7 @@
     <string name="pref_title_gradient_for_media">Farbverlauf für versteckte Medien anzeigen</string>
     <string name="pref_main_nav_position_option_bottom">Unten</string>
     <string name="pref_main_nav_position_option_top">Oben</string>
-    <string name="action_unmute_domain">Ton einschalten %s</string>
+    <string name="action_unmute_domain">%s nicht mehr verstecken</string>
     <plurals name="reblogs">
         <item quantity="one"><b>%s</b> Boost</item>
         <item quantity="other"><b>%s</b> Boosts</item>
@@ -461,5 +461,9 @@
     <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">Ton einschalten %s</string>
+    <string name="action_unmute_desc">%s nicht mehr verstecken</string>
+    <string name="abbreviated_seconds_ago">%dS</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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1f9aefdaf..2ba22bd38 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -330,8 +330,8 @@
     <string name="pref_title_bot_overlay">Mostrar indicador de bots</string>
     <string name="poll_vote">Votar</string>
     <plurals name="poll_timespan_days">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d día</item>
+        <item quantity="other">%d días</item>
     </plurals>
     <plurals name="poll_timespan_hours">
         <item quantity="one"/>
@@ -439,7 +439,7 @@
     <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">Marcadores</string>
+    <string name="title_bookmarks">Favoritos</string>
     <string name="action_bookmark">Marcador</string>
     <string name="action_view_bookmarks">Marcadores</string>
     <string name="description_status_bookmarked">Marcado como favorito</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index e59da2513..68c749757 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -383,8 +383,8 @@
     <string name="compose_preview_image_description">%s irudiarentzako ekintzak</string>
     <string name="poll_info_format"> <!-- 15 boto • Ordu 1 geratzen da --> %1$s • %2$s</string>
     <plurals name="poll_info_votes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">Boto %s</item>
+        <item quantity="other">%s Boto</item>
     </plurals>
     <string name="poll_info_time_absolute">%s amaitzen da</string>
     <string name="poll_info_closed">Itxita</string>
@@ -400,8 +400,8 @@
         <item quantity="other">%d ordu</item>
     </plurals>
     <plurals name="poll_timespan_minutes">
-        <item quantity="one">Minutu %d</item>
-        <item quantity="other">%d minutu</item>
+        <item quantity="one"/>
+        <item quantity="other"/>
     </plurals>
     <plurals name="poll_timespan_seconds">
         <item quantity="one">Segundu %d</item>
@@ -456,7 +456,7 @@
     <string name="dialog_mute_hide_notifications">Ez erakutsi jakinarazpenak</string>
     <string name="action_unmute_desc">Desmututu %s</string>
     <plurals name="poll_info_people">
-        <item quantity="one">Pertsona %s</item>
-        <item quantity="other">%s pertsona</item>
+        <item quantity="one"/>
+        <item quantity="other"/>
     </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 80707e705..461058924 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -464,4 +464,8 @@
     <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>
+        <item quantity="other"></item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 09f96374b..1fee6ea69 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -476,4 +476,8 @@
     <string name="action_mute_notifications_desc">Silencier les notifications de %s</string>
     <string name="action_unmute_notifications_desc">Ne plus silencier 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>
+        <item quantity="other">%s personnes</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index be0a5b0a5..5ec758f1a 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -29,7 +29,7 @@
     <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">Lean</string>
+    <string name="action_follow">Leantainn</string>
     <string name="action_more">Tuilleadh</string>
     <string name="action_retry">Ath-ghairm</string>
     <string name="action_close">Dùin</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index ec584ff74..028f62245 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -396,4 +396,12 @@
     <string name="notification_follow_format">%s ने आपको फ़ॉलो किया</string>
     <string name="pref_title_show_boosts">बूस्ट दिखाएं</string>
     <string name="action_open_reblogged_by">बूस्ट दिखाएं</string>
+    <plurals name="favs">
+        <item quantity="one"><b>%1$s</b> ने पसंद किया</item>
+        <item quantity="other"><b>%1$s</b> ने पसंद किया</item>
+    </plurals>
+    <plurals name="poll_timespan_minutes">
+        <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 4e5f45aad..0f8199673 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -108,4 +108,5 @@
     <string name="action_access_scheduled_toot">മുന്‍നിശ്ചയിച്ച ടൂറ്റ്‌സ്</string>
     <string name="action_access_saved_toot">കരടുകൾ</string>
     <string name="action_edit_own_profile">തിരുത്ത്</string>
+    <string name="pref_title_edit_notification_settings">അറിയിപ്പുകൾ</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 3b0898f26..40ba99875 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -368,8 +368,8 @@
     <string name="notification_clear_text">Weet je zeker dat je alle meldingen permanent wilt verwijderen\?</string>
     <string name="poll_info_format"> <!-- 15 votes • 1 hour left --> %1$s • %2$s</string>
     <plurals name="poll_info_votes">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%s stem</item>
+        <item quantity="other">%s stemmen</item>
     </plurals>
     <string name="poll_info_time_relative">%s over</string>
     <string name="poll_info_time_absolute">eindigt op %s</string>
@@ -403,8 +403,8 @@
         <item quantity="other">%d minuten</item>
     </plurals>
     <plurals name="poll_timespan_seconds">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d seconde</item>
+        <item quantity="other">%d seconden</item>
     </plurals>
     <string name="button_continue">Doorgaan</string>
     <string name="button_back">Terug</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index c52203f3f..a01e3d14c 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -381,16 +381,16 @@
         <item quantity="other">%d jorns</item>
     </plurals>
     <plurals name="poll_timespan_hours">
-        <item quantity="one">%d ora</item>
-        <item quantity="other">%d oras</item>
+        <item quantity="one"></item>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="poll_timespan_minutes">
         <item quantity="one">%d minuta</item>
         <item quantity="other">%d minutas</item>
     </plurals>
     <plurals name="poll_timespan_seconds">
-        <item quantity="one"/>
-        <item quantity="other"/>
+        <item quantity="one">%d segonda</item>
+        <item quantity="other">%d segondas</item>
     </plurals>
     <string name="compose_preview_image_description">Accions per l’imatge %s</string>
     <string name="pref_title_animate_gif_avatars">Activar l’animacion dels avatars</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8303a4869..4ffb8f372 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -395,22 +395,22 @@
     <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"></item>
-        <item quantity="many"></item>
-        <item quantity="other"></item>
+        <item quantity="few"/>
+        <item quantity="many"/>
+        <item quantity="other"/>
     </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"></item>
         <item quantity="many"></item>
         <item quantity="other"></item>
     </plurals>
+    <plurals name="poll_timespan_minutes">
+        <item quantity="one">%d minuta</item>
+        <item quantity="few"/>
+        <item quantity="many"/>
+        <item quantity="other"/>
+    </plurals>
     <plurals name="poll_timespan_seconds">
         <item quantity="one">%d sekunda</item>
         <item quantity="few">%d sekund</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7698d7d93..452d77f1d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -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>
@@ -215,7 +215,7 @@
     <string name="notification_follow_description">当有用户关注我时</string>
     <string name="notification_boost_name">转嘟</string>
     <string name="notification_boost_description">当有用户转嘟了我的嘟文时</string>
-    <string name="notification_favourite_name">我的收藏</string>
+    <string name="notification_favourite_name">收藏</string>
     <string name="notification_favourite_description">当有用户收藏了我的嘟文时</string>
     <string name="notification_poll_name">投票</string>
     <string name="notification_poll_description">当我参与的投票结束时</string>
@@ -413,7 +413,7 @@
     <string name="action_edit">编辑</string>
     <string name="action_view_bookmarks">书签</string>
     <string name="action_view_domain_mutes">隐藏域名</string>
-    <string name="action_add_poll">新增意见调查</string>
+    <string name="action_add_poll">新增投票</string>
     <string name="action_access_scheduled_toot">定时嘟文</string>
     <string name="action_schedule_toot">预订嘟文</string>
     <string name="confirmation_domain_unmuted">%s 已解除静音</string>
@@ -483,4 +483,8 @@
     <string name="notification_follow_request_format">%s 请求关注你</string>
     <string name="pref_main_nav_position">主导航位置</string>
     <string name="pref_title_hide_top_toolbar">隐藏顶部工具栏的标题</string>
+    <plurals name="poll_info_people">
+        <item quantity="one">%s 人</item>
+        <item quantity="other"></item>
+    </plurals>
 </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 31ff31a88..f65688d26 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -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>